Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -22,6 +25,10 @@
@RequiredArgsConstructor
public class OAuthLoginUseCase {

// 소속 검사 예외 학번에 넣어 주는 전공. 학부는 SW로 저장된다
private static final String BYPASS_MAJOR = "소프트웨어전공";

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[a] 리뷰 포인트 주신 전공 문자열 우회 방식에 대한 의견이에요. 지금 범위에서는 괜찮아 보여요.

  • Department.fromMajor는 MemberServiceImpl의 register·applyProfile에서만 불리고, 그 입구인 updateProfile·registerOrUpdateByStudentId를 부르는 곳은 이 UseCase뿐이에요. 다른 경로로 예외가 새거나 빠지는 곳은 없습니다.
  • 회원에는 전공 원문이 아니라 Department만 저장돼서(Member.create·Member.updateProfile) 바꾼 문자열이 DB에 남지도 않아요.

다만 "소프트웨어전공"이 Department.SW의 majorName(Department.java:17)을 옮겨 적은 값이라 매칭 규칙이 두 곳에 생겨요. 예를 들어

  • KConnect 소속 표기가 바뀌어 SW의 majorName을 고치면
  • 이 상수는 그대로 남아 예외 학번도 DEPARTMENT_NOT_ALLOWED로 막히는데, 컴파일에서는 드러나지 않아요.

Department에서 값을 꺼내 쓰면 한 곳만 고치면 됩니다.

// Department
@Getter
private final String majorName;

// OAuthLoginUseCase.findOrRegister
String major = isDepartmentCheckBypassed(userInfo.studentId()) ? Department.SW.majorName() : userInfo.major();

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

예외 학번에 대해서만 일어나는 일이라서 department 코드 자체를 수정하기보다, 말씀해주신 상황이 생겼을 때는 직접 확인 후 수정하는 방향이 더 적절하다고 생각해서 반영하지 않았습니다!


private final AdminConfigValueService adminConfigValueService;
private final OAuthService oauthService;
private final MemberService memberService;
private final PayerService payerService;
Expand All @@ -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);
Expand Down
Original file line number Diff line number Diff line change
@@ -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";
Comment thread
jjunh33 marked this conversation as resolved.
Resolved

private MemberConfigKeys() {}
}
Loading