v1.3.0 (#218)

GDSC-Hongik · Mar 1, 2024 · d09843a · d09843a
2 parents f3e87b9 + f40451d
commit d09843a
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 8 deletions.
diff --git a/src/main/java/com/gdschongik/gdsc/domain/auth/application/JwtService.java b/src/main/java/com/gdschongik/gdsc/domain/auth/application/JwtService.java
@@ -33,11 +33,9 @@ public RefreshTokenDto createRefreshToken(Long memberId) {
     }
 
     private void saveRefreshTokenToRedis(RefreshTokenDto refreshTokenDto) {
-        RefreshToken refreshToken = RefreshToken.builder()
-                .memberId(refreshTokenDto.memberId())
-                .token(refreshTokenDto.tokenValue())
-                .ttl(refreshTokenDto.ttl())
-                .build();
+        RefreshToken refreshToken =
+                RefreshToken.create(refreshTokenDto.memberId(), refreshTokenDto.tokenValue(), refreshTokenDto.ttl());
+
         refreshTokenRepository.save(refreshToken);
     }
 

diff --git a/src/main/java/com/gdschongik/gdsc/domain/auth/domain/RefreshToken.java b/src/main/java/com/gdschongik/gdsc/domain/auth/domain/RefreshToken.java
@@ -1,5 +1,6 @@
 package com.gdschongik.gdsc.domain.auth.domain;
 
+import lombok.AccessLevel;
 import lombok.Builder;
 import lombok.Getter;
 import org.springframework.data.annotation.Id;
@@ -18,10 +19,14 @@ public class RefreshToken {
     @TimeToLive
     private long ttl;
 
-    @Builder
-    public RefreshToken(Long memberId, String token, long ttl) {
+    @Builder(access = AccessLevel.PRIVATE)
+    private RefreshToken(Long memberId, String token, long ttl) {
         this.memberId = memberId;
         this.token = token;
         this.ttl = ttl;
     }
+
+    public static RefreshToken create(Long memberId, String token, long ttl) {
+        return RefreshToken.builder().memberId(memberId).token(token).ttl(ttl).build();
+    }
 }
diff --git a/src/main/java/com/gdschongik/gdsc/domain/discord/domain/DiscordVerificationCode.java b/src/main/java/com/gdschongik/gdsc/domain/discord/domain/DiscordVerificationCode.java
@@ -2,6 +2,7 @@
 
 import com.gdschongik.gdsc.global.exception.CustomException;
 import com.gdschongik.gdsc.global.exception.ErrorCode;
+import lombok.AccessLevel;
 import lombok.Builder;
 import lombok.Getter;
 import org.springframework.data.annotation.Id;
@@ -23,7 +24,7 @@ public class DiscordVerificationCode {
     @TimeToLive
     private Long ttl;
 
-    @Builder
+    @Builder(access = AccessLevel.PRIVATE)
     private DiscordVerificationCode(String discordUsername, Integer code, Long ttl) {
         validateCodeRange(code);
         this.discordUsername = discordUsername;

diff --git a/src/main/java/com/gdschongik/gdsc/global/security/LandingStatus.java b/src/main/java/com/gdschongik/gdsc/global/security/LandingStatus.java
@@ -1,14 +1,24 @@
 package com.gdschongik.gdsc.global.security;
 
 import com.gdschongik.gdsc.domain.member.domain.Member;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 
 public enum LandingStatus {
+    ONBOARDING_NOT_OPENED, // 대기 페이지로 랜딩
     TO_STUDENT_AUTHENTICATION, // 재학생 인증 페이지로 랜딩
     TO_REGISTRATION, // 가입신청 페이지로 랜딩
     TO_DASHBOARD, // 대시보드로 랜딩
     ;
 
     public static LandingStatus of(Member member) {
+        // 1차 모집기간 종료 ~ 2차 모집기간 시작 사이 가입했고, 현재는 2차 모집기간이 아닐 때 대기 페이지로 랜딩
+        if (member.getCreatedAt().isAfter(Constants.FIRST_RECRUITMENT_END_DATE.atStartOfDay())
+                && member.getCreatedAt().isBefore(Constants.SECOND_RECRUITMENT_START_DATE.atStartOfDay())
+                && LocalDateTime.now().isBefore(Constants.SECOND_RECRUITMENT_START_DATE.atStartOfDay())) {
+            return ONBOARDING_NOT_OPENED;
+        }
+
         // 아직 재학생 인증을 하지 않았다면 재학생 인증 페이지로 랜딩
         if (!member.getRequirement().isUnivVerified()) {
             return TO_STUDENT_AUTHENTICATION;
@@ -23,4 +33,9 @@ public static LandingStatus of(Member member) {
         // 재학생 인증과 가입신청을 모두 완료했다면 대시보드로 랜딩
         return TO_DASHBOARD;
     }
+
+    private static class Constants {
+        private static final LocalDate FIRST_RECRUITMENT_END_DATE = LocalDate.of(2024, 3, 2);
+        private static final LocalDate SECOND_RECRUITMENT_START_DATE = LocalDate.of(2024, 3, 4);
+    }
 }