Merge branch 'Team-Traveler:master' into feat/Team-Traveler#86

src/main/java/com/example/traveler/config/BaseResponseStatus.java

@@ -65,7 +65,17 @@ public enum BaseResponseStatus {
     PASSWORD_DECRYPTION_ERROR(false, 4012, "비밀번호 복호화에 실패하였습니다."),
 
     POST_IS_EMPTY(false,5003, "게시물이 존재하지 않습니다."),
-    SAVE_COMMENT_FAIL(false, 5500, "댓글 생성 실패했습니다."),
+    POST_SEARCH_FAIL(false, 5004, "게시물 검색에 실패했습니다."),
+    POST_GET_FAIL(false, 5005, "게시물 조회 실패했습니다."),
+    POST_LIKE_FAIL(false, 5006, "게시물 좋아요에 실패했습니다."),
+    POST_LIKE_CANCEL_FAIL(false, 5007, "게시물 좋아요 취소에 실패했습니다."),
+    POST_LIKE_GET_FAIL(false, 5008, "게시물 좋아요 상태 조회에 실패했습니다."),
+    POST_SCRAP_FAIL(false, 5009, "게시물 찜에 실패했습니다."),
+    POST_SCRAP_CANCEL_FAIL(false, 5010, "게시물 찜에 실패했습니다."),
+    POST_SCRAP_GET_FAIL(false, 5011, "게시물 찜에 실패했습니다."),
+    POST_LIKE_COUNT_FAIL(false, 5012, "게시물 좋아요 개수 조회에 실패했습니다."),
+    POST_SCRAP_COUNT_FAIL(false, 5013, "게시물 찜 개수 조회에 실패했습니다."),
+    SAVE_COMMENT_FAIL(false, 5500, "댓글 생성에 실패했습니다."),
 
     /**
      * 6000 : Checklist 오류

src/main/java/com/example/traveler/controller/PostController.java

@@ -0,0 +1,102 @@
+package com.example.traveler.controller;
+
+
+import com.example.traveler.config.BaseException;
+import com.example.traveler.config.BaseResponse;
+import com.example.traveler.model.dto.CommentRequest;
+import com.example.traveler.model.dto.CommentResponse;
+import com.example.traveler.model.entity.Post;
+import com.example.traveler.service.CommentService;
+import com.example.traveler.service.PostService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/post")
+public class PostController {
+    @Autowired
+    private PostService postService;
+    @Autowired
+    private CommentService commentService;
+
+    @PostMapping("/{pId}/comment")
+    public BaseResponse<CommentResponse> saveComment(@RequestHeader("Authorization") String accessToken, @RequestBody CommentRequest commentRequest, @PathVariable("pId") long pId) {
+        try {
+            CommentResponse commentResponse = commentService.saveComment(accessToken, pId, commentRequest);
+            return new BaseResponse<>(commentResponse);
+        } catch (BaseException exception) {
+            return new BaseResponse<>(exception.getStatus());
+        }
+    }
+
+    @GetMapping("/{pId}/comment")
+    public BaseResponse<List<CommentResponse>> getAllComment(@PathVariable("pId") long pId) {
+        try {
+            List<CommentResponse> commentResponses = commentService.getAllComment(pId);
+            return new BaseResponse<>(commentResponses);
+        } catch (BaseException exception) {
+            return new BaseResponse<>(exception.getStatus());
+        }
+    }
+
+
+    @GetMapping("")
+    public BaseResponse<List<Post>> getAllPost(@RequestParam(value = "keyword", required = false) String keyword) {
+        List<Post> postResponse;
+        if (keyword == null) {
+            try {
+                postResponse = postService.getAllPost();
+            } catch (BaseException exception) {
+                return new BaseResponse<>(exception.getStatus());
+            }
+        } else {
+            if (keyword.startsWith("#")) {
+                try {
+                    postResponse = postService.searchByHashtag(keyword);
+                } catch (BaseException exception) {
+                    return new BaseResponse<>(exception.getStatus());
+                }
+            } else {
+                try {
+                    postResponse = postService.searchByTitle(keyword);
+                } catch (BaseException exception) {
+                    return new BaseResponse<>(exception.getStatus());
+                }
+            }
+        }
+        return new BaseResponse<>(postResponse);
+
+    }
+
+    @PostMapping("/{pId}/like")
+    public BaseResponse<String> likePost(@RequestHeader("Authorization") String accessToken, @PathVariable("pId") long pId) {
+        try {
+            int result = postService.likePost(accessToken, pId);
+            if (result == 1) {
+                return new BaseResponse<>("좋아요 취소 성공!");
+            }
+            else {
+                return new BaseResponse<>("좋아요 성공!");
+            }
+        } catch (BaseException exception) {
+            return new BaseResponse<>(exception.getStatus());
+        }
+    }
+
+    @PostMapping("/{pId}/scrap")
+    public BaseResponse<String> likeScrap(@RequestHeader("Authorization") String accessToken, @PathVariable("pId") long pId) {
+        try {
+            int result = postService.scrapPost(accessToken, pId);
+            if (result == 1) {
+                return new BaseResponse<>("찜 취소 성공!");
+            }
+            else {
+                return new BaseResponse<>("찜 성공!");
+            }
+        } catch (BaseException exception) {
+            return new BaseResponse<>(exception.getStatus());
+        }
+    }
+}

src/main/java/com/example/traveler/controller/TravelController.java

@@ -28,6 +28,11 @@ public class TravelController {
     @PostMapping("")
     public BaseResponse<TravelResponse> saveTravel(@RequestHeader("Authorization") String accessToken, @RequestBody TravelRequest travelRequest) {
         try {
+            System.out.println(travelRequest.getTitle());
+            System.out.println(travelRequest.getDestination());
+            System.out.println(travelRequest.getStart_date());
+            System.out.println(travelRequest.getEnd_date());
+            System.out.println(travelRequest.getWriteStatus());
             TravelResponse travelResponse = travelService.saveTravel(accessToken, travelRequest);
             return new BaseResponse<>(travelResponse);
         } catch (BaseException exception) {

src/main/java/com/example/traveler/model/dto/CommentRequest.java

@@ -2,13 +2,15 @@
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 import java.util.Date;
 
 @Setter
 @Getter
 @AllArgsConstructor
+@NoArgsConstructor
 public class CommentRequest {
     String content;
 }

src/main/java/com/example/traveler/model/dto/CommentResponse.java

@@ -4,6 +4,7 @@
 import com.example.traveler.model.entity.Travel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 import java.sql.Timestamp;
@@ -13,9 +14,11 @@
 @AllArgsConstructor
 @Getter
 @Setter
+@NoArgsConstructor
 public class CommentResponse {
     long coId;
     String content;
     long pId;
     long uId;
+    String createAt;
 }

src/main/java/com/example/traveler/model/dto/DayCourseResponse.java

@@ -4,6 +4,7 @@
 import com.example.traveler.model.entity.Travel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 import java.sql.Timestamp;
@@ -12,6 +13,7 @@
 @AllArgsConstructor
 @Getter
 @Setter
+@NoArgsConstructor
 public class DayCourseResponse {
     int dcId;
     //Travel travel;

src/main/java/com/example/traveler/model/dto/PostRequest.java

@@ -0,0 +1,35 @@
+package com.example.traveler.model.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+@Getter
+@Setter
+public class PostRequest {
+
+    private String title;
+
+    private List<String> hashtags;
+
+    private String oneLineReview;
+
+    private int what;
+
+    private int hard;
+
+    private int with;
+
+    private double whatrating;
+
+    private double hardrating;
+
+    private double totalrating;
+
+    private String goodPoints;
+
+    private String badPoints;
+
+
+}

src/main/java/com/example/traveler/model/dto/PostResponse.java

@@ -0,0 +1,42 @@
+package com.example.traveler.model.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+@Getter
+@Setter
+public class PostResponse {
+
+    int pId;
+
+    int tId;
+
+    int uId;
+
+    private String title;
+
+    private List<String> hashtags;
+
+    private String oneLineReview;
+
+    private String location;
+
+    private int what;
+
+    private int hard;
+
+    private int with;
+
+    private double whatrating;
+
+    private double hardrating;
+
+    private double totalrating;
+
+    private String goodPoints;
+
+    private String badPoints;
+
+}

src/main/java/com/example/traveler/model/dto/SpotRequest.java

@@ -2,11 +2,13 @@
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 @Setter
 @Getter
 @AllArgsConstructor
+@NoArgsConstructor
 public class SpotRequest {
     String title;
     double latitude;

src/main/java/com/example/traveler/model/dto/SpotResponse.java

@@ -4,11 +4,13 @@
 import com.example.traveler.model.entity.Travel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 @AllArgsConstructor
 @Getter
 @Setter
+@NoArgsConstructor
 public class SpotResponse {
     int sId;
     int tId;

src/main/java/com/example/traveler/model/dto/TravelRequest.java

@@ -3,6 +3,7 @@
 import com.example.traveler.model.entity.DayCourse;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 import java.util.Date;
@@ -11,6 +12,7 @@
 @Setter
 @Getter
 @AllArgsConstructor
+@NoArgsConstructor
 public class TravelRequest {
     String title;
     String destination;

src/main/java/com/example/traveler/model/dto/TravelResponse.java

@@ -3,22 +3,24 @@
 import com.example.traveler.model.entity.DayCourse;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 import java.sql.Timestamp;
 import java.util.Date;
 import java.util.List;
 
+@NoArgsConstructor
 @AllArgsConstructor
 @Getter
 @Setter
 public class TravelResponse {
     int tId;
     String title;
     String destination;
-    Date start_date;
-    Date end_date;
-    Timestamp created_at;
+    String start_date;
+    String end_date;
+    String created_at;
     int time_status;
     int writeStatus;
     int noteStatus;