Merge pull request #21 from Gongjakso/feat/postModified

feat: Post Modify 기능 개발

src/main/java/com/gongjakso/server/domain/post/controller/PostController.java

@@ -1,40 +1,47 @@
 package com.gongjakso.server.domain.post.controller;
 
+import com.gongjakso.server.domain.post.dto.PostReq;
+import com.gongjakso.server.domain.post.dto.PostRes;
 import com.gongjakso.server.domain.post.service.PostService;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
-@RequiredArgsConstructor
 @RequestMapping("/api/v1/post")
+@RequiredArgsConstructor
 @Tag(name = "Post", description = "공고 관련 API")
 public class PostController {
     private final PostService postService;
 
-//    @PostMapping
-//    public ResponseEntity<> createPost() {
-//
-//    }
+    // @PostMapping
+    // public ResponseEntity<> createPost() {
+    //
+    // }
+
+    /**
+     * 모집글 게시(CREATE)
+     */
+    // @PostMapping("/posts")
+    // public ResponseEntity<PostCreationResponse> createPost(
+    // @RequestBody @Validated PostCreationRequest request,
+    // @AuthenticationPrincipal OAuth2User user) {
+    //
+    // String email = user.getName();
+    // Post post = postService.createPost(request, email);
+    // keywordService.addKeywords(post, request);
+    //
+    // return ResponseEntity.ok(
+    // PostCreationResponse.builder()
+    // .id(post.getId())
+    // .title(post.getThumbnail().getTitle())
+    // .createdDate(post.getCreatedDate())
+    // .build());
+    // }
 
-    /** 모집글 게시(CREATE) */
-//    @PostMapping("/posts")
-//    public ResponseEntity<PostCreationResponse> createPost(
-//            @RequestBody @Validated PostCreationRequest request,
-//            @AuthenticationPrincipal OAuth2User user) {
-//
-//        String email = user.getName();
-//        Post post = postService.createPost(request, email);
-//        keywordService.addKeywords(post, request);
-//
-//        return ResponseEntity.ok(
-//                PostCreationResponse.builder()
-//                        .id(post.getId())
-//                        .title(post.getThumbnail().getTitle())
-//                        .createdDate(post.getCreatedDate())
-//                        .build());
-//    }
-}
+    @PutMapping("/?{id}")
+    public ResponseEntity<PostRes> modify(@PathVariable("id") Long id, @RequestBody PostReq req) {
+        return ResponseEntity.ok(postService.modify(id, req));
+    }
+}

src/main/java/com/gongjakso/server/domain/post/dto/PostReq.java

@@ -1,27 +1,46 @@
 package com.gongjakso.server.domain.post.dto;
 
-import com.gongjakso.server.domain.post.enumerate.PostType;
-import lombok.Builder;
+import com.gongjakso.server.domain.post.enumerate.MeetingMethod;
+import com.gongjakso.server.domain.post.enumerate.PostStatus;
 import lombok.Data;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
 import java.time.LocalDateTime;
-import org.springframework.cglib.core.Local;
 
 @Data
 @Getter
 @NoArgsConstructor
 public class PostReq {
     private String title;
     private String contents;
-    private PostType status;
+    private PostStatus status;
     private LocalDateTime startDate;
     private LocalDateTime endDate;
     private Long maxPerson;
-    private PostType meetingMethod;
+    private MeetingMethod meetingMethod;
     private String meetingArea;
     private boolean questionMethod;
     private String questionLink;
     private boolean isProject;
+
+    /*
+     * @Builder
+     * public PostReq(String title, String contents, PostStatus status, LocalDateTime
+     * startDate, LocalDateTime endDate,
+     * Long maxPerson, PostType meetingMethod, String meetingArea, boolean
+     * questionMethod, String questionLink, boolean isProject){
+     * this.title = title;
+     * this.contents = contents;
+     * this.status = status;
+     * this.startDate = startDate;
+     * this.endDate = endDate;
+     * this.maxPerson = maxPerson;
+     * this.meetingArea = meetingArea;
+     * this.meetingMethod = meetingMethod;
+     * this.questionMethod = questionMethod;
+     * this.questionLink = questionLink;
+     * this.isProject = isProject;
+     * }
+     */
 }

src/main/java/com/gongjakso/server/domain/post/dto/PostRes.java

@@ -1,4 +1,52 @@
 package com.gongjakso.server.domain.post.dto;
 
+import com.gongjakso.server.domain.member.entity.Member;
+import com.gongjakso.server.domain.post.enumerate.MeetingMethod;
+import com.gongjakso.server.domain.post.enumerate.PostStatus;
+import lombok.Builder;
+import lombok.Getter;
+
+import java.time.LocalDateTime;
+
+@Getter
 public class PostRes {
-}
+    private Long postId;
+    private Long memberId;
+    private String title;
+    private String contents;
+    private PostStatus status;
+    private LocalDateTime startDate;
+    private LocalDateTime endDate;
+    private Long maxPerson;
+    private MeetingMethod meetingMethod;
+    private String meetingArea;
+    private boolean questionMethod;
+    private String questionLink;
+    private boolean isProject;
+    private LocalDateTime createdAt;
+    private LocalDateTime modifiedAt;
+
+    private LocalDateTime deletedAt;
+
+    @Builder
+    public PostRes(Long postId, Long memberId, String title, String contents, PostStatus status, LocalDateTime startDate, LocalDateTime endDate,
+                   Long maxPerson, MeetingMethod meetingMethod, String meetingArea, boolean questionMethod, String questionLink,
+                   boolean isProject, LocalDateTime createdAt, LocalDateTime modifiedAt, LocalDateTime deletedAt) {
+        this.postId = postId;
+        this.memberId = memberId;
+        this.title = title;
+        this.contents = contents;
+        this.status = status;
+        this.startDate = startDate;
+        this.endDate = endDate;
+        this.maxPerson = maxPerson;
+        this.meetingArea = meetingArea;
+        this.meetingMethod = meetingMethod;
+        this.questionMethod = questionMethod;
+        this.questionLink = questionLink;
+        this.isProject = isProject;
+        this.createdAt = createdAt;
+        this.modifiedAt = modifiedAt;
+        this.deletedAt = deletedAt;
+    }
+}

src/main/java/com/gongjakso/server/domain/post/entity/Post.java

@@ -1,20 +1,15 @@
 package com.gongjakso.server.domain.post.entity;
 
-import com.gongjakso.server.domain.post.enumerate.PostType;
+import com.gongjakso.server.domain.member.entity.Member;
+import com.gongjakso.server.domain.post.dto.PostReq;
+import com.gongjakso.server.domain.post.enumerate.MeetingMethod;
+import com.gongjakso.server.domain.post.enumerate.PostStatus;
 import com.gongjakso.server.global.common.BaseTimeEntity;
-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.Table;
+import jakarta.persistence.*;
+
 import java.time.LocalDateTime;
-import lombok.AccessLevel;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
+
+import lombok.*;
 
 @Getter
 @Entity
@@ -27,6 +22,10 @@ public class Post extends BaseTimeEntity {
     @Column(name = "post_id", nullable = false, columnDefinition = "bigint")
     private Long postId;
 
+    @ManyToOne(targetEntity = Member.class, fetch = FetchType.LAZY)
+    @JoinColumn(name = "member_id")
+    private Member member;
+
     @Column(name = "title", nullable = false, columnDefinition = "varchar(20)")
     private String title;
 
@@ -35,7 +34,7 @@ public class Post extends BaseTimeEntity {
 
     @Column(name = "status", columnDefinition = "varchar(255)")
     @Enumerated(EnumType.STRING)
-    private PostType status;
+    private PostStatus status;
 
     @Column(name = "start_date", nullable = false, columnDefinition = "timestamp")
     private LocalDateTime startDate;
@@ -48,7 +47,7 @@ public class Post extends BaseTimeEntity {
 
     @Column(name = "meeting_method", columnDefinition = "varchar(10)")
     @Enumerated(EnumType.STRING)
-    private PostType meetingMethod;
+    private MeetingMethod meetingMethod;
 
     @Column(name = "meeting_area", columnDefinition = "varchar(100)")
     private String meetingArea;
@@ -63,8 +62,11 @@ public class Post extends BaseTimeEntity {
     private boolean isProject;
 
     @Builder
-    public Post(Long postId, String title, String contents, PostType status, LocalDateTime startDate, LocalDateTime endDate, Long maxPerson, PostType meetingMethod, String meetingArea, boolean questionMethod, String questionLink, boolean isProject) {
+    public Post(Long postId, Member member, String title, String contents, PostStatus status, LocalDateTime startDate,
+                LocalDateTime endDate, Long maxPerson, MeetingMethod meetingMethod, String meetingArea, boolean questionMethod,
+                String questionLink, boolean isProject) {
         this.postId = postId;
+        this.member = member;
         this.title = title;
         this.contents = contents;
         this.status = status;
@@ -77,4 +79,17 @@ public Post(Long postId, String title, String contents, PostType status, LocalDa
         this.questionLink = questionLink;
         this.isProject = isProject;
     }
+
+    public void modify(PostReq req) {
+        this.title = req.getTitle();
+        this.contents = req.getContents();
+        this.status = req.getStatus();
+        this.startDate = req.getStartDate();
+        this.endDate = req.getEndDate();
+        this.maxPerson = req.getMaxPerson();
+        this.meetingMethod = req.getMeetingMethod();
+        this.meetingArea = req.getMeetingArea();
+        this.questionMethod = req.isQuestionMethod();
+        this.questionLink = req.getQuestionLink();
+    }
 }

src/main/java/com/gongjakso/server/domain/post/enumerate/MeetingMethod.java

@@ -0,0 +1,5 @@
+package com.gongjakso.server.domain.post.enumerate;
+
+public enum MeetingMethod {
+    NULL, OFFLINE, ONLINE, BOTH
+}

src/main/java/com/gongjakso/server/domain/post/enumerate/PostStatus.java

@@ -0,0 +1,9 @@
+package com.gongjakso.server.domain.post.enumerate;
+
+public enum PostStatus {
+    RECRUITING,
+    CANCEL,
+    CLOSE,
+    ACTIVE,
+    COMPLETE
+}

src/main/java/com/gongjakso/server/domain/post/service/PostService.java

@@ -1,13 +1,45 @@
 package com.gongjakso.server.domain.post.service;
 
+import com.gongjakso.server.domain.post.dto.PostReq;
+import com.gongjakso.server.domain.post.dto.PostRes;
+import com.gongjakso.server.domain.post.entity.Post;
 import com.gongjakso.server.domain.post.repository.PostRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDateTime;
+
 @Service
 @Transactional(readOnly = true)
 @RequiredArgsConstructor
 public class PostService {
     private final PostRepository postRepository;
-}
+
+    @Transactional
+    public PostRes modify(Long id, PostReq req) {
+        Post entity = postRepository.findById(id)
+                .orElseThrow(() -> new IllegalArgumentException());
+        entity.modify(req);
+
+        return PostRes.builder()
+                .postId(entity.getPostId())
+                .memberId(entity.getMember().getMemberId())
+                .title(entity.getTitle())
+                .contents(entity.getContents())
+                .status(entity.getStatus())
+                .startDate(entity.getStartDate())
+                .endDate(entity.getEndDate())
+                .maxPerson(entity.getMaxPerson())
+                .meetingMethod(entity.getMeetingMethod())
+                .meetingArea(entity.getMeetingArea())
+                .questionMethod(entity.isQuestionMethod())
+                .questionLink(entity.getQuestionLink())
+                .isProject(entity.isProject())
+                .createdAt(entity.getCreatedAt())
+                .modifiedAt(entity.getModifiedAt())
+                .deletedAt(entity.getDeletedAt())
+                .build();
+
+    }
+}

src/main/java/com/gongjakso/server/global/common/BaseTimeEntity.java

@@ -4,6 +4,7 @@
 import jakarta.persistence.EntityListeners;
 import jakarta.persistence.MappedSuperclass;
 import lombok.Getter;
+import lombok.Setter;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.annotation.LastModifiedDate;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
@@ -25,4 +26,4 @@ public abstract class BaseTimeEntity {
 
     @Column(name = "deleted_at", columnDefinition = "TIMESTAMP")
     private LocalDateTime deletedAt;
-}
+}