Merge pull request #282 from 7-umc-GrowIT/feat/#280

[#280] Feat : 약관 목록 조회 및 검증 로직 변경

Author: HSSJW

src/main/java/umc/GrowIT/Server/apiPayload/code/status/ErrorStatus.java

@@ -34,7 +34,7 @@ public enum ErrorStatus implements BaseErrorCode {
     //약관 관련 에러
     TERM_NOT_FOUND(HttpStatus.NOT_FOUND, "TERM4001", "존재하지 않는 약관을 요청했습니다."),
     MANDATORY_TERMS_REQUIRED(HttpStatus.BAD_REQUEST, "TERM4002", "필수 약관에 반드시 동의해야 합니다."),
-    ALL_TERMS_REQUIRED(HttpStatus.BAD_REQUEST, "TERM4003", "전체 약관 정보를 주세요."),
+    INVALID_TERM(HttpStatus.BAD_REQUEST, "TERM4004", "약관 정보가 유효하지 않습니다."),
 
     //인증 관련 에러
     EMAIL_NOT_VERIFIED(HttpStatus.BAD_REQUEST, "AUTH4001", "이메일 인증을 완료해주세요."),

src/main/java/umc/GrowIT/Server/domain/Term.java

@@ -1,13 +1,26 @@
 package umc.GrowIT.Server.domain;
 
-import jakarta.persistence.*;
-import lombok.*;
-import umc.GrowIT.Server.domain.common.BaseEntity;
-import umc.GrowIT.Server.domain.enums.TermType;
-
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import umc.GrowIT.Server.domain.common.BaseEntity;
+import umc.GrowIT.Server.domain.enums.TermType;
+
 @Entity
 @Getter
 @Builder
@@ -32,6 +45,18 @@ public class Term extends BaseEntity {
     @Column(nullable = false)
     private TermType type;
 
+    // 약관 효력 발생일
+    @Column(nullable = false)
+    private LocalDateTime effectiveDate;
+
+    // 약관 종료일
+    @Column(nullable = true) 
+    private LocalDateTime expirationDate;
+
+    // 버전
+    @Column(nullable = false)
+    private int version;
+
     @OneToMany(mappedBy = "term", cascade = CascadeType.ALL)
     private List<UserTerm> userTerm = new ArrayList<>();
 }

src/main/java/umc/GrowIT/Server/repository/TermRepository.java

@@ -1,7 +1,17 @@
 package umc.GrowIT.Server.repository;
 
+import java.time.LocalDateTime;
+import java.util.List;
+
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+
 import umc.GrowIT.Server.domain.Term;
 
 public interface TermRepository extends JpaRepository<Term, Long> {
+    @Query("SELECT COUNT(t) FROM Term t WHERE t.effectiveDate <= :today AND (t.expirationDate IS NULL OR t.expirationDate >= :today)")
+    int countByDate(LocalDateTime today);
+
+    @Query("SELECT t FROM Term t WHERE t.effectiveDate <= :today AND (t.expirationDate IS NULL OR t.expirationDate >= :today)")
+    List<Term> findAllByDate(LocalDateTime today);
 }

src/main/java/umc/GrowIT/Server/service/termService/TermCommandServiceImpl.java

@@ -12,7 +12,6 @@
 
 import static umc.GrowIT.Server.apiPayload.code.status.ErrorStatus.TERM_NOT_FOUND;
 
-
 @Service
 @RequiredArgsConstructor
 @Transactional

src/main/java/umc/GrowIT/Server/service/termService/TermQueryServiceImpl.java

@@ -1,33 +1,37 @@
 package umc.GrowIT.Server.service.termService;
 
-import lombok.RequiredArgsConstructor;
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
+
+import lombok.RequiredArgsConstructor;
 import umc.GrowIT.Server.apiPayload.code.status.ErrorStatus;
 import umc.GrowIT.Server.apiPayload.exception.TermHandler;
 import umc.GrowIT.Server.converter.TermConverter;
 import umc.GrowIT.Server.domain.Term;
 import umc.GrowIT.Server.domain.User;
 import umc.GrowIT.Server.domain.UserTerm;
 import umc.GrowIT.Server.domain.enums.TermType;
+import umc.GrowIT.Server.repository.TermRepository;
 import umc.GrowIT.Server.web.dto.TermDTO.TermRequestDTO;
 import umc.GrowIT.Server.web.dto.TermDTO.TermResponseDTO;
-import umc.GrowIT.Server.repository.TermRepository;
-
-import java.util.List;
-import java.util.stream.Collectors;
 
 @Service
 @RequiredArgsConstructor
+@Slf4j
 public class TermQueryServiceImpl implements TermQueryService{
 
-    public static final int TERM_COUNT = 6;
     private final TermRepository termRepository;
 
     /**
-     * 약관 목록 조회
+     * 현행 약관 목록 조회
      */
     public List<TermResponseDTO.TermDTO> getTerms(){
-        List<Term> terms = termRepository.findAll();
+        LocalDateTime today = LocalDateTime.now();
+        List<Term> terms = termRepository.findAllByDate(today); // 현행 약관 조회
 
         return terms.stream()
                 .map(TermConverter::toTermDTO)
@@ -45,9 +49,13 @@ public List<TermResponseDTO.TermDTO> getTerms(){
      */
     @Override
     public List<UserTerm> checkUserTerms(List<TermRequestDTO.UserTermDTO> requestedUserTerms, User newUser) {
-        //전체 약관 정보가 주어지지 않았을 때 예외 처리
-        if (requestedUserTerms.size() < TERM_COUNT) {
-            throw new TermHandler(ErrorStatus.ALL_TERMS_REQUIRED);
+        // 현행 약관 수 조회
+        LocalDateTime today = LocalDateTime.now();
+        int activeTermCount = termRepository.countByDate(today);
+
+        // 요청된 약관 개수와 현행 약관 개수가 다르면 예외 처리
+        if (requestedUserTerms.size() != activeTermCount) {
+            throw new TermHandler(ErrorStatus.INVALID_TERM);
         }
 
         return requestedUserTerms.stream()
@@ -56,9 +64,16 @@ public List<UserTerm> checkUserTerms(List<TermRequestDTO.UserTermDTO> requestedU
                             .orElse(null);
                     // 존재하지 않는 약관을 요청하면 예외 처리
                     if (term == null) {
-                        throw new TermHandler(ErrorStatus.TERM_NOT_FOUND);
-                        // 필수 약관에 동의하지 않으면 예외 처리
-                    } else if (term.getType() == TermType.MANDATORY && !userTerm.getAgreed()) {
+                        throw new TermHandler(ErrorStatus.INVALID_TERM);
+                    }
+                    // 현행 약관 여부 검증
+                    boolean isActive = (!term.getEffectiveDate().isAfter(today)) &&
+                            (term.getExpirationDate() == null || !term.getExpirationDate().isBefore(today));
+                    if (!isActive) {
+                        throw new TermHandler(ErrorStatus.INVALID_TERM);
+                    }
+                    // 필수 약관에 동의하지 않으면 예외 처리
+                    if (term.getType() == TermType.MANDATORY && !userTerm.getAgreed()) {
                         throw new TermHandler(ErrorStatus.MANDATORY_TERMS_REQUIRED);
                     }
                     // UserTerm 엔티티 생성

src/main/java/umc/GrowIT/Server/web/controller/specification/AuthSpecification.java

@@ -25,7 +25,7 @@ public interface AuthSpecification {
 
     @PostMapping("/signup")
     @SecurityRequirement(name = "")
-    @Operation(summary = "이메일 회원가입 API", description = "약관 목록 입력할 때 termId 1~6 입력해 주세요. (termId 1~4는 필수 동의 항목입니다.)", security = @SecurityRequirement(name = ""))
+    @Operation(summary = "이메일 회원가입 API", description = "GET /terms 약관 목록 조회 API 에서 조회된 약관에 대한 동의 정보를 함께 주세요.", security = @SecurityRequirement(name = ""))
     @ApiResponses({
             @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "COMMON200", description = "⭕ SUCCESS"),
             @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "AUTH4001", description = "❌ 이메일 인증을 완료해주세요.", content = @Content(schema = @Schema(implementation = ApiResponse.class))),