[Feat/#84] 로그인용 회원 가입·갱신·약관 동의 조회·학적 상태 추가

core/common/src/main/java/kr/ac/kookmin/stream/common/ErrorStatus.java

@@ -12,4 +12,5 @@ public final class ErrorStatus {
     public static final int BAD_REQUEST = 400;
     public static final int CONFLICT = 409;
     public static final int FORBIDDEN = 403;
+    public static final int BAD_GATEWAY = 502;
 }

core/domain/auth/build.gradle.kts

@@ -4,6 +4,14 @@ plugins {
 
 description = "auth 도메인 — gateway:auth(Security/JWT)와는 별개의 도메인 계층 로직"
 
+// gateway:auth와 프로젝트 이름(auth)이 같아 기본 좌표(kr.ac.kookmin:auth)가 겹치면 Gradle이 두 모듈을 같은 모듈로 보고
+// 한쪽을 다른 쪽으로 치환한다. group을 달리해 좌표를 분리하고, bootJar 안에서 jar 파일명도 겹치지 않게 바꾼다
+group = "kr.ac.kookmin.domain"
+
+base {
+    archivesName.set("domain-auth")
+}
+
 dependencies {
     implementation(project(":core:common"))
 

core/domain/auth/src/main/java/kr/ac/kookmin/stream/auth/domain/oauth/client/OAuthClient.java

@@ -0,0 +1,23 @@
+package kr.ac.kookmin.stream.auth.domain.oauth.client;
+
+import kr.ac.kookmin.stream.auth.domain.oauth.domain.OAuthLoginCommand;
+import kr.ac.kookmin.stream.auth.domain.oauth.domain.OAuthProvider;
+import kr.ac.kookmin.stream.auth.domain.oauth.domain.OAuthUserInfo;
+
+/**
+ * provider별 OAuth 로그인 전략. 구현체는 provider마다 하나씩 모두 빈으로 등록하고,
+ * 요청의 provider에 맞는 구현체를 OAuthClientRegistry가 고른다.
+ */
+public interface OAuthClient {
+
+    OAuthProvider provider();
+
+    /** provider에 등록한 redirect URI와 정확히 일치하는지. 외부 호출 전에 거르는 용도다. */
+    boolean isAllowedRedirectUri(String redirectUri);
+
+    /**
+     * code를 provider 토큰으로 교환하고 사용자 정보를 조회한다.
+     * provider 토큰은 이 메서드 안에서만 쓰고 밖으로 내보내지 않는다.
+     */
+    OAuthUserInfo fetchUserInfo(OAuthLoginCommand command);
+}

core/domain/auth/src/main/java/kr/ac/kookmin/stream/auth/domain/oauth/domain/OAuthAccount.java

@@ -0,0 +1,28 @@
+package kr.ac.kookmin.stream.auth.domain.oauth.domain;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+
+/**
+ * provider 계정과 회원의 연결. 한 회원은 provider마다 계정을 하나씩 연결할 수 있다.
+ */
+@Getter
+@EqualsAndHashCode
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+public class OAuthAccount {
+
+    private Long id;
+    private Long memberId;
+    private OAuthProvider provider;
+    private String providerUserId;
+
+    public static OAuthAccount create(Long memberId, OAuthProvider provider, String providerUserId) {
+        return new OAuthAccount(null, memberId, provider, providerUserId);
+    }
+
+    public static OAuthAccount of(Long id, Long memberId, OAuthProvider provider, String providerUserId) {
+        return new OAuthAccount(id, memberId, provider, providerUserId);
+    }
+}

core/domain/auth/src/main/java/kr/ac/kookmin/stream/auth/domain/oauth/domain/OAuthErrorCode.java

@@ -0,0 +1,21 @@
+package kr.ac.kookmin.stream.auth.domain.oauth.domain;
+
+import kr.ac.kookmin.stream.common.ErrorCode;
+import kr.ac.kookmin.stream.common.ErrorStatus;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.experimental.Accessors;
+
+@Getter
+@Accessors(fluent = true)
+@AllArgsConstructor
+public enum OAuthErrorCode implements ErrorCode {
+
+    UNSUPPORTED_OAUTH_PROVIDER(ErrorStatus.BAD_REQUEST, "지원하지 않는 로그인 방식입니다."),
+    REDIRECT_URI_NOT_ALLOWED(ErrorStatus.BAD_REQUEST, "허용되지 않은 redirect URI입니다."),
+    INVALID_AUTHORIZATION_CODE(ErrorStatus.UNAUTHORIZED, "로그인이 만료되었습니다. 다시 로그인해 주세요."),
+    OAUTH_PROVIDER_UNAVAILABLE(ErrorStatus.BAD_GATEWAY, "로그인 서버에 연결할 수 없습니다. 잠시 후 다시 시도해 주세요.");
+
+    private final int status;
+    private final String message;
+}

core/domain/auth/src/main/java/kr/ac/kookmin/stream/auth/domain/oauth/domain/OAuthLoginCommand.java

@@ -0,0 +1,8 @@
+package kr.ac.kookmin.stream.auth.domain.oauth.domain;
+
+public record OAuthLoginCommand(
+    OAuthProvider provider,
+    String code,
+    String codeVerifier,
+    String redirectUri
+) {}

core/domain/auth/src/main/java/kr/ac/kookmin/stream/auth/domain/oauth/domain/OAuthProvider.java

@@ -0,0 +1,16 @@
+package kr.ac.kookmin.stream.auth.domain.oauth.domain;
+
+import java.util.Arrays;
+import kr.ac.kookmin.stream.common.BusinessException;
+
+public enum OAuthProvider {
+    KCONNECT;
+
+    /** 로그인 경로의 provider 값(예: "kconnect")을 대소문자 구분 없이 변환한다. */
+    public static OAuthProvider from(String value) {
+        return Arrays.stream(values())
+            .filter(provider -> provider.name().equalsIgnoreCase(value))
+            .findFirst()
+            .orElseThrow(() -> new BusinessException(OAuthErrorCode.UNSUPPORTED_OAUTH_PROVIDER));
+    }
+}

core/domain/auth/src/main/java/kr/ac/kookmin/stream/auth/domain/oauth/domain/OAuthUserInfo.java

@@ -0,0 +1,17 @@
+package kr.ac.kookmin.stream.auth.domain.oauth.domain;
+
+/**
+ * provider에서 확인한 사용자 정보.
+ * <p>
+ * providerUserId는 provider 안에서 바뀌지 않는 고유 ID로, 회원을 찾는 키가 된다.
+ * studentId·major·academicStatus는 학번·학과·학적을 주지 않는 provider(구글·카카오)에서 null일 수 있다.
+ * academicStatus는 provider가 주는 학적 상태 값을 그대로 담는다.
+ */
+public record OAuthUserInfo(
+    OAuthProvider provider,
+    String providerUserId,
+    String studentId,
+    String name,
+    String major,
+    String academicStatus
+) {}

core/domain/auth/src/main/java/kr/ac/kookmin/stream/auth/domain/oauth/repository/OAuthAccountRepository.java

@@ -0,0 +1,10 @@
+package kr.ac.kookmin.stream.auth.domain.oauth.repository;
+
+import java.util.Optional;
+import kr.ac.kookmin.stream.auth.domain.oauth.domain.OAuthAccount;
+import kr.ac.kookmin.stream.auth.domain.oauth.domain.OAuthProvider;
+
+public interface OAuthAccountRepository {
+    Optional<OAuthAccount> findByProviderAndProviderUserId(OAuthProvider provider, String providerUserId);
+    OAuthAccount save(OAuthAccount oauthAccount);
+}

core/domain/auth/src/main/java/kr/ac/kookmin/stream/auth/domain/oauth/service/OAuthService.java

@@ -0,0 +1,12 @@
+package kr.ac.kookmin.stream.auth.domain.oauth.service;
+
+import java.util.Optional;
+import kr.ac.kookmin.stream.auth.domain.oauth.domain.OAuthLoginCommand;
+import kr.ac.kookmin.stream.auth.domain.oauth.domain.OAuthProvider;
+import kr.ac.kookmin.stream.auth.domain.oauth.domain.OAuthUserInfo;
+
+public interface OAuthService {
+    OAuthUserInfo authenticate(OAuthLoginCommand command);
+    Optional<Long> findMemberId(OAuthProvider provider, String providerUserId);
+    void link(OAuthProvider provider, String providerUserId, Long memberId);
+}

core/domain/auth/src/main/java/kr/ac/kookmin/stream/auth/domain/oauth/service/impl/OAuthClientRegistry.java

@@ -0,0 +1,42 @@
+package kr.ac.kookmin.stream.auth.domain.oauth.service.impl;
+
+import java.util.EnumMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import kr.ac.kookmin.stream.auth.domain.oauth.client.OAuthClient;
+import kr.ac.kookmin.stream.auth.domain.oauth.domain.OAuthErrorCode;
+import kr.ac.kookmin.stream.auth.domain.oauth.domain.OAuthProvider;
+import kr.ac.kookmin.stream.common.BusinessException;
+import org.springframework.stereotype.Component;
+
+/**
+ * 빈으로 등록된 OAuthClient 구현체를 provider별로 모아 두고, 요청의 provider에 맞는 구현체를 돌려준다.
+ * 같은 provider의 구현체가 둘이면 기동 시 실패한다.
+ */
+@Component
+class OAuthClientRegistry {
+
+    private final Map<OAuthProvider, OAuthClient> clients;
+
+    OAuthClientRegistry(List<OAuthClient> clients) {
+        this.clients = clients.stream()
+            .collect(Collectors.toMap(
+                OAuthClient::provider,
+                Function.identity(),
+                (first, second) -> {
+                    throw new IllegalStateException("OAuthClient 구현체가 중복됐습니다: " + first.provider());
+                },
+                () -> new EnumMap<>(OAuthProvider.class)
+            ));
+    }
+
+    OAuthClient get(OAuthProvider provider) {
+        OAuthClient client = clients.get(provider);
+        if (client == null) {
+            throw new BusinessException(OAuthErrorCode.UNSUPPORTED_OAUTH_PROVIDER);
+        }
+        return client;
+    }
+}

core/domain/auth/src/main/java/kr/ac/kookmin/stream/auth/domain/oauth/service/impl/OAuthServiceImpl.java

@@ -0,0 +1,46 @@
+package kr.ac.kookmin.stream.auth.domain.oauth.service.impl;
+
+import java.util.Optional;
+import kr.ac.kookmin.stream.auth.domain.oauth.client.OAuthClient;
+import kr.ac.kookmin.stream.auth.domain.oauth.domain.OAuthAccount;
+import kr.ac.kookmin.stream.auth.domain.oauth.domain.OAuthErrorCode;
+import kr.ac.kookmin.stream.auth.domain.oauth.domain.OAuthLoginCommand;
+import kr.ac.kookmin.stream.auth.domain.oauth.domain.OAuthProvider;
+import kr.ac.kookmin.stream.auth.domain.oauth.domain.OAuthUserInfo;
+import kr.ac.kookmin.stream.auth.domain.oauth.repository.OAuthAccountRepository;
+import kr.ac.kookmin.stream.auth.domain.oauth.service.OAuthService;
+import kr.ac.kookmin.stream.common.BusinessException;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@RequiredArgsConstructor
+class OAuthServiceImpl implements OAuthService {
+
+    private final OAuthClientRegistry oauthClientRegistry;
+    private final OAuthAccountRepository oauthAccountRepository;
+
+    // 외부 호출만 하므로 트랜잭션을 걸지 않는다
+    @Override
+    public OAuthUserInfo authenticate(OAuthLoginCommand command) {
+        OAuthClient client = oauthClientRegistry.get(command.provider());
+        if (!client.isAllowedRedirectUri(command.redirectUri())) {
+            throw new BusinessException(OAuthErrorCode.REDIRECT_URI_NOT_ALLOWED);
+        }
+
+        return client.fetchUserInfo(command);
+    }
+
+    @Override
+    public Optional<Long> findMemberId(OAuthProvider provider, String providerUserId) {
+        return oauthAccountRepository.findByProviderAndProviderUserId(provider, providerUserId)
+            .map(OAuthAccount::getMemberId);
+    }
+
+    @Override
+    @Transactional
+    public void link(OAuthProvider provider, String providerUserId, Long memberId) {
+        oauthAccountRepository.save(OAuthAccount.create(memberId, provider, providerUserId));
+    }
+}

core/domain/auth/src/main/java/kr/ac/kookmin/stream/auth/package-info.java

@@ -0,0 +1,8 @@
+/**
+ * 계층 패키지(domain/{도메인}/{domain|repository|service})를 그대로 공개하기 위해 OPEN으로 둔다.
+ * service.impl 접근 차단은 bootstrap의 DomainImplAccessTests(ArchUnit)가 담당한다.
+ */
+@ApplicationModule(type = ApplicationModule.Type.OPEN)
+package kr.ac.kookmin.stream.auth;
+
+import org.springframework.modulith.ApplicationModule;

core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/domain/Department.java

@@ -1,9 +1,28 @@
 package kr.ac.kookmin.stream.member.domain.member.domain;
 
+import java.util.Arrays;
+import kr.ac.kookmin.stream.common.BusinessException;
+import lombok.AllArgsConstructor;
+
 /**
  * 학부. 학생회 부서(CouncilDepartment)와는 다른 개념이다.
  */
+@AllArgsConstructor
 public enum Department {
-    AI,
-    SW
+    AI("인공지능전공"),
+    SW("소프트웨어전공");
+
+    // 로그인 provider가 주는 소속 문자열에서 찾는 전공명
+    private final String majorName;
+
+    /** 소속 문자열을 학부로 바꾼다. 소프트웨어융합대학 전공이 아니면 가입할 수 없다. */
+    public static Department fromMajor(String major) {
+        if (major == null) {
+            throw new BusinessException(MemberErrorCode.DEPARTMENT_NOT_ALLOWED);
+        }
+        return Arrays.stream(values())
+            .filter(department -> major.contains(department.majorName))
+            .findFirst()
+            .orElseThrow(() -> new BusinessException(MemberErrorCode.DEPARTMENT_NOT_ALLOWED));
+    }
 }

core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/domain/Member.java

@@ -1,5 +1,6 @@
 package kr.ac.kookmin.stream.member.domain.member.domain;
 
+import java.util.Objects;
 import kr.ac.kookmin.stream.common.CouncilDepartment;
 import kr.ac.kookmin.stream.common.Role;
 import lombok.AccessLevel;
@@ -16,21 +17,42 @@ public class Member {
     private String studentId;
     private String name;
     private Department department;
+    // 로그인 provider가 주는 학적 상태 원문(재학·휴학·졸업 등). 로그인 전 이관 회원은 null이다
+    private String academicStatus;
     private String email;
     private String fcmToken;
     private Role role;
     private CouncilDepartment councilDepartment;
 
+    // 로그인으로 처음 가입하는 회원. 운영진 권한·학생회 부서는 가입 뒤 따로 부여한다
+    public static Member create(String studentId, String name, Department department, String academicStatus) {
+        return new Member(null, studentId, name, department, academicStatus, null, null, Role.STUDENT, null);
+    }
+
     public static Member of(
         Long id,
         String studentId,
         String name,
         Department department,
+        String academicStatus,
         String email,
         String fcmToken,
         Role role,
         CouncilDepartment councilDepartment
     ) {
-        return new Member(id, studentId, name, department, email, fcmToken, role, councilDepartment);
+        return new Member(id, studentId, name, department, academicStatus, email, fcmToken, role, councilDepartment);
+    }
+
+    // 로그인할 때마다 provider의 최신 이름·학부·학적 상태로 갱신한다. 바뀐 값이 있으면 true를 돌려준다
+    public boolean updateProfile(String name, Department department, String academicStatus) {
+        if (Objects.equals(this.name, name)
+            && this.department == department
+            && Objects.equals(this.academicStatus, academicStatus)) {
+            return false;
+        }
+        this.name = name;
+        this.department = department;
+        this.academicStatus = academicStatus;
+        return true;
     }
 }

core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/domain/MemberErrorCode.java

@@ -11,7 +11,8 @@
 @AllArgsConstructor
 public enum MemberErrorCode implements ErrorCode {
 
-    MEMBER_NOT_FOUND(ErrorStatus.NOT_FOUND, "회원을 찾을 수 없습니다.");
+    MEMBER_NOT_FOUND(ErrorStatus.NOT_FOUND, "회원을 찾을 수 없습니다."),
+    DEPARTMENT_NOT_ALLOWED(ErrorStatus.FORBIDDEN, "소프트웨어융합대학 학생만 이용할 수 있습니다.");
 
     private final int status;
     private final String message;

core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/domain/MemberProfileCommand.java

@@ -0,0 +1,11 @@
+package kr.ac.kookmin.stream.member.domain.member.domain;
+
+/**
+ * 로그인 provider가 준 회원 프로필. major·academicStatus는 원문이며, 학부 변환은 {@link Department#fromMajor}가 한다.
+ */
+public record MemberProfileCommand(
+    String studentId,
+    String name,
+    String major,
+    String academicStatus
+) {}

core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/domain/TermType.java

@@ -1,6 +1,18 @@
 package kr.ac.kookmin.stream.member.domain.member.domain;
 
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.experimental.Accessors;
+
+@Getter
+@Accessors(fluent = true)
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
 public enum TermType {
-    PRIVACY_POLICY,     // 개인정보 이용 동의
-    TERMS_OF_SERVICE    // 서비스 이용 약관 동의
+
+    PRIVACY_POLICY(true),     // 개인정보 이용 동의
+    TERMS_OF_SERVICE(true);   // 서비스 이용 약관 동의
+
+    /** 가입 시 반드시 동의해야 하는 약관인지 여부 */
+    private final boolean required;
 }

core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/repository/MemberRepository.java

@@ -6,6 +6,8 @@
 
 public interface MemberRepository {
     Optional<Member> findById(Long id);
+    Optional<Member> findByStudentId(String studentId);
     List<Member> findAllByIds(List<Long> ids);
     List<Long> searchIdsByKeyword(String keyword);
+    Member save(Member member);
 }