v2.4.0 (#831)

Author: Sangwook02

docker-compose.yml

@@ -14,6 +14,7 @@ services:
   redis:
     image: "redis:alpine"
     container_name: redis
+    restart: always
     ports:
       - "6379:6379"
     environment:

src/main/java/com/gdschongik/gdsc/domain/common/vo/Money.java

@@ -17,6 +17,8 @@
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 public final class Money {
 
+    public static final Money ZERO = Money.from(BigDecimal.ZERO);
+
     private BigDecimal amount;
 
     @Override
@@ -34,8 +36,6 @@ private Money(BigDecimal amount) {
         this.amount = amount;
     }
 
-    public static final Money ZERO = Money.from(BigDecimal.ZERO);
-
     public static Money from(BigDecimal amount) {
         validateAmountNotNull(amount);
 

src/main/java/com/gdschongik/gdsc/domain/recruitment/domain/vo/Period.java renamed to src/main/java/com/gdschongik/gdsc/domain/common/vo/Period.java

@@ -1,20 +1,22 @@
-package com.gdschongik.gdsc.domain.recruitment.domain.vo;
+package com.gdschongik.gdsc.domain.common.vo;
 
 import static com.gdschongik.gdsc.global.exception.ErrorCode.*;
 
 import com.gdschongik.gdsc.global.exception.CustomException;
 import jakarta.persistence.Embeddable;
 import java.time.LocalDateTime;
-import java.util.Objects;
 import lombok.AccessLevel;
 import lombok.Builder;
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
 @Getter
 @Embeddable
+@EqualsAndHashCode
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
-public class Period {
+public final class Period {
+
     private LocalDateTime startDate;
 
     private LocalDateTime endDate;
@@ -25,7 +27,7 @@ private Period(final LocalDateTime startDate, final LocalDateTime endDate) {
         this.endDate = endDate;
     }
 
-    public static Period createPeriod(LocalDateTime startDate, LocalDateTime endDate) {
+    public static Period of(LocalDateTime startDate, LocalDateTime endDate) {
         validatePeriod(startDate, endDate);
         return Period.builder().startDate(startDate).endDate(endDate).build();
     }
@@ -37,6 +39,7 @@ private static void validatePeriod(LocalDateTime startDate, LocalDateTime endDat
     }
 
     public boolean isOpen() {
+        // TODO: now를 내부에서 선언하지 않고 파라미터로 받아서 테스트 가능하도록 변경
         LocalDateTime now = LocalDateTime.now();
         return (now.isAfter(startDate) || now.isEqual(startDate)) && (now.isBefore(endDate) || now.isEqual(startDate));
     }
@@ -46,17 +49,4 @@ public void validatePeriodOverlap(LocalDateTime startDate, LocalDateTime endDate
             throw new CustomException(PERIOD_OVERLAP);
         }
     }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        Period that = (Period) o;
-        return startDate == that.startDate && endDate == that.endDate;
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(startDate, endDate);
-    }
 }

src/main/java/com/gdschongik/gdsc/domain/coupon/application/CouponService.java

@@ -37,7 +37,7 @@ public class CouponService {
 
     @Transactional
     public void createCoupon(CouponCreateRequest request) {
-        Coupon coupon = Coupon.createCoupon(request.name(), Money.from(request.discountAmount()));
+        Coupon coupon = Coupon.create(request.name(), Money.from(request.discountAmount()));
         couponRepository.save(coupon);
         log.info("[CouponService] 쿠폰 생성: name={}, discountAmount={}", request.name(), request.discountAmount());
     }
@@ -59,7 +59,7 @@ public void createIssuedCoupon(CouponIssueRequest request) {
         List<Member> members = memberRepository.findAllById(request.memberIds());
 
         List<IssuedCoupon> issuedCoupons = members.stream()
-                .map(member -> IssuedCoupon.issue(coupon, member))
+                .map(member -> IssuedCoupon.create(coupon, member))
                 .toList();
 
         issuedCouponRepository.saveAll(issuedCoupons);

src/main/java/com/gdschongik/gdsc/domain/coupon/domain/Coupon.java

@@ -37,7 +37,7 @@ private Coupon(String name, Money discountAmount) {
         this.discountAmount = discountAmount;
     }
 
-    public static Coupon createCoupon(String name, Money discountAmount) {
+    public static Coupon create(String name, Money discountAmount) {
         validateDiscountAmountPositive(discountAmount);
         return Coupon.builder().name(name).discountAmount(discountAmount).build();
     }

src/main/java/com/gdschongik/gdsc/domain/coupon/domain/IssuedCoupon.java

@@ -19,6 +19,7 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import lombok.NonNull;
 import org.hibernate.annotations.Comment;
 
 @Entity
@@ -51,7 +52,7 @@ private IssuedCoupon(Coupon coupon, Member member, Boolean hasRevoked) {
         this.hasRevoked = hasRevoked;
     }
 
-    public static IssuedCoupon issue(Coupon coupon, Member member) {
+    public static IssuedCoupon create(Coupon coupon, Member member) {
         return IssuedCoupon.builder()
                 .coupon(coupon)
                 .member(member)
@@ -83,9 +84,9 @@ private void validateRevokable() {
 
     // 상태 변경 로직
 
-    public void use() {
+    public void use(@NonNull LocalDateTime now) {
         validateUsable();
-        usedAt = LocalDateTime.now();
+        usedAt = now;
     }
 
     public void revoke() {

src/main/java/com/gdschongik/gdsc/domain/discord/application/listener/PingpongListener.java

@@ -20,7 +20,7 @@ public void onMessageReceived(MessageReceivedEvent event) {
         User author = event.getAuthor();
         TextChannel channel = event.getChannel().asTextChannel();
         Message message = event.getMessage();
-        String content = message.getContentRaw(); // get only textual content of message
+        String content = message.getContentRaw();
 
         log.info("Message of {} in {}: {}", author.getName(), channel.getName(), message.getContentDisplay());
 

src/main/java/com/gdschongik/gdsc/domain/member/api/AdminMemberController.java

@@ -8,7 +8,6 @@
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
-import java.io.IOException;
 import lombok.RequiredArgsConstructor;
 import org.springdoc.core.annotations.ParameterObject;
 import org.springframework.data.domain.Page;
@@ -51,7 +50,7 @@ public ResponseEntity<Void> updateMember(
 
     @Operation(summary = "회원 정보 엑셀 다운로드", description = "회원 정보를 엑셀로 다운로드합니다.")
     @GetMapping("/excel")
-    public ResponseEntity<byte[]> createWorkbook() throws IOException {
+    public ResponseEntity<byte[]> createWorkbook() {
         byte[] response = adminMemberService.createExcel();
         ContentDisposition contentDisposition =
                 ContentDisposition.builder("attachment").filename("members.xls").build();

src/main/java/com/gdschongik/gdsc/domain/member/api/OnboardingMemberController.java

@@ -38,13 +38,6 @@ public ResponseEntity<MemberUnivStatusResponse> checkUnivVerification() {
         return ResponseEntity.ok().body(response);
     }
 
-    @Operation(summary = "GDSC Bevy 연동하기", description = "GDSC Bevy 가입 상태를 업데이트합니다.")
-    @PostMapping("/me/link-bevy")
-    public ResponseEntity<Void> linkBevy() {
-        onboardingMemberService.verifyBevyStatus();
-        return ResponseEntity.ok().build();
-    }
-
     @Operation(summary = "기본 회원정보 작성", description = "기본 회원정보를 작성합니다.")
     @PostMapping("/me/basic-info")
     public ResponseEntity<Void> updateBasicMemberInfo(@Valid @RequestBody BasicMemberInfoRequest request) {

src/main/java/com/gdschongik/gdsc/domain/member/application/AdminMemberService.java

@@ -18,7 +18,7 @@
 import com.gdschongik.gdsc.global.util.EnvironmentUtil;
 import com.gdschongik.gdsc.global.util.ExcelUtil;
 import com.gdschongik.gdsc.global.util.MemberUtil;
-import java.io.IOException;
+import java.time.LocalDateTime;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -66,16 +66,17 @@ public void updateMember(Long memberId, MemberUpdateRequest request) {
                 request.nickname());
     }
 
-    public byte[] createExcel() throws IOException {
+    public byte[] createExcel() {
         return excelUtil.createMemberExcel();
     }
 
     @Transactional
     public void demoteAllRegularMembersToAssociate(MemberDemoteRequest request) {
         List<RecruitmentRound> recruitmentRounds = recruitmentRoundRepository.findAllByAcademicYearAndSemesterType(
                 request.academicYear(), request.semesterType());
+        LocalDateTime now = LocalDateTime.now();
 
-        memberValidator.validateMemberDemote(recruitmentRounds);
+        memberValidator.validateMemberDemote(recruitmentRounds, now);
 
         List<Member> regularMembers = memberRepository.findAllByRole(MemberRole.REGULAR);
 

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();

src/main/java/com/gdschongik/gdsc/domain/member/application/TestMemberService.java

@@ -31,7 +31,7 @@ public void createTestMember(String githubHandle) {
             throw new CustomException(INTERNAL_SERVER_ERROR);
         }
 
-        Member guestMember = Member.createGuestMember(githubOauthId);
+        Member guestMember = Member.createGuest(githubOauthId);
         memberRepository.save(guestMember);
     }
 

src/main/java/com/gdschongik/gdsc/domain/member/domain/AssociateRequirement.java

@@ -26,29 +26,21 @@ 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;
     }
 
-    public static AssociateRequirement createRequirement() {
+    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;

src/main/java/com/gdschongik/gdsc/domain/member/domain/Member.java

@@ -106,8 +106,8 @@ private Member(
         this.associateRequirement = associateRequirement;
     }
 
-    public static Member createGuestMember(String oauthId) {
-        AssociateRequirement associateRequirement = AssociateRequirement.createRequirement();
+    public static Member createGuest(String oauthId) {
+        AssociateRequirement associateRequirement = AssociateRequirement.unsatisfied();
         return Member.builder()
                 .oauthId(oauthId)
                 .role(GUEST)
@@ -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();
@@ -293,8 +280,8 @@ public void assignToMentor() {
 
     // 기타 상태 변경 로직
 
-    public void updateLastLoginAt() {
-        this.lastLoginAt = LocalDateTime.now();
+    public void updateLastLoginAt(LocalDateTime now) {
+        this.lastLoginAt = now;
     }
 
     public void updateDiscordId(String discordId) {

src/main/java/com/gdschongik/gdsc/domain/member/domain/MemberValidator.java

@@ -5,19 +5,20 @@
 import com.gdschongik.gdsc.domain.recruitment.domain.RecruitmentRound;
 import com.gdschongik.gdsc.global.annotation.DomainService;
 import com.gdschongik.gdsc.global.exception.CustomException;
+import java.time.LocalDateTime;
 import java.util.List;
 
 @DomainService
 public class MemberValidator {
 
-    public void validateMemberDemote(List<RecruitmentRound> recruitmentRounds) {
+    public void validateMemberDemote(List<RecruitmentRound> recruitmentRounds, LocalDateTime now) {
 
         // 해당 학기에 모집회차가 존재하는지 검증
         if (recruitmentRounds.isEmpty()) {
             throw new CustomException(RECRUITMENT_ROUND_NOT_FOUND);
         }
 
         // 해당 학기의 모든 모집회차가 아직 시작되지 않았는지 검증
-        recruitmentRounds.forEach(RecruitmentRound::validatePeriodNotStarted);
+        recruitmentRounds.forEach(recruitmentRound -> recruitmentRound.validatePeriodNotStarted(now));
     }
 }

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());
         }
     }