diff --git a/src/main/java/com/gdschongik/gdsc/domain/member/api/OnboardingMemberController.java b/src/main/java/com/gdschongik/gdsc/domain/member/api/OnboardingMemberController.java index 9bd572657..ef3adc242 100644 --- a/src/main/java/com/gdschongik/gdsc/domain/member/api/OnboardingMemberController.java +++ b/src/main/java/com/gdschongik/gdsc/domain/member/api/OnboardingMemberController.java @@ -38,13 +38,6 @@ public ResponseEntity checkUnivVerification() { return ResponseEntity.ok().body(response); } - @Operation(summary = "GDSC Bevy 연동하기", description = "GDSC Bevy 가입 상태를 업데이트합니다.") - @PostMapping("/me/link-bevy") - public ResponseEntity linkBevy() { - onboardingMemberService.verifyBevyStatus(); - return ResponseEntity.ok().build(); - } - @Operation(summary = "기본 회원정보 작성", description = "기본 회원정보를 작성합니다.") @PostMapping("/me/basic-info") public ResponseEntity updateBasicMemberInfo(@Valid @RequestBody BasicMemberInfoRequest request) { diff --git a/src/main/java/com/gdschongik/gdsc/domain/member/application/OnboardingMemberService.java b/src/main/java/com/gdschongik/gdsc/domain/member/application/OnboardingMemberService.java index 846d66d48..2aabb9276 100644 --- a/src/main/java/com/gdschongik/gdsc/domain/member/application/OnboardingMemberService.java +++ b/src/main/java/com/gdschongik/gdsc/domain/member/application/OnboardingMemberService.java @@ -49,13 +49,6 @@ public MemberUnivStatusResponse checkUnivVerificationStatus() { return MemberUnivStatusResponse.from(currentMember); } - @Transactional - public void verifyBevyStatus() { - Member currentMember = memberUtil.getCurrentMember(); - currentMember.verifyBevy(); - memberRepository.save(currentMember); - } - @Transactional public void updateBasicMemberInfo(BasicMemberInfoRequest request) { Member currentMember = memberUtil.getCurrentMember(); diff --git a/src/main/java/com/gdschongik/gdsc/domain/member/domain/AssociateRequirement.java b/src/main/java/com/gdschongik/gdsc/domain/member/domain/AssociateRequirement.java index f5653b3e1..a9b2111ea 100644 --- a/src/main/java/com/gdschongik/gdsc/domain/member/domain/AssociateRequirement.java +++ b/src/main/java/com/gdschongik/gdsc/domain/member/domain/AssociateRequirement.java @@ -26,21 +26,14 @@ public class AssociateRequirement { @Enumerated(EnumType.STRING) private RequirementStatus discordStatus; - @Enumerated(EnumType.STRING) - private RequirementStatus bevyStatus; - @Enumerated(EnumType.STRING) private RequirementStatus infoStatus; @Builder(access = AccessLevel.PRIVATE) private AssociateRequirement( - RequirementStatus univStatus, - RequirementStatus discordStatus, - RequirementStatus bevyStatus, - RequirementStatus infoStatus) { + RequirementStatus univStatus, RequirementStatus discordStatus, RequirementStatus infoStatus) { this.univStatus = univStatus; this.discordStatus = discordStatus; - this.bevyStatus = bevyStatus; this.infoStatus = infoStatus; } @@ -48,7 +41,6 @@ public static AssociateRequirement unsatisfied() { return AssociateRequirement.builder() .univStatus(UNSATISFIED) .discordStatus(UNSATISFIED) - .bevyStatus(UNSATISFIED) .infoStatus(UNSATISFIED) .build(); } @@ -63,10 +55,6 @@ public void verifyDiscord() { discordStatus = SATISFIED; } - public void verifyBevy() { - bevyStatus = SATISFIED; - } - public void verifyInfo() { infoStatus = SATISFIED; } @@ -81,10 +69,6 @@ private boolean isDiscordSatisfied() { return discordStatus == SATISFIED; } - private boolean isBevySatisfied() { - return bevyStatus == SATISFIED; - } - private boolean isInfoSatisfied() { return infoStatus == SATISFIED; } @@ -100,10 +84,6 @@ public void validateAllSatisfied() { throw new CustomException(DISCORD_NOT_SATISFIED); } - if (!isBevySatisfied()) { - throw new CustomException(BEVY_NOT_SATISFIED); - } - if (!isInfoSatisfied()) { throw new CustomException(BASIC_INFO_NOT_SATISFIED); } @@ -119,7 +99,6 @@ public void checkVerifiableUniv() { * 모든 준회원 조건을 강등합니다. */ public void demoteAssociateRequirement() { - bevyStatus = UNSATISFIED; discordStatus = UNSATISFIED; infoStatus = UNSATISFIED; univStatus = UNSATISFIED; diff --git a/src/main/java/com/gdschongik/gdsc/domain/member/domain/Member.java b/src/main/java/com/gdschongik/gdsc/domain/member/domain/Member.java index c9fc17235..51d83847d 100644 --- a/src/main/java/com/gdschongik/gdsc/domain/member/domain/Member.java +++ b/src/main/java/com/gdschongik/gdsc/domain/member/domain/Member.java @@ -210,25 +210,12 @@ public void verifyDiscord(String discordUsername, String nickname) { registerEvent(new MemberAssociateEvent(this.id)); } - /** - * Bevy 서버와의 연동을 진행합니다. - * Bevy 인증상태를 인증 처리합니다. - */ - public void verifyBevy() { - validateStatusUpdatable(); - - associateRequirement.verifyBevy(); - - registerEvent(new MemberAssociateEvent(id)); - } - /** * 게스트에서 준회원으로 승급합니다. * 본 로직은 승급조건 충족 이벤트로 트리거됩니다. 다음 조건을 모두 충족하면 승급됩니다. * 조건 1 : 기본 회원정보 작성 * 조건 2 : 재학생 인증 * 조건 3 : 디스코드 인증 - * 조건 4 : Bevy 인증 */ public void advanceToAssociate() { validateStatusUpdatable(); diff --git a/src/main/java/com/gdschongik/gdsc/domain/member/dto/MemberFullDto.java b/src/main/java/com/gdschongik/gdsc/domain/member/dto/MemberFullDto.java index e638961e9..ecc39fcfc 100644 --- a/src/main/java/com/gdschongik/gdsc/domain/member/dto/MemberFullDto.java +++ b/src/main/java/com/gdschongik/gdsc/domain/member/dto/MemberFullDto.java @@ -57,13 +57,11 @@ public record MemberAssociateRequirementDto( UnivVerificationStatus univStatus, @Schema(description = "디스코드 인증상태", implementation = RequirementStatus.class) RequirementStatus discordStatus, - @Schema(description = "bevy 인증상태", implementation = RequirementStatus.class) RequirementStatus bevyStatus, @Schema(description = "회원정보 입력상태", implementation = RequirementStatus.class) RequirementStatus infoStatus) { public static MemberAssociateRequirementDto of(Member member, UnivVerificationStatus univVerificationStatus) { return new MemberAssociateRequirementDto( univVerificationStatus, member.getAssociateRequirement().getDiscordStatus(), - member.getAssociateRequirement().getBevyStatus(), member.getAssociateRequirement().getInfoStatus()); } } diff --git a/src/main/java/com/gdschongik/gdsc/domain/member/dto/response/AdminMemberResponse.java b/src/main/java/com/gdschongik/gdsc/domain/member/dto/response/AdminMemberResponse.java index 434921dc1..3c55dc941 100644 --- a/src/main/java/com/gdschongik/gdsc/domain/member/dto/response/AdminMemberResponse.java +++ b/src/main/java/com/gdschongik/gdsc/domain/member/dto/response/AdminMemberResponse.java @@ -38,12 +38,11 @@ public static DepartmentDto from(Department department) { } } - record RequirementDto(String univStatus, String discordStatus, String bevyStatus) { + record RequirementDto(String univStatus, String discordStatus) { public static RequirementDto from(AssociateRequirement associateRequirement) { return new RequirementDto( associateRequirement.getUnivStatus().name(), - associateRequirement.getDiscordStatus().name(), - associateRequirement.getBevyStatus().name()); + associateRequirement.getDiscordStatus().name()); } } } diff --git a/src/main/java/com/gdschongik/gdsc/global/exception/ErrorCode.java b/src/main/java/com/gdschongik/gdsc/global/exception/ErrorCode.java index 36d1984c4..eb5e17388 100644 --- a/src/main/java/com/gdschongik/gdsc/global/exception/ErrorCode.java +++ b/src/main/java/com/gdschongik/gdsc/global/exception/ErrorCode.java @@ -44,7 +44,6 @@ public enum ErrorCode { // Requirement UNIV_NOT_SATISFIED(HttpStatus.CONFLICT, "재학생 인증이 완료되지 않았습니다."), DISCORD_NOT_SATISFIED(HttpStatus.CONFLICT, "디스코드 인증이 완료되지 않았습니다."), - BEVY_NOT_SATISFIED(HttpStatus.CONFLICT, "GDSC Bevy 가입이 완료되지 않았습니다."), EMAIL_ALREADY_SATISFIED(HttpStatus.CONFLICT, "이미 이메일 인증된 회원입니다."), BASIC_INFO_NOT_SATISFIED(HttpStatus.CONFLICT, "기본 회원정보 작성이 완료되지 않았습니다."), diff --git a/src/test/java/com/gdschongik/gdsc/domain/member/dao/MemberRepositoryTest.java b/src/test/java/com/gdschongik/gdsc/domain/member/dao/MemberRepositoryTest.java index 90e061be4..7013e9fe5 100644 --- a/src/test/java/com/gdschongik/gdsc/domain/member/dao/MemberRepositoryTest.java +++ b/src/test/java/com/gdschongik/gdsc/domain/member/dao/MemberRepositoryTest.java @@ -90,7 +90,6 @@ class 역할로_조회할때 { member.updateBasicMemberInfo(STUDENT_ID, NAME, PHONE_NUMBER, D022, UNIV_EMAIL); member.completeUnivEmailVerification(UNIV_EMAIL); member.verifyDiscord(DISCORD_USERNAME, NICKNAME); - member.verifyBevy(); member.advanceToAssociate(); flushAndClearBeforeExecute(); @@ -110,7 +109,6 @@ class 역할로_조회할때 { member.updateBasicMemberInfo(STUDENT_ID, NAME, PHONE_NUMBER, D022, UNIV_EMAIL); member.completeUnivEmailVerification(UNIV_EMAIL); member.verifyDiscord(DISCORD_USERNAME, NICKNAME); - member.verifyBevy(); member.advanceToAssociate(); flushAndClearBeforeExecute(); diff --git a/src/test/java/com/gdschongik/gdsc/domain/member/domain/MemberTest.java b/src/test/java/com/gdschongik/gdsc/domain/member/domain/MemberTest.java index 0cc6615bb..becb6f2b9 100644 --- a/src/test/java/com/gdschongik/gdsc/domain/member/domain/MemberTest.java +++ b/src/test/java/com/gdschongik/gdsc/domain/member/domain/MemberTest.java @@ -52,7 +52,6 @@ class 게스트_회원가입시 { // then assertThat(requirement.getUnivStatus()).isEqualTo(UNSATISFIED); assertThat(requirement.getDiscordStatus()).isEqualTo(UNSATISFIED); - assertThat(requirement.getBevyStatus()).isEqualTo(UNSATISFIED); assertThat(requirement.getInfoStatus()).isEqualTo(UNSATISFIED); } } @@ -98,19 +97,6 @@ class 준회원_가입조건_인증시도시 { AssociateRequirement requirement = member.getAssociateRequirement(); assertThat(requirement.getDiscordStatus()).isEqualTo(SATISFIED); } - - @Test - void Bevy_인증시_준회원_가입조건중_Bevy_인증상태가_인증된다() { - // given - Member member = Member.createGuest(OAUTH_ID); - - // when - member.verifyBevy(); - - // then - AssociateRequirement requirement = member.getAssociateRequirement(); - assertThat(requirement.getBevyStatus()).isEqualTo(SATISFIED); - } } @Nested @@ -123,7 +109,6 @@ class 준회원으로_승급시도시 { member.verifyDiscord(DISCORD_USERNAME, NICKNAME); member.completeUnivEmailVerification(UNIV_EMAIL); - member.verifyBevy(); // when & then assertThatThrownBy(member::advanceToAssociate) @@ -138,7 +123,6 @@ class 준회원으로_승급시도시 { member.updateBasicMemberInfo(STUDENT_ID, NAME, PHONE_NUMBER, D022, EMAIL); member.completeUnivEmailVerification(UNIV_EMAIL); - member.verifyBevy(); // when & then assertThatThrownBy(member::advanceToAssociate) @@ -146,21 +130,6 @@ class 준회원으로_승급시도시 { .hasMessage(DISCORD_NOT_SATISFIED.getMessage()); } - @Test - void Bevy_연동하지_않았으면_실패한다() { - // given - Member member = Member.createGuest(OAUTH_ID); - - member.updateBasicMemberInfo(STUDENT_ID, NAME, PHONE_NUMBER, D022, EMAIL); - member.completeUnivEmailVerification(UNIV_EMAIL); - member.verifyDiscord(DISCORD_USERNAME, NICKNAME); - - // when & then - assertThatThrownBy(member::advanceToAssociate) - .isInstanceOf(CustomException.class) - .hasMessage(BEVY_NOT_SATISFIED.getMessage()); - } - @Test void 이미_준회원으로_승급_돼있으면_실패한다() { // given @@ -169,7 +138,6 @@ class 준회원으로_승급시도시 { member.updateBasicMemberInfo(STUDENT_ID, NAME, PHONE_NUMBER, D022, EMAIL); member.completeUnivEmailVerification(UNIV_EMAIL); member.verifyDiscord(DISCORD_USERNAME, NICKNAME); - member.verifyBevy(); member.advanceToAssociate(); // when & then @@ -186,7 +154,6 @@ class 준회원으로_승급시도시 { member.updateBasicMemberInfo(STUDENT_ID, NAME, PHONE_NUMBER, D022, EMAIL); member.completeUnivEmailVerification(UNIV_EMAIL); member.verifyDiscord(DISCORD_USERNAME, NICKNAME); - member.verifyBevy(); // when member.advanceToAssociate(); @@ -271,19 +238,6 @@ class 회원수정시 { .hasMessage(MEMBER_DELETED.getMessage()); } - @Test - void Bevy인증시_탈퇴한_유저면_실패한다() { - // given - Member member = Member.createGuest(OAUTH_ID); - - member.withdraw(); - - // when & then - assertThatThrownBy(member::verifyBevy) - .isInstanceOf(CustomException.class) - .hasMessage(MEMBER_DELETED.getMessage()); - } - @Nested class 정회원으로_승급_시도시 { @Test @@ -294,7 +248,6 @@ class 정회원으로_승급_시도시 { member.updateBasicMemberInfo(STUDENT_ID, NAME, PHONE_NUMBER, D022, EMAIL); member.completeUnivEmailVerification(UNIV_EMAIL); member.verifyDiscord(DISCORD_USERNAME, NICKNAME); - member.verifyBevy(); member.advanceToAssociate(); member.advanceToRegular(); @@ -323,7 +276,6 @@ class 정회원으로_승급_시도시 { member.updateBasicMemberInfo(STUDENT_ID, NAME, PHONE_NUMBER, D022, EMAIL); member.completeUnivEmailVerification(UNIV_EMAIL); member.verifyDiscord(DISCORD_USERNAME, NICKNAME); - member.verifyBevy(); member.advanceToAssociate(); // when @@ -345,7 +297,6 @@ class 비회원으로_강등시 { member.updateBasicMemberInfo(STUDENT_ID, NAME, PHONE_NUMBER, D022, EMAIL); member.completeUnivEmailVerification(UNIV_EMAIL); member.verifyDiscord(DISCORD_USERNAME, NICKNAME); - member.verifyBevy(); member.advanceToAssociate(); // when @@ -368,9 +319,8 @@ class 비회원으로_강등시 { .extracting( AssociateRequirement::getDiscordStatus, AssociateRequirement::getInfoStatus, - AssociateRequirement::getBevyStatus, AssociateRequirement::getUnivStatus) - .containsExactly(UNSATISFIED, UNSATISFIED, UNSATISFIED, UNSATISFIED); + .containsExactly(UNSATISFIED, UNSATISFIED, UNSATISFIED); } } } diff --git a/src/test/java/com/gdschongik/gdsc/domain/membership/domain/MembershipTest.java b/src/test/java/com/gdschongik/gdsc/domain/membership/domain/MembershipTest.java index bcbfe0a96..98a57e8bf 100644 --- a/src/test/java/com/gdschongik/gdsc/domain/membership/domain/MembershipTest.java +++ b/src/test/java/com/gdschongik/gdsc/domain/membership/domain/MembershipTest.java @@ -26,7 +26,6 @@ class 멤버십_가입신청시 { member.updateBasicMemberInfo(STUDENT_ID, NAME, PHONE_NUMBER, D022, EMAIL); member.completeUnivEmailVerification(UNIV_EMAIL); member.verifyDiscord(DISCORD_USERNAME, NICKNAME); - member.verifyBevy(); member.advanceToAssociate(); Recruitment recruitment = Recruitment.create( diff --git a/src/test/java/com/gdschongik/gdsc/domain/membership/domain/MembershipValidatorTest.java b/src/test/java/com/gdschongik/gdsc/domain/membership/domain/MembershipValidatorTest.java index eb8495117..d858b7146 100644 --- a/src/test/java/com/gdschongik/gdsc/domain/membership/domain/MembershipValidatorTest.java +++ b/src/test/java/com/gdschongik/gdsc/domain/membership/domain/MembershipValidatorTest.java @@ -29,7 +29,6 @@ private Member createAssociateMember(Long id) { member.updateBasicMemberInfo(STUDENT_ID, NAME, PHONE_NUMBER, D022, EMAIL); member.completeUnivEmailVerification(UNIV_EMAIL); member.verifyDiscord(DISCORD_USERNAME, NICKNAME); - member.verifyBevy(); member.advanceToAssociate(); ReflectionTestUtils.setField(member, "id", id); return member; diff --git a/src/test/java/com/gdschongik/gdsc/domain/study/domain/StudyTest.java b/src/test/java/com/gdschongik/gdsc/domain/study/domain/StudyTest.java index 4ad001fed..8ed31213e 100644 --- a/src/test/java/com/gdschongik/gdsc/domain/study/domain/StudyTest.java +++ b/src/test/java/com/gdschongik/gdsc/domain/study/domain/StudyTest.java @@ -24,7 +24,6 @@ private Member createAssociateMember(Long id) { member.updateBasicMemberInfo(STUDENT_ID, NAME, PHONE_NUMBER, D022, EMAIL); member.completeUnivEmailVerification(UNIV_EMAIL); member.verifyDiscord(DISCORD_USERNAME, NICKNAME); - member.verifyBevy(); member.advanceToAssociate(); ReflectionTestUtils.setField(member, "id", id); return member; diff --git a/src/test/java/com/gdschongik/gdsc/helper/FixtureHelper.java b/src/test/java/com/gdschongik/gdsc/helper/FixtureHelper.java index 1f64b54ac..2b17b8be8 100644 --- a/src/test/java/com/gdschongik/gdsc/helper/FixtureHelper.java +++ b/src/test/java/com/gdschongik/gdsc/helper/FixtureHelper.java @@ -36,7 +36,6 @@ public Member createAssociateMember(Long id) { member.updateBasicMemberInfo(STUDENT_ID, NAME, PHONE_NUMBER, D022, EMAIL); member.completeUnivEmailVerification(UNIV_EMAIL); member.verifyDiscord(DISCORD_USERNAME, NICKNAME); - member.verifyBevy(); member.advanceToAssociate(); return member; } diff --git a/src/test/java/com/gdschongik/gdsc/helper/IntegrationTest.java b/src/test/java/com/gdschongik/gdsc/helper/IntegrationTest.java index 06ed3515b..29c7b7da4 100644 --- a/src/test/java/com/gdschongik/gdsc/helper/IntegrationTest.java +++ b/src/test/java/com/gdschongik/gdsc/helper/IntegrationTest.java @@ -151,7 +151,6 @@ protected Member createMember() { member.completeUnivEmailVerification(UNIV_EMAIL); member.updateBasicMemberInfo(STUDENT_ID, NAME, PHONE_NUMBER, D022, EMAIL); member.verifyDiscord(DISCORD_USERNAME, NICKNAME); - member.verifyBevy(); member.updateDiscordId(DISCORD_ID); return memberRepository.save(member); @@ -168,7 +167,6 @@ protected Member createAssociateMember() { member.updateBasicMemberInfo(STUDENT_ID, NAME, PHONE_NUMBER, D022, EMAIL); member.completeUnivEmailVerification(UNIV_EMAIL); member.verifyDiscord(DISCORD_USERNAME, NICKNAME); - member.verifyBevy(); member.advanceToAssociate(); return memberRepository.save(member); }