From cc5637b59347052a617a2d9e9243044f669ff91f Mon Sep 17 00:00:00 2001 From: Sumin Hwang <163857590+tnals0924@users.noreply.github.com> Date: Wed, 30 Sep 2026 17:50:08 +0900 Subject: [PATCH 1/5] =?UTF-8?q?feat:=20=EB=A1=9C=EA=B7=B8=EC=9D=B8?= =?UTF-8?q?=EC=9A=A9=20=ED=9A=8C=EC=9B=90=20=EA=B0=80=EC=9E=85=C2=B7?= =?UTF-8?q?=EA=B0=B1=EC=8B=A0=EA=B3=BC=20=ED=95=99=EC=A0=81=20=EC=83=81?= =?UTF-8?q?=ED=83=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/member/domain/Department.java | 20 ++++++++++++++-- .../member/domain/member/domain/Member.java | 17 ++++++++++++- .../domain/member/domain/MemberErrorCode.java | 3 ++- .../member/domain/MemberProfileCommand.java | 11 +++++++++ .../member/repository/MemberRepository.java | 2 ++ .../domain/member/service/MemberService.java | 3 +++ .../service/impl/MemberServiceImpl.java | 24 +++++++++++++++++++ .../stream/db/member/MemberJpaEntity.java | 6 ++++- .../stream/db/member/MemberJpaRepository.java | 2 ++ .../db/member/MemberRepositoryImpl.java | 10 ++++++++ .../V14__add_academic_status_to_members.sql | 4 ++++ 11 files changed, 97 insertions(+), 5 deletions(-) create mode 100644 core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/domain/MemberProfileCommand.java create mode 100644 infrastructure/db/src/main/resources/db/migration/V14__add_academic_status_to_members.sql diff --git a/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/domain/Department.java b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/domain/Department.java index c5b5c6a3..80d977a2 100644 --- a/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/domain/Department.java +++ b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/domain/Department.java @@ -1,9 +1,25 @@ 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) { + return Arrays.stream(values()) + .filter(department -> major != null && major.contains(department.majorName)) + .findFirst() + .orElseThrow(() -> new BusinessException(MemberErrorCode.DEPARTMENT_NOT_ALLOWED)); + } } diff --git a/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/domain/Member.java b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/domain/Member.java index ef5deb80..75f43d22 100644 --- a/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/domain/Member.java +++ b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/domain/Member.java @@ -16,21 +16,36 @@ 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의 최신 이름·학부·학적 상태로 갱신한다 + public void updateProfile(String name, Department department, String academicStatus) { + this.name = name; + this.department = department; + this.academicStatus = academicStatus; } } diff --git a/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/domain/MemberErrorCode.java b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/domain/MemberErrorCode.java index 5df8fbb3..1bfc9911 100644 --- a/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/domain/MemberErrorCode.java +++ b/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; diff --git a/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/domain/MemberProfileCommand.java b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/domain/MemberProfileCommand.java new file mode 100644 index 00000000..a1552128 --- /dev/null +++ b/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 +) {} diff --git a/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/repository/MemberRepository.java b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/repository/MemberRepository.java index 49c027fc..c7e98d8e 100644 --- a/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/repository/MemberRepository.java +++ b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/repository/MemberRepository.java @@ -6,6 +6,8 @@ public interface MemberRepository { Optional findById(Long id); + Optional findByStudentId(String studentId); List findAllByIds(List ids); List searchIdsByKeyword(String keyword); + Member save(Member member); } diff --git a/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/service/MemberService.java b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/service/MemberService.java index 46ef4bc6..7cd62f93 100644 --- a/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/service/MemberService.java +++ b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/service/MemberService.java @@ -3,10 +3,13 @@ import java.util.List; import java.util.Map; import kr.ac.kookmin.stream.member.domain.member.domain.Member; +import kr.ac.kookmin.stream.member.domain.member.domain.MemberProfileCommand; public interface MemberService { Member getById(Long id); List findAllByIds(List ids); Map getMapByIds(List ids); List searchIdsByKeyword(String keyword); + Member updateProfile(Long id, MemberProfileCommand command); + Member registerOrUpdateByStudentId(MemberProfileCommand command); } diff --git a/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/service/impl/MemberServiceImpl.java b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/service/impl/MemberServiceImpl.java index b41d13e9..19d90ac7 100644 --- a/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/service/impl/MemberServiceImpl.java +++ b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/service/impl/MemberServiceImpl.java @@ -5,12 +5,15 @@ import java.util.function.Function; import java.util.stream.Collectors; import kr.ac.kookmin.stream.common.BusinessException; +import kr.ac.kookmin.stream.member.domain.member.domain.Department; import kr.ac.kookmin.stream.member.domain.member.domain.Member; import kr.ac.kookmin.stream.member.domain.member.domain.MemberErrorCode; +import kr.ac.kookmin.stream.member.domain.member.domain.MemberProfileCommand; import kr.ac.kookmin.stream.member.domain.member.repository.MemberRepository; import kr.ac.kookmin.stream.member.domain.member.service.MemberService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; @Service @RequiredArgsConstructor @@ -40,4 +43,25 @@ public Map getMapByIds(List ids) { public List searchIdsByKeyword(String keyword) { return memberRepository.searchIdsByKeyword(keyword); } + + @Override + @Transactional + public Member updateProfile(Long id, MemberProfileCommand command) { + Member member = getById(id); + member.updateProfile(command.name(), Department.fromMajor(command.major()), command.academicStatus()); + return memberRepository.save(member); + } + + @Override + @Transactional + public Member registerOrUpdateByStudentId(MemberProfileCommand command) { + Department department = Department.fromMajor(command.major()); + Member member = memberRepository.findByStudentId(command.studentId()) + .map(existing -> { + existing.updateProfile(command.name(), department, command.academicStatus()); + return existing; + }) + .orElseGet(() -> Member.create(command.studentId(), command.name(), department, command.academicStatus())); + return memberRepository.save(member); + } } diff --git a/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/member/MemberJpaEntity.java b/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/member/MemberJpaEntity.java index 0f68a633..a3069ec3 100644 --- a/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/member/MemberJpaEntity.java +++ b/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/member/MemberJpaEntity.java @@ -38,6 +38,9 @@ public class MemberJpaEntity extends BaseSoftDeleteEntity { @Column(nullable = false, length = 30) private Department department; + @Column(name = "academic_status", length = 50) + private String academicStatus; + private String email; @Column(name = "fcm_token") @@ -56,6 +59,7 @@ private MemberJpaEntity(Member member) { this.studentId = member.getStudentId(); this.name = member.getName(); this.department = member.getDepartment(); + this.academicStatus = member.getAcademicStatus(); this.email = member.getEmail(); this.fcmToken = member.getFcmToken(); this.role = member.getRole(); @@ -67,6 +71,6 @@ public static MemberJpaEntity from(Member member) { } public Member toDomain() { - return Member.of(id, studentId, name, department, email, fcmToken, role, councilDepartment); + return Member.of(id, studentId, name, department, academicStatus, email, fcmToken, role, councilDepartment); } } diff --git a/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/member/MemberJpaRepository.java b/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/member/MemberJpaRepository.java index 24fbf7ab..2877d272 100644 --- a/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/member/MemberJpaRepository.java +++ b/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/member/MemberJpaRepository.java @@ -10,6 +10,8 @@ public interface MemberJpaRepository extends JpaRepository findByIdAndIsDeletedFalse(Long id); + Optional findByStudentIdAndIsDeletedFalse(String studentId); + List findAllByIdInAndIsDeletedFalse(List ids); @Query(""" diff --git a/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/member/MemberRepositoryImpl.java b/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/member/MemberRepositoryImpl.java index 88e7e1a2..89998df2 100644 --- a/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/member/MemberRepositoryImpl.java +++ b/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/member/MemberRepositoryImpl.java @@ -18,6 +18,11 @@ public Optional findById(Long id) { return memberJpaRepository.findByIdAndIsDeletedFalse(id).map(MemberJpaEntity::toDomain); } + @Override + public Optional findByStudentId(String studentId) { + return memberJpaRepository.findByStudentIdAndIsDeletedFalse(studentId).map(MemberJpaEntity::toDomain); + } + @Override public List findAllByIds(List ids) { if (ids.isEmpty()) { @@ -32,4 +37,9 @@ public List findAllByIds(List ids) { public List searchIdsByKeyword(String keyword) { return memberJpaRepository.searchIdsByKeyword(keyword); } + + @Override + public Member save(Member member) { + return memberJpaRepository.save(MemberJpaEntity.from(member)).toDomain(); + } } diff --git a/infrastructure/db/src/main/resources/db/migration/V14__add_academic_status_to_members.sql b/infrastructure/db/src/main/resources/db/migration/V14__add_academic_status_to_members.sql new file mode 100644 index 00000000..151c6acc --- /dev/null +++ b/infrastructure/db/src/main/resources/db/migration/V14__add_academic_status_to_members.sql @@ -0,0 +1,4 @@ +-- 로그인 provider가 주는 학적 상태 원문(재학·휴학·졸업 등). 로그인할 때마다 갱신한다. +-- 로그인 전인 기존(이관) 회원은 값이 없으므로 NULL을 허용한다. +ALTER TABLE members + ADD COLUMN academic_status VARCHAR(50) NULL AFTER department; From aaf22a3da86bb4fc8025dac41864fe06de0be124 Mon Sep 17 00:00:00 2001 From: Sumin Hwang <163857590+tnals0924@users.noreply.github.com> Date: Wed, 30 Sep 2026 17:50:08 +0900 Subject: [PATCH 2/5] =?UTF-8?q?feat:=20=ED=95=84=EC=88=98=20=EC=95=BD?= =?UTF-8?q?=EA=B4=80=20=EB=8F=99=EC=9D=98=20=EC=97=AC=EB=B6=80=20=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MemberTermAgreementRepository.java | 8 +++++ .../member/service/MemberTermService.java | 5 ++++ .../service/impl/MemberTermServiceImpl.java | 30 +++++++++++++++++++ .../MemberTermAgreementJpaRepository.java | 8 +++++ .../MemberTermAgreementRepositoryImpl.java | 21 +++++++++++++ 5 files changed, 72 insertions(+) create mode 100644 core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/repository/MemberTermAgreementRepository.java create mode 100644 core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/service/MemberTermService.java create mode 100644 core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/service/impl/MemberTermServiceImpl.java create mode 100644 infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/member/MemberTermAgreementJpaRepository.java create mode 100644 infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/member/MemberTermAgreementRepositoryImpl.java diff --git a/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/repository/MemberTermAgreementRepository.java b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/repository/MemberTermAgreementRepository.java new file mode 100644 index 00000000..2ad7a2ec --- /dev/null +++ b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/repository/MemberTermAgreementRepository.java @@ -0,0 +1,8 @@ +package kr.ac.kookmin.stream.member.domain.member.repository; + +import java.util.List; +import kr.ac.kookmin.stream.member.domain.member.domain.MemberTermAgreement; + +public interface MemberTermAgreementRepository { + List findAllByMemberId(Long memberId); +} diff --git a/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/service/MemberTermService.java b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/service/MemberTermService.java new file mode 100644 index 00000000..0abd77db --- /dev/null +++ b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/service/MemberTermService.java @@ -0,0 +1,5 @@ +package kr.ac.kookmin.stream.member.domain.member.service; + +public interface MemberTermService { + boolean hasAgreedRequiredTerms(Long memberId); +} diff --git a/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/service/impl/MemberTermServiceImpl.java b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/service/impl/MemberTermServiceImpl.java new file mode 100644 index 00000000..2fdff165 --- /dev/null +++ b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/service/impl/MemberTermServiceImpl.java @@ -0,0 +1,30 @@ +package kr.ac.kookmin.stream.member.domain.member.service.impl; + +import java.util.EnumSet; +import java.util.Set; +import java.util.stream.Collectors; +import kr.ac.kookmin.stream.member.domain.member.domain.MemberTermAgreement; +import kr.ac.kookmin.stream.member.domain.member.domain.TermType; +import kr.ac.kookmin.stream.member.domain.member.repository.MemberTermAgreementRepository; +import kr.ac.kookmin.stream.member.domain.member.service.MemberTermService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +class MemberTermServiceImpl implements MemberTermService { + + private static final Set REQUIRED_TERM_TYPES = + EnumSet.of(TermType.PRIVACY_POLICY, TermType.TERMS_OF_SERVICE); + + private final MemberTermAgreementRepository memberTermAgreementRepository; + + @Override + public boolean hasAgreedRequiredTerms(Long memberId) { + Set agreedTermTypes = memberTermAgreementRepository.findAllByMemberId(memberId).stream() + .filter(MemberTermAgreement::isAgreed) + .map(MemberTermAgreement::getTermType) + .collect(Collectors.toSet()); + return agreedTermTypes.containsAll(REQUIRED_TERM_TYPES); + } +} diff --git a/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/member/MemberTermAgreementJpaRepository.java b/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/member/MemberTermAgreementJpaRepository.java new file mode 100644 index 00000000..35637f1f --- /dev/null +++ b/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/member/MemberTermAgreementJpaRepository.java @@ -0,0 +1,8 @@ +package kr.ac.kookmin.stream.db.member; + +import java.util.List; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface MemberTermAgreementJpaRepository extends JpaRepository { + List findAllByMemberId(Long memberId); +} diff --git a/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/member/MemberTermAgreementRepositoryImpl.java b/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/member/MemberTermAgreementRepositoryImpl.java new file mode 100644 index 00000000..42d8f3b0 --- /dev/null +++ b/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/member/MemberTermAgreementRepositoryImpl.java @@ -0,0 +1,21 @@ +package kr.ac.kookmin.stream.db.member; + +import java.util.List; +import kr.ac.kookmin.stream.member.domain.member.domain.MemberTermAgreement; +import kr.ac.kookmin.stream.member.domain.member.repository.MemberTermAgreementRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Repository; + +@Repository +@RequiredArgsConstructor +public class MemberTermAgreementRepositoryImpl implements MemberTermAgreementRepository { + + private final MemberTermAgreementJpaRepository memberTermAgreementJpaRepository; + + @Override + public List findAllByMemberId(Long memberId) { + return memberTermAgreementJpaRepository.findAllByMemberId(memberId).stream() + .map(MemberTermAgreementJpaEntity::toDomain) + .toList(); + } +} From adaaa5dfa338ca79212ccc368c6ed0a4f895925b Mon Sep 17 00:00:00 2001 From: Sumin Hwang <163857590+tnals0924@users.noreply.github.com> Date: Wed, 30 Sep 2026 17:50:23 +0900 Subject: [PATCH 3/5] =?UTF-8?q?feat:=20=ED=95=99=EB=B6=80=20=EC=9D=91?= =?UTF-8?q?=EB=8B=B5=EC=9D=84=20=EC=86=8C=ED=94=84=ED=8A=B8=EC=9B=A8?= =?UTF-8?q?=EC=96=B4=ED=95=99=EB=B6=80=C2=B7=EC=9D=B8=EA=B3=B5=EC=A7=80?= =?UTF-8?q?=EB=8A=A5=ED=95=99=EB=B6=80=20=ED=91=9C=EC=8B=9C=EB=AA=85?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../welfare/fee/response/AdminFeeSearchResponse.java | 2 +- .../member/domain/member/domain/Department.java | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/api/admin-api/src/main/java/kr/ac/kookmin/stream/api/admin/welfare/fee/response/AdminFeeSearchResponse.java b/api/admin-api/src/main/java/kr/ac/kookmin/stream/api/admin/welfare/fee/response/AdminFeeSearchResponse.java index 79901141..6f6fdab6 100644 --- a/api/admin-api/src/main/java/kr/ac/kookmin/stream/api/admin/welfare/fee/response/AdminFeeSearchResponse.java +++ b/api/admin-api/src/main/java/kr/ac/kookmin/stream/api/admin/welfare/fee/response/AdminFeeSearchResponse.java @@ -22,7 +22,7 @@ public static AdminFeeSearchResponse of(StudentTransferStatus status, Member mem status.getMemberId(), member != null ? member.getName() : ApiConstants.WITHDRAWN_MEMBER_LABEL, member != null ? member.getStudentId() : null, - member != null ? member.getDepartment().name() : null, + member != null ? member.getDepartment().displayName() : null, status.getStatus().name(), status.getCreatedAt(), status.getReviewedAt() diff --git a/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/domain/Department.java b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/domain/Department.java index 80d977a2..694a41d8 100644 --- a/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/domain/Department.java +++ b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/domain/Department.java @@ -3,18 +3,25 @@ import java.util.Arrays; import kr.ac.kookmin.stream.common.BusinessException; import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.experimental.Accessors; /** * 학부. 학생회 부서(CouncilDepartment)와는 다른 개념이다. */ +@Accessors(fluent = true) @AllArgsConstructor public enum Department { - AI("인공지능전공"), - SW("소프트웨어전공"); + AI("인공지능전공", "인공지능학부"), + SW("소프트웨어전공", "소프트웨어학부"); // 로그인 provider가 주는 소속 문자열에서 찾는 전공명 private final String majorName; + // 응답에 내려주는 학부명 + @Getter + private final String displayName; + /** 소속 문자열을 학부로 바꾼다. 소프트웨어융합대학 전공이 아니면 가입할 수 없다. */ public static Department fromMajor(String major) { return Arrays.stream(values()) From 702c0f43ac69c72e966df6c3ae9646259cd7d740 Mon Sep 17 00:00:00 2001 From: Sumin Hwang <163857590+tnals0924@users.noreply.github.com> Date: Fri, 2 Oct 2026 16:37:14 +0900 Subject: [PATCH 4/5] =?UTF-8?q?refactor:=20Department.fromMajor=EC=9D=98?= =?UTF-8?q?=20null=20=EA=B2=80=EC=82=AC=EB=A5=BC=20=EB=A9=94=EC=84=9C?= =?UTF-8?q?=EB=93=9C=20=EC=A7=84=EC=9E=85=EB=B6=80=EB=A1=9C=20=EC=9D=B4?= =?UTF-8?q?=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stream/member/domain/member/domain/Department.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/domain/Department.java b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/domain/Department.java index 80d977a2..3811d097 100644 --- a/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/domain/Department.java +++ b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/domain/Department.java @@ -17,8 +17,11 @@ public enum Department { /** 소속 문자열을 학부로 바꾼다. 소프트웨어융합대학 전공이 아니면 가입할 수 없다. */ public static Department fromMajor(String major) { + if (major == null) { + throw new BusinessException(MemberErrorCode.DEPARTMENT_NOT_ALLOWED); + } return Arrays.stream(values()) - .filter(department -> major != null && major.contains(department.majorName)) + .filter(department -> major.contains(department.majorName)) .findFirst() .orElseThrow(() -> new BusinessException(MemberErrorCode.DEPARTMENT_NOT_ALLOWED)); } From 1899e982d9ba911a29d7bbe16328ccc659eaae03 Mon Sep 17 00:00:00 2001 From: Sumin Hwang <163857590+tnals0924@users.noreply.github.com> Date: Fri, 2 Oct 2026 16:37:14 +0900 Subject: [PATCH 5/5] =?UTF-8?q?refactor:=20=ED=95=84=EC=88=98=20=EC=95=BD?= =?UTF-8?q?=EA=B4=80=20=EC=97=AC=EB=B6=80=EB=A5=BC=20TermType=EC=9D=98=20r?= =?UTF-8?q?equired=20=ED=95=84=EB=93=9C=EB=A1=9C=20=EC=9D=B4=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../member/domain/member/domain/TermType.java | 16 ++++++++++++++-- .../service/impl/MemberTermServiceImpl.java | 9 ++++----- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/domain/TermType.java b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/domain/TermType.java index 68758db3..a70eb1ce 100644 --- a/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/domain/TermType.java +++ b/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; } diff --git a/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/service/impl/MemberTermServiceImpl.java b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/service/impl/MemberTermServiceImpl.java index 2fdff165..855ecb16 100644 --- a/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/service/impl/MemberTermServiceImpl.java +++ b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/member/service/impl/MemberTermServiceImpl.java @@ -1,6 +1,6 @@ package kr.ac.kookmin.stream.member.domain.member.service.impl; -import java.util.EnumSet; +import java.util.Arrays; import java.util.Set; import java.util.stream.Collectors; import kr.ac.kookmin.stream.member.domain.member.domain.MemberTermAgreement; @@ -14,9 +14,6 @@ @RequiredArgsConstructor class MemberTermServiceImpl implements MemberTermService { - private static final Set REQUIRED_TERM_TYPES = - EnumSet.of(TermType.PRIVACY_POLICY, TermType.TERMS_OF_SERVICE); - private final MemberTermAgreementRepository memberTermAgreementRepository; @Override @@ -25,6 +22,8 @@ public boolean hasAgreedRequiredTerms(Long memberId) { .filter(MemberTermAgreement::isAgreed) .map(MemberTermAgreement::getTermType) .collect(Collectors.toSet()); - return agreedTermTypes.containsAll(REQUIRED_TERM_TYPES); + return Arrays.stream(TermType.values()) + .filter(TermType::required) + .allMatch(agreedTermTypes::contains); } }