From 254756e8c9b8a36a6782cb71557a6fdda3eb3c62 Mon Sep 17 00:00:00 2001 From: jjunh33 Date: Mon, 16 Nov 2026 10:53:19 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=EC=84=A4=EC=A0=95=EA=B0=92=EC=97=90=20?= =?UTF-8?q?=EB=93=B1=EB=A1=9D=ED=95=9C=20=ED=95=99=EB=B2=88=EC=9D=98=20?= =?UTF-8?q?=EC=86=8C=EC=86=8D=20=EA=B2=80=EC=82=AC=20=EC=98=88=EC=99=B8=20?= =?UTF-8?q?=ED=97=88=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/auth/usecase/OAuthLoginUseCase.java | 20 ++++++++++++++++++- .../member/domain/MemberConfigKeys.java | 10 ++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/domain/MemberConfigKeys.java diff --git a/api/app-api/src/main/java/kr/ac/kookmin/stream/api/app/core/auth/usecase/OAuthLoginUseCase.java b/api/app-api/src/main/java/kr/ac/kookmin/stream/api/app/core/auth/usecase/OAuthLoginUseCase.java index a5723c64..8283825e 100644 --- a/api/app-api/src/main/java/kr/ac/kookmin/stream/api/app/core/auth/usecase/OAuthLoginUseCase.java +++ b/api/app-api/src/main/java/kr/ac/kookmin/stream/api/app/core/auth/usecase/OAuthLoginUseCase.java @@ -1,10 +1,13 @@ package kr.ac.kookmin.stream.api.app.core.auth.usecase; +import java.util.Arrays; import kr.ac.kookmin.stream.api.app.core.auth.response.OAuthLoginResponse; import kr.ac.kookmin.stream.auth.domain.oauth.domain.OAuthLoginCommand; import kr.ac.kookmin.stream.auth.domain.oauth.domain.OAuthUserInfo; import kr.ac.kookmin.stream.auth.domain.oauth.service.OAuthService; +import kr.ac.kookmin.stream.internal.domain.config.service.AdminConfigValueService; import kr.ac.kookmin.stream.member.domain.member.domain.Member; +import kr.ac.kookmin.stream.member.domain.member.domain.MemberConfigKeys; import kr.ac.kookmin.stream.member.domain.member.domain.MemberProfileCommand; import kr.ac.kookmin.stream.member.domain.member.service.MemberService; import kr.ac.kookmin.stream.security.AuthTokenIssuer; @@ -22,6 +25,10 @@ @RequiredArgsConstructor public class OAuthLoginUseCase { + // 소속 검사 예외 학번에 넣어 주는 전공. 학부는 SW로 저장된다 + private static final String BYPASS_MAJOR = "소프트웨어전공"; + + private final AdminConfigValueService adminConfigValueService; private final OAuthService oauthService; private final MemberService memberService; private final PayerService payerService; @@ -40,14 +47,25 @@ public OAuthLoginResponse login(OAuthLoginCommand command) { } private Member findOrRegister(OAuthUserInfo userInfo) { + String major = isDepartmentCheckBypassed(userInfo.studentId()) ? BYPASS_MAJOR : userInfo.major(); MemberProfileCommand profile = new MemberProfileCommand( - userInfo.studentId(), userInfo.name(), userInfo.major(), userInfo.academicStatus()); + userInfo.studentId(), userInfo.name(), major, userInfo.academicStatus()); return oauthService.findMemberId(userInfo.provider(), userInfo.providerUserId()) .map(memberId -> memberService.updateProfile(memberId, profile)) .orElseGet(() -> registerAndLink(userInfo, profile)); } + // 설정값에 등록된 학번이면 소속 검사를 건너뛴다 + private boolean isDepartmentCheckBypassed(String studentId) { + if (studentId == null) { + return false; + } + return adminConfigValueService.getValue(MemberConfigKeys.DEPARTMENT_BYPASS_STUDENT_IDS) + .map(value -> Arrays.stream(value.split(",")).map(String::trim).anyMatch(studentId::equals)) + .orElse(false); + } + // 연결된 계정이 없으면 학번 기준으로 회원을 가입·갱신한다. 이관 회원이나 연결이 누락된 회원은 여기서 다시 연결된다 private Member registerAndLink(OAuthUserInfo userInfo, MemberProfileCommand profile) { Member member = memberService.registerOrUpdateByStudentId(profile); diff --git a/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/domain/MemberConfigKeys.java b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/domain/MemberConfigKeys.java new file mode 100644 index 00000000..bb1bee64 --- /dev/null +++ b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/domain/MemberConfigKeys.java @@ -0,0 +1,10 @@ +package kr.ac.kookmin.stream.member.domain.member.domain; + +// admin_config_values에 저장되는 회원 관련 키 +public final class MemberConfigKeys { + + // 소속 검사 없이 가입·로그인을 허용할 학번 목록(콤마 구분) + public static final String DEPARTMENT_BYPASS_STUDENT_IDS = "MEMBER_DEPARTMENT_BYPASS_STUDENT_IDS"; + + private MemberConfigKeys() {} +}