Merge pull request #77 from KNU-HAEDAL-Website/feat-post-to-end-date-…

…issue-65 feat: 게시글 활동 종료일 추가 (#65)
KNU-HAEDAL-Website · Aug 13, 2024 · a363af4 · a363af4
2 parents 53c062c + 46d0769
commit a363af4
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/src/main/java/com/haedal/haedalweb/domain/Post.java b/src/main/java/com/haedal/haedalweb/domain/Post.java
@@ -55,8 +55,11 @@ public class Post {
     @NonNull
     private PostType postType;
 
-    @Column(name = "post_activity_date")
-    private LocalDate activityDate;
+    @Column(name = "post_activity_start_date")
+    private LocalDate activityStartDate;
+
+    @Column(name = "post_activity_end_date")
+    private LocalDate activityEndDate;
 
     @Column(name = "post_create_date")
     @NonNull

diff --git a/src/main/java/com/haedal/haedalweb/dto/request/CreatePostDTO.java b/src/main/java/com/haedal/haedalweb/dto/request/CreatePostDTO.java
@@ -19,8 +19,11 @@ public class CreatePostDTO {
     @Schema(description = "게시글 대표 이미지 파일 Url", example = "posts/abc.jpg")
     private String postImageUrl;
 
-    @Schema(description = "활동일", example = "yyyy-MM-dd (2024-07-24)")
-    private String postActivityDate;
+    @Schema(description = "활동 시작일", example = "yyyy-MM-dd (2024-07-24)")
+    private String postActivityStartDate;
+
+    @Schema(description = "활동 종료일", example = "yyyy-MM-dd (2024-07-24)")
+    private String postActivityEndDate;
 
     @Schema(description = "게시글 타입", example = "(ACTIVITY, NOTICE, EVENT)")
     private String postType;

diff --git a/src/main/java/com/haedal/haedalweb/service/PostService.java b/src/main/java/com/haedal/haedalweb/service/PostService.java
@@ -38,7 +38,8 @@ public void createPost(Long boardId, CreatePostDTO createPostDTO) { // createPos
             throw new BusinessException(ErrorCode.NOT_FOUND_POST_TYPE);
         }
 
-        LocalDate activityDate = LocalDate.parse(createPostDTO.getPostActivityDate(), DateTimeFormatter.ISO_DATE);
+        LocalDate activityStartDate = LocalDate.parse(createPostDTO.getPostActivityStartDate(), DateTimeFormatter.ISO_DATE);
+        LocalDate activityEndDate = LocalDate.parse(createPostDTO.getPostActivityEndDate(), DateTimeFormatter.ISO_DATE);
         LocalDateTime createDate = LocalDateTime.now();
         User creator = userService.getLoggedInUser();
 
@@ -48,7 +49,8 @@ public void createPost(Long boardId, CreatePostDTO createPostDTO) { // createPos
                 .imageUrl(createPostDTO.getPostImageUrl()) // 이미지 생성 Controller 만들기
                 .views(0L)
                 .postType(postType)
-                .activityDate(activityDate)
+                .activityStartDate(activityStartDate)
+                .activityEndDate(activityEndDate)
                 .createDate(createDate)
                 .user(creator)
                 .board(board)
@@ -69,7 +71,8 @@ public void createPost(CreatePostDTO createPostDTO) {
             throw new BusinessException(ErrorCode.NOT_FOUND_POST_TYPE);
         }
 
-        LocalDate activityDate = LocalDate.parse(createPostDTO.getPostActivityDate(), DateTimeFormatter.ISO_DATE);
+        LocalDate activityStartDate = LocalDate.parse(createPostDTO.getPostActivityStartDate(), DateTimeFormatter.ISO_DATE);
+        LocalDate activityEndDate = LocalDate.parse(createPostDTO.getPostActivityEndDate(), DateTimeFormatter.ISO_DATE);
         LocalDateTime createDate = LocalDateTime.now();
         User creator = userService.getLoggedInUser();
 
@@ -79,7 +82,8 @@ public void createPost(CreatePostDTO createPostDTO) {
                 .imageUrl(createPostDTO.getPostImageUrl()) // 이미지 생성 Controller 만들기
                 .views(0L)
                 .postType(postType)
-                .activityDate(activityDate)
+                .activityStartDate(activityStartDate)
+                .activityEndDate(activityEndDate)
                 .createDate(createDate)
                 .user(creator)
                 .build();