Merge pull request #67 from konkuk-icteam-student/feat/faq

[feat] faq 수정 시 하루 1개 기록만 유지하도록 개선

Author: jiyun921

src/main/java/com/better/CommuteMate/domain/faq/entity/Faq.java

@@ -5,6 +5,7 @@
 import jakarta.persistence.*;
 import lombok.*;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 @Entity
@@ -40,8 +41,8 @@ public class Faq {
     @JoinColumn(name = "category_id", nullable = false)
     private Category category;
 
-    @Column(name = "created_at", nullable = false)
-    private LocalDateTime createdAt;
+    @Column(name = "updated_date", nullable = false)
+    private LocalDate updatedDate;
 
     @Column(name = "deleted_flag", nullable = false)
     private Boolean deletedFlag;
@@ -51,32 +52,13 @@ public class Faq {
 
     @PrePersist
     protected void onCreate() {
-        this.createdAt = LocalDateTime.now();
+        this.updatedDate = LocalDate.now();
         this.deletedFlag = false;
     }
 
     @PreUpdate
     void onUpdate() {
-        this.createdAt = LocalDateTime.now();
-    }
-
-    @Builder
-    private Faq(
-            String title,
-            String complainantName,
-            String content,
-            String answer,
-            String etc,
-            User writer,
-            Category category
-    ) {
-        this.title = title;
-        this.complainantName = complainantName;
-        this.content = content;
-        this.answer = answer;
-        this.etc = etc;
-        this.writer = writer;
-        this.category = category;
+        this.updatedDate = LocalDate.now();
     }
 
     public static Faq create(
@@ -85,18 +67,18 @@ public static Faq create(
             String content,
             String answer,
             String etc,
-            User writer,
-            Category category
+            Category category,
+            User writer
     ) {
-        return Faq.builder()
-                .title(title)
-                .complainantName(complainantName)
-                .content(content)
-                .answer(answer)
-                .etc(etc)
-                .writer(writer)
-                .category(category)
-                .build();
+        Faq faq = new Faq();
+        faq.title = title;
+        faq.complainantName = complainantName;
+        faq.content = content;
+        faq.answer = answer;
+        faq.etc = etc;
+        faq.category = category;
+        faq.writer = writer;
+        return faq;
     }
 
     public void update(

src/main/java/com/better/CommuteMate/domain/faq/entity/FaqHistory.java

@@ -3,6 +3,7 @@
 import jakarta.persistence.*;
 import lombok.*;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -43,7 +44,7 @@ public class FaqHistory {
     private String writerName;  // 작성자 이름
 
     @Column(name = "edited_at", nullable = false)
-    private LocalDateTime editedAt;  // 수정된 날짜
+    private LocalDate editedAt;  // 수정된 날짜
 
     @Column(name = "category_name", length = 100, nullable = false)
     private String categoryName;  // 분류명
@@ -55,48 +56,24 @@ public class FaqHistory {
 
     @PrePersist
     protected void onCreate() {
-        this.editedAt = LocalDateTime.now();
-    }
-
-    @Builder
-    private FaqHistory(
-            Faq faq,
-            String title,
-            String complainantName,
-            String content,
-            String answer,
-            String etc,
-            String writerName,
-            List<String> managerNames,
-            String categoryName
-    ) {
-        this.faq = faq;
-        this.title = title;
-        this.complainantName = complainantName;
-        this.content = content;
-        this.answer = answer;
-        this.etc = etc;
-        this.writerName = writerName;
-        this.managerNames = managerNames;
-        this.categoryName = categoryName;
-        this.editedAt = LocalDateTime.now();
+        this.editedAt = LocalDate.now();
     }
 
     public static FaqHistory create(Faq faq) {
-        return FaqHistory.builder()
-                .faq(faq)
-                .title(faq.getTitle())
-                .complainantName(faq.getComplainantName())
-                .content(faq.getContent())
-                .answer(faq.getAnswer())
-                .etc(faq.getEtc())
-                .writerName(faq.getWriter().getName())
-                .managerNames(faq.getCategory().getManagers()
-                        .stream()
-                        .map(mc -> mc.getManager().getName())
-                        .toList())
-                .categoryName(faq.getCategory().getName())
-                .build();
+        FaqHistory history = new FaqHistory();
+        history.faq = faq;
+        history.title = faq.getTitle();
+        history.complainantName = faq.getComplainantName();
+        history.content = faq.getContent();
+        history.answer = faq.getAnswer();
+        history.etc = faq.getEtc();
+        history.writerName = faq.getWriter().getName();
+        history.managerNames = faq.getCategory().getManagers()
+                .stream()
+                .map(mc -> mc.getManager().getName())
+                .toList();
+        history.categoryName = faq.getCategory().getName();
+        return history;
     }
 
 }

src/main/java/com/better/CommuteMate/domain/faq/repository/FaqHistoryRepository.java

@@ -1,21 +1,14 @@
 package com.better.CommuteMate.domain.faq.repository;
 
-import com.better.CommuteMate.domain.faq.entity.Faq;
 import com.better.CommuteMate.domain.faq.entity.FaqHistory;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
-import java.util.List;
+import java.time.LocalDate;
 
 @Repository
 public interface FaqHistoryRepository extends JpaRepository<FaqHistory, Long> {
 
-    // 특정 FAQ에 대한 모든 히스토리 조회
-    List<FaqHistory> findByFaq(Faq faq);
+    void deleteByFaqIdAndEditedAt(Long faqId, LocalDate editedAt);
 
-    // FAQ ID로 히스토리 조회 (필요 시)
-    List<FaqHistory> findByFaqId(Long faqId);
-
-    // 최신 수정 이력 하나만 조회 (ex. 최근 변경 로그)
-    FaqHistory findTopByFaqIdOrderByEditedAtDesc(Long faqId);
 }

src/main/java/com/better/CommuteMate/domain/faq/repository/FaqQueryRepository.java

@@ -1,7 +1,7 @@
 package com.better.CommuteMate.domain.faq.repository;
 
 import com.better.CommuteMate.domain.faq.entity.Faq;
-import com.better.CommuteMate.faq.dto.request.FaqSearchScope;
+import com.better.CommuteMate.faq.application.dto.request.FaqSearchScope;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 

src/main/java/com/better/CommuteMate/domain/faq/repository/FaqQueryRepositoryImpl.java

@@ -4,7 +4,7 @@
 import com.better.CommuteMate.domain.faq.entity.Faq;
 import com.better.CommuteMate.domain.faq.entity.QFaq;
 import com.better.CommuteMate.domain.manager.entity.QManager;
-import com.better.CommuteMate.faq.dto.request.FaqSearchScope;
+import com.better.CommuteMate.faq.application.dto.request.FaqSearchScope;
 import com.querydsl.core.BooleanBuilder;
 import com.querydsl.jpa.JPAExpressions;
 import com.querydsl.jpa.impl.JPAQueryFactory;
@@ -60,17 +60,18 @@ public Page<Faq> searchFaqs( Long teamId, Long categoryId, String keyword, FaqSe
         }
 
         if (startDate != null) {
-            where.and(faq.createdAt.goe(startDate.atStartOfDay()));
+            where.and(faq.updatedDate.goe(startDate));
         }
+
         if (endDate != null) {
-            where.and(faq.createdAt.loe(endDate.atTime(23, 59, 59)));
+            where.and(faq.updatedDate.loe(endDate));
         }
 
         List<Faq> contents = queryFactory
                 .selectFrom(faq)
                 .join(faq.category).fetchJoin()
                 .where(where)
-                .orderBy(faq.createdAt.desc())
+                .orderBy(faq.updatedDate.desc())
                 .offset(pageable.getOffset())
                 .limit(pageable.getPageSize())
                 .fetch();

src/main/java/com/better/CommuteMate/faq/application/FaqService.java

@@ -2,20 +2,19 @@
 
 import com.better.CommuteMate.domain.category.entity.Category;
 import com.better.CommuteMate.domain.category.repository.CategoryRepository;
-import com.better.CommuteMate.domain.faq.repository.FaqQueryRepository;
-import com.better.CommuteMate.faq.dto.request.FaqSearchScope;
-import com.better.CommuteMate.faq.dto.request.PostFaqRequest;
-import com.better.CommuteMate.faq.dto.request.PutFaqUpdateRequest;
+import com.better.CommuteMate.faq.application.dto.request.FaqSearchScope;
+import com.better.CommuteMate.faq.application.dto.request.PostFaqRequest;
+import com.better.CommuteMate.faq.application.dto.request.PutFaqUpdateRequest;
 import com.better.CommuteMate.domain.faq.entity.Faq;
 import com.better.CommuteMate.domain.faq.entity.FaqHistory;
 import com.better.CommuteMate.domain.faq.repository.FaqHistoryRepository;
 import com.better.CommuteMate.domain.faq.repository.FaqRepository;
 import com.better.CommuteMate.domain.user.entity.User;
 import com.better.CommuteMate.domain.user.repository.UserRepository;
-import com.better.CommuteMate.faq.dto.response.GetFaqListResponse;
-import com.better.CommuteMate.faq.dto.response.GetFaqListWrapper;
-import com.better.CommuteMate.faq.dto.response.PostFaqResponse;
-import com.better.CommuteMate.faq.dto.response.PutFaqUpdateResponse;
+import com.better.CommuteMate.faq.application.dto.response.GetFaqListResponse;
+import com.better.CommuteMate.faq.application.dto.response.GetFaqListWrapper;
+import com.better.CommuteMate.faq.application.dto.response.PostFaqResponse;
+import com.better.CommuteMate.faq.application.dto.response.PutFaqUpdateResponse;
 import com.better.CommuteMate.global.exceptions.BasicException;
 import com.better.CommuteMate.global.exceptions.CategoryException;
 import com.better.CommuteMate.global.exceptions.FaqException;
@@ -56,8 +55,8 @@ public PostFaqResponse createFaq(Long userId, PostFaqRequest request) {
                 request.content(),
                 request.answer(),
                 request.etc(),
-                writer,
-                category
+                category,
+                writer
         );
 
         faqRepository.save(faq);
@@ -97,6 +96,8 @@ public PutFaqUpdateResponse updateFaq(Long userId, Long faqId, PutFaqUpdateReque
 
         faqRepository.save(faq);
 
+        faqHistoryRepository.deleteByFaqIdAndEditedAt(faqId, LocalDate.now());
+
         FaqHistory faqhistory = FaqHistory.create(faq);
         faqHistoryRepository.save(faqhistory);
 

…Mate/faq/dto/request/FaqSearchScope.java …lication/dto/request/FaqSearchScope.javasrc/main/java/com/better/CommuteMate/faq/dto/request/FaqSearchScope.java renamed to src/main/java/com/better/CommuteMate/faq/application/dto/request/FaqSearchScope.java src/main/java/com/better/CommuteMate/faq/dto/request/FaqSearchScope.java renamed to src/main/java/com/better/CommuteMate/faq/application/dto/request/FaqSearchScope.java

@@ -1,4 +1,4 @@
-package com.better.CommuteMate.faq.dto.request;
+package com.better.CommuteMate.faq.application.dto.request;
 
 public enum FaqSearchScope {
     TITLE_CONTENT,

…Mate/faq/dto/request/PostFaqRequest.java …lication/dto/request/PostFaqRequest.javasrc/main/java/com/better/CommuteMate/faq/dto/request/PostFaqRequest.java renamed to src/main/java/com/better/CommuteMate/faq/application/dto/request/PostFaqRequest.java src/main/java/com/better/CommuteMate/faq/dto/request/PostFaqRequest.java renamed to src/main/java/com/better/CommuteMate/faq/application/dto/request/PostFaqRequest.java

@@ -1,4 +1,4 @@
-package com.better.CommuteMate.faq.dto.request;
+package com.better.CommuteMate.faq.application.dto.request;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;

…faq/dto/request/PutFaqUpdateRequest.java …ion/dto/request/PutFaqUpdateRequest.javasrc/main/java/com/better/CommuteMate/faq/dto/request/PutFaqUpdateRequest.java renamed to src/main/java/com/better/CommuteMate/faq/application/dto/request/PutFaqUpdateRequest.java src/main/java/com/better/CommuteMate/faq/dto/request/PutFaqUpdateRequest.java renamed to src/main/java/com/better/CommuteMate/faq/application/dto/request/PutFaqUpdateRequest.java

@@ -1,4 +1,4 @@
-package com.better.CommuteMate.faq.dto.request;
+package com.better.CommuteMate.faq.application.dto.request;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;

…faq/dto/response/GetFaqListResponse.java …ion/dto/response/GetFaqListResponse.javasrc/main/java/com/better/CommuteMate/faq/dto/response/GetFaqListResponse.java renamed to src/main/java/com/better/CommuteMate/faq/application/dto/response/GetFaqListResponse.java src/main/java/com/better/CommuteMate/faq/dto/response/GetFaqListResponse.java renamed to src/main/java/com/better/CommuteMate/faq/application/dto/response/GetFaqListResponse.java

@@ -1,10 +1,10 @@
-package com.better.CommuteMate.faq.dto.response;
+package com.better.CommuteMate.faq.application.dto.response;
 
 import com.better.CommuteMate.domain.faq.entity.Faq;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 
-import java.time.LocalDateTime;
+import java.time.LocalDate;
 
 @Schema(description = "FAQ 목록 조회 응답 DTO")
 @Getter
@@ -16,16 +16,16 @@ public class GetFaqListResponse {
     @Schema(description = "faq 제목", example = "학정시 로그인 오륲")
     private final String title;
 
-    @Schema(description = "faq 작성 날짜 (수정된 경우 최근 수정 날짜)", example = "2025-01-25T13:20:00")
-    private final LocalDateTime createdAt;
+    @Schema(description = "faq 작성 날짜 (수정된 경우 최근 수정 날짜)", example = "2025-01-25")
+    private final LocalDate updatedDate;
 
     @Schema(description = "faq 삭제 여부", example = "true")
     private final Boolean deletedFlag;
 
     public GetFaqListResponse(Faq faq) {
         this.faqId = faq.getId();
         this.title = faq.getTitle();
-        this.createdAt = faq.getCreatedAt();
+        this.updatedDate = faq.getUpdatedDate();
         this.deletedFlag = faq.getDeletedFlag();
     }
 }