Merge branch 'develop' into feat/#133-bucket-detail-fe

Change-Id: I0fb3dced24bbb6c92653ac1d2411c469dbc4b392

backend/src/main/java/com/ggums/ggumtle/common/config/SecurityConfig.java

@@ -17,6 +17,13 @@
 import java.util.Arrays;
 import java.util.List;
 
+/**
+ * @author 404-not-foundl
+ * @since 2023-12-14
+ * @version spring security 6.1.5
+ * @version spring boot 3.1.6
+ * @version java 17
+ */
 @Configuration
 @RequiredArgsConstructor
 @EnableWebSecurity

backend/src/main/java/com/ggums/ggumtle/common/exception/ExceptionType.java

@@ -32,6 +32,9 @@ public enum ExceptionType {
     SELF_SUBSCRIPTION_ATTEMPTED(400, "자기 자신을 구독할 수 없습니다."),
     ALREADY_WITHDRAWN_USER(409, "이미 탈퇴한 사용자입니다."),
 
+    // oauth
+    OAUTH_AUTHORIZATION_CODE_INVALID(400,"인가코드가 유효하지 않습니다."),
+
     // bucket
     BUCKET_NOT_FOUND(404, "해당 버킷을 찾을 수 없습니다."),
     BUCKET_NOT_VALID(400, "버킷이 비공개입니다."),
@@ -46,7 +49,8 @@ public enum ExceptionType {
     REVIEW_NOT_FOUND(404, "해당 후기를 찾을 수 없습니다."),
     REVIEW_NOT_VALID(400, "후기가 비공개입니다."),
     IMAGE_NOT_FOUND(404, "해당 이미지를 찾을 수 없습니다."),
-    REVIEW_ALREADY_EXISTS(409, "해당 버킷의 리뷰가 이미 존재합니다."),
+    REVIEW_ALREADY_POSTED(409, "해당 버킷의 후기가 이미 존재합니다."),
+    TEMPORARY_REVIEW(400, "해당 후기가 임시저장 상태입니다."),
 
     // comment
     COMMENT_NOT_FOUND(404, "댓글을 찾을 수 없습니다."),

backend/src/main/java/com/ggums/ggumtle/common/jwt/JwtAuthenticationFilter.java

@@ -21,6 +21,13 @@
 import java.util.Objects;
 import java.util.stream.Collectors;
 
+/**
+ * @author 404-not-foundl
+ * @since 2023-12-14
+ * @version spring security 6.1.5
+ * @version spring boot 3.1.6
+ * @version java 17
+ */
 @Component
 public class JwtAuthenticationFilter extends OncePerRequestFilter {
 

backend/src/main/java/com/ggums/ggumtle/common/jwt/JwtTokenManager.java

@@ -20,6 +20,13 @@
 import java.security.Key;
 import java.util.Date;
 
+/**
+ * @author 404-not-foundl
+ * @since 2023-12-14
+ * @version spring security 6.1.5
+ * @version spring boot 3.1.6
+ * @version java 17
+ */
 @Component
 @Slf4j
 @RequiredArgsConstructor

backend/src/main/java/com/ggums/ggumtle/controller/AlarmController.java

@@ -24,7 +24,7 @@
 
 import java.io.IOException;
 
-@Tag(name = "6. 알람", description = "알람과 관련된 API들 입니다")
+@Tag(name = "7. 알람", description = "알람과 관련된 API들 입니다")
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/alarm")
@@ -58,9 +58,9 @@ public SseEmitter subscribe(@AuthenticationPrincipal User user) {
     }
 
     @GetMapping("/count")
-    @Operation(summary = "알람 개수 반환", description = "안 읽은 알람의 개수를 반환합니다")
+    @Operation(summary = "알람 개수 조회", description = "안 읽은 알람의 개수를 반환합니다")
     @ApiResponses({
-            @ApiResponse(responseCode = "200", description = "버킷 생성 성공",
+            @ApiResponse(responseCode = "200", description = "조회 성공",
                     content = @Content(schemaProperties = {
                             @SchemaProperty(name = "result", schema = @Schema(defaultValue = "ok", description = "요청 성공")),
                             @SchemaProperty(name = "alarmCount", schema = @Schema(type = "int", example = "5",description = "알람 개수"))
@@ -71,9 +71,9 @@ public Response alarmCount(@AuthenticationPrincipal User user){
     }
 
     @GetMapping("/")
-    @Operation(summary = "알람 리스트 반환", description = "알람 내역을 반환합니다")
+    @Operation(summary = "알람 조회", description = "전체 알람 내역을 반환합니다")
     @ApiResponses({
-            @ApiResponse(responseCode = "200", description = "버킷 생성 성공",
+            @ApiResponse(responseCode = "200", description = "조회 성공",
                     content = @Content(schemaProperties = {
                             @SchemaProperty(name = "result", schema = @Schema(defaultValue = "ok", description = "요청 성공")),
                             @SchemaProperty(name = "alarm", schema = @Schema(implementation = AlarmResponseDto.class))

backend/src/main/java/com/ggums/ggumtle/controller/BucketController.java

@@ -24,7 +24,7 @@
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-@Tag(name = "2. 버킷", description = "버킷과 관련된 API들 입니다")
+@Tag(name = "3. 버킷", description = "버킷과 관련된 API들 입니다")
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/bucket")
@@ -53,7 +53,7 @@ public Response postBucket(@AuthenticationPrincipal User user, @Valid @RequestBo
                             @SchemaProperty(name = "bucketInfo", schema = @Schema(implementation = GetBucketResponseDto.class))
                     }))
     })
-    @GetMapping("/info/{bucket}")
+    @GetMapping("/info/{bucketId}")
     public Response getBucket(@AuthenticationPrincipal User user, @PathVariable("bucket") Long bucketId){
         return new Response("bucketInfo", bucketService.getBucket(user, bucketId));
     }
@@ -79,12 +79,12 @@ public Response updateBucket(@AuthenticationPrincipal User user, @Valid @Request
                             @SchemaProperty(name = "message", schema = @Schema(defaultValue = "삭제를 완료하였습니다.", description = "삭제 성공 메세지"))
                     }))
     })
-    @DeleteMapping("/{bucket}")
+    @DeleteMapping("/{bucketId}")
     public Response deleteBucket(@AuthenticationPrincipal User user, @PathVariable("bucket") Long bucket_id){
         return new Response("message", bucketService.deleteBucket(user, bucket_id));
     }
 
-    @PatchMapping("/{bucket}")
+    @PatchMapping("/{bucketId}")
     @Operation(summary = "버킷 달성일 등록", description = "주어진 id의 버킷 달성일을 금일로 등록합니다.")
     @ApiResponses({
             @ApiResponse(responseCode = "200", description = "버킷 달성일 등록 성공",
@@ -110,7 +110,7 @@ public Response searchBucket(@RequestParam String word, Pageable pageable){
         return new Response("bucketSearchList", bucketService.searchBuckets(word, pageable));
     }
 
-    @PostMapping("/image/{bucket}")
+    @PostMapping("/image/{bucketId}")
     @Operation(summary = "버킷 이미지 등록", description = "버킷 이미지를 등록합니다.")
     @ApiResponses({
             @ApiResponse(responseCode = "200", description = "이미지 저장 성공",
@@ -126,7 +126,7 @@ public Response bucketImage(@AuthenticationPrincipal User user, @PathVariable("b
         return new Response("bucketImageUrl", bucketService.bucketImage(user, bucketId, bucketImage));
     }
 
-    @GetMapping("/reaction/{bucket}")
+    @GetMapping("/reaction/{bucketId}")
     @Operation(summary = "버킷 리액션 조회", description = "버킷에 달린 리액션을 반환합니다.")
     @ApiResponses({
             @ApiResponse(responseCode = "200", description = "리액션 조회 성공",
@@ -140,7 +140,7 @@ public Response getBucketReaction(@AuthenticationPrincipal User user, @PathVaria
     }
 
     @PostMapping("/reaction/")
-    @Operation(summary = "후기 리액션 작성", description = "후기에 리액션을 답니다.")
+    @Operation(summary = "버킷 리액션 작성", description = "버킷에 리액션을 답니다.")
     @ApiResponses({
             @ApiResponse(responseCode = "200", description = "리액션 작성 성공",
                     content = @Content(schemaProperties = {

backend/src/main/java/com/ggums/ggumtle/controller/CommentBucketController.java

@@ -19,7 +19,7 @@
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
 
-@Tag(name = "7. 버킷 댓글", description = "버킷 하위 댓글과 관련된 API들 입니다")
+@Tag(name = "8. 버킷 댓글", description = "버킷 하위 댓글과 관련된 API들 입니다")
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/comment/bucket")

backend/src/main/java/com/ggums/ggumtle/controller/CommentReviewController.java

@@ -19,7 +19,7 @@
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
 
-@Tag(name = "8. 후기 댓글", description = "후기 하위 댓글과 관련된 API들 입니다")
+@Tag(name = "9. 후기 댓글", description = "후기 하위 댓글과 관련된 API들 입니다")
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/comment/review")

backend/src/main/java/com/ggums/ggumtle/controller/OAuthController.java

@@ -0,0 +1,39 @@
+package com.ggums.ggumtle.controller;
+
+import com.ggums.ggumtle.common.response.Response;
+import com.ggums.ggumtle.dto.request.OAuthJoinRequestDto;
+import com.ggums.ggumtle.service.OAuth.GoogleService;
+import com.ggums.ggumtle.service.OAuth.KakaoService;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/api/oauth")
+public class OAuthController {
+
+    private final KakaoService kakaoService;
+    private final GoogleService googleService;
+
+    @GetMapping("/kakao/{authorizationCode}")
+    public Response kakaoLogin(HttpServletResponse response, @PathVariable String authorizationCode){
+        return new Response("login", kakaoService.kakaoLogin(response, authorizationCode));
+    }
+
+    @PostMapping("/kakao")
+    public Response kakaoJoin(@Valid @RequestBody OAuthJoinRequestDto requestDto){
+        return new Response("message", kakaoService.kakaoJoin(requestDto));
+    }
+
+    @GetMapping("/google/{authenticationCode}")
+    public Response googleLogin(HttpServletResponse response, @PathVariable String authenticationCode){
+        return new Response("login", googleService.googleLogin(response, authenticationCode));
+    }
+
+    @PostMapping("/google")
+    public Response googleJoin(@Valid @RequestBody OAuthJoinRequestDto requestDto){
+        return new Response("message", googleService.googleJoin(requestDto));
+    }
+}

backend/src/main/java/com/ggums/ggumtle/controller/ReviewController.java

@@ -7,6 +7,7 @@
 import com.ggums.ggumtle.dto.response.ReviewReactionResponseDto;
 import com.ggums.ggumtle.dto.response.ReviewResponseDto;
 import com.ggums.ggumtle.dto.response.ReviewSearchResponseDto;
+import com.ggums.ggumtle.dto.response.ReviewBriefResponseDto;
 import com.ggums.ggumtle.entity.User;
 import com.ggums.ggumtle.service.ReviewService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -23,25 +24,25 @@
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-@Tag(name = "3. 후기", description = "후기와 관련된 API들 입니다")
+@Tag(name = "4. 후기", description = "후기와 관련된 API들 입니다")
 @RestController
 @RequestMapping("/review")
 @RequiredArgsConstructor
 public class ReviewController {
 
     private final ReviewService reviewService;
 
-    @PostMapping
-    @Operation(summary = "후기 생성", description = "해당 버킷과 연관된 후기를 생성합니다.")
+    @GetMapping("/brief/{bucketId}")
+    @Operation(summary = "후기 간단 정보 조회", description = "주어진 버킷 id의 임시저장한 후기 존재 여부, 존재할 경우 제목과 내용을 반환합니다.")
     @ApiResponses({
-            @ApiResponse(responseCode = "200", description = "후기 생성 성공",
+            @ApiResponse(responseCode = "200", description = "후기 간단 정보 조희 성공",
                     content = @Content(schemaProperties = {
                             @SchemaProperty(name = "result", schema = @Schema(defaultValue = "ok", description = "요청 성공")),
-                            @SchemaProperty(name = "reviewId", schema = @Schema(type = "int", example = "1",description = "생성된 후기 id"))
+                            @SchemaProperty(name = "review", schema = @Schema(implementation = ReviewBriefResponseDto.class))
                     }))
     })
-    public Response postReview(@AuthenticationPrincipal User user, @Valid @RequestBody PostReviewRequestDto requestDto) {
-        return new Response("reviewId", reviewService.postReview(user, requestDto));
+    public Response getReviewBrief(@AuthenticationPrincipal User user, @PathVariable Long bucketId) {
+        return new Response("reviewBrief", reviewService.getReviewBrief(user, bucketId));
     }
 
     @PostMapping("/image")
@@ -60,6 +61,20 @@ public Response postImage(@RequestParam final MultipartFile image) {
         return new Response("imageUrl", reviewService.postImage(image));
     }
 
+
+    @PostMapping
+    @Operation(summary = "후기 생성", description = "해당 버킷과 연관된 후기를 생성합니다.")
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "후기 생성 성공",
+                    content = @Content(schemaProperties = {
+                            @SchemaProperty(name = "result", schema = @Schema(defaultValue = "ok", description = "요청 성공")),
+                            @SchemaProperty(name = "reviewId", schema = @Schema(type = "int", example = "1",description = "생성된 후기 id"))
+                    }))
+    })
+    public Response postReview(@AuthenticationPrincipal User user, @Valid @RequestBody PostReviewRequestDto requestDto) {
+        return new Response("reviewId", reviewService.postReview(user, requestDto));
+    }
+
     @GetMapping("/{reviewId}")
     @Operation(summary = "후기 조회", description = "주어진 id의 후기 상세 정보를 반환합니다.")
     @ApiResponses({
@@ -73,7 +88,7 @@ public Response getReview(@AuthenticationPrincipal User user, @PathVariable Long
         return new Response("review", reviewService.getReview(user, reviewId));
     }
 
-    @PutMapping("/{reviewId}")
+    @PutMapping()
     @Operation(summary = "후기 수정", description = "주어진 id의 후기를 수정합니다.")
     @ApiResponses({
             @ApiResponse(responseCode = "200", description = "후기 수정 성공",
@@ -82,8 +97,8 @@ public Response getReview(@AuthenticationPrincipal User user, @PathVariable Long
                             @SchemaProperty(name = "reviewId", schema = @Schema(type = "int", example = "1",description = "수정된 후기 id"))
                     }))
     })
-    public Response putReview(@AuthenticationPrincipal User user, @PathVariable Long reviewId, @Valid @RequestBody PutReviewRequestDto requestDto) {
-        return new Response("reviewId", reviewService.putReview(user, reviewId, requestDto));
+    public Response putReview(@AuthenticationPrincipal User user, @Valid @RequestBody PutReviewRequestDto requestDto) {
+        return new Response("reviewId", reviewService.putReview(user, requestDto));
     }
 
     @DeleteMapping("/{reviewId}")

backend/src/main/java/com/ggums/ggumtle/controller/UserApiController.java

@@ -2,6 +2,7 @@
 
 import com.ggums.ggumtle.common.response.Response;
 import com.ggums.ggumtle.service.UserApiService;
+import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.media.SchemaProperty;
@@ -14,7 +15,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-@Tag(name = "4. 사용자 API", description = "비로그인 사용자(인증 X)와 관련된 API들 입니다")
+@Tag(name = "5. 사용자 API", description = "비로그인 사용자(인증 X)와 관련된 API들 입니다")
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/api/user")
@@ -23,6 +24,7 @@ public class UserApiController {
     private final UserApiService userApiService;
 
     @GetMapping("/nickname/{nickname}")
+    @Operation(summary = "닉네임 중복 확인", description = "중복되는 닉네임이 이미 있는지 조회합니다")
     @ApiResponses({
             @ApiResponse(responseCode = "200", description = "닉네임 중복 확인 성공",
                     content = @Content(schemaProperties = {

backend/src/main/java/com/ggums/ggumtle/controller/UserController.java

@@ -22,7 +22,7 @@
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-@Tag(name = "5. 사용자", description = "사용자 정보 관련 API들 입니다")
+@Tag(name = "6. 사용자", description = "사용자 정보 관련 API들 입니다")
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/user")
@@ -45,7 +45,7 @@ public Response updateUser(@RequestPart("userImage") MultipartFile userImage,
          return new Response("message", userService.updateUser(user, userImage, requestDto));
      }
 
-     @GetMapping("/{user}")
+     @GetMapping("/{userId}")
      @Operation(summary = "사용자 조회", description = "주어진 id의 사용자 상세 정보를 반환합니다.")
      @ApiResponses({
              @ApiResponse(responseCode = "200", description = "사용자 조희 성공",
@@ -133,7 +133,7 @@ public Response userFollower(@RequestParam Long userId, Pageable pageable){
          return new Response("followerList", userService.userFollowerList(userId, pageable));
      }
 
-     @GetMapping("/stats/{user}")
+     @GetMapping("/stats/{userId}")
      @Operation(summary = "사용자 상태 조회", description = "사용자 페이지 헤더 정보 (팔로워 수, 팔로잉 수, 달성률)을 조회합니다.")
      @ApiResponses({
              @ApiResponse(responseCode = "200", description = "사용자 상태 조회 성공",

backend/src/main/java/com/ggums/ggumtle/dto/request/OAuthJoinRequestDto.java

@@ -0,0 +1,34 @@
+package com.ggums.ggumtle.dto.request;
+
+import com.ggums.ggumtle.entity.Gender;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.Size;
+import lombok.Getter;
+
+import java.time.LocalDate;
+import java.util.List;
+
+@Getter
+public class OAuthJoinRequestDto {
+
+    private String authorizationCode;
+
+    @NotNull(message = "필수 정보입니다.")
+    @Size(max = 50, message = "notEmailFormat")
+    @Pattern(regexp = "^[a-zA-Z0-9.!#$%&’*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\\.[a-zA-Z0-9-]+)*$", message = "notEmailFormat")
+    private String userEmail;
+
+    @Schema(example = "화이팅 10기")
+    @Size(max = 255, message = "닉네임 크기가 초과하였습니다.")
+    private String userNickname;
+
+    @Schema(example = "2023-07-03")
+    private LocalDate birthDate;
+    @Schema(example = "Male")
+    private Gender gender;
+
+    @Schema(example = "[\"취업\",\"여행\",\"인간관계\"]")
+    private List<String> category;
+}

backend/src/main/java/com/ggums/ggumtle/dto/request/PostBucketReactionRequestDto.java

@@ -11,5 +11,6 @@ public class PostBucketReactionRequestDto {
     private Long bucketId;
 
     @Size(max = 255, message = "리액션 크기를 초과하였습니다.")
+    @Schema(example = "멋져요")
     private String userReaction;
 }

backend/src/main/java/com/ggums/ggumtle/dto/request/PostReviewRequestDto.java

@@ -15,4 +15,7 @@ public class PostReviewRequestDto {
 
     @Schema(description = "후기 내용", example = "<p>구독자들 짱 많아요!</p>")
     private String context;
+
+    @Schema(description = "게시 여부 (임시저장인 경우 false)", example = "true")
+    private Boolean isPosted;
 }