merge: 6주차 작업 master에 반영

.github/workflows/master_weekly_cicd.yml

@@ -25,6 +25,9 @@ jobs:
         with:
           files: ./src/main/resources/application-prod.yml
         env:
+          spring.datasource.url: ${{ secrets.RDS_URL }}
+          spring.datasource.username: ${{ secrets.RDS_USERNAME }}
+          spring.datasource.password: ${{ secrets.RDS_PASSWORD }}
           aws.s3.bucket: ${{ secrets.AWS_S3_BUCKET }}
           aws.s3.accessKey: ${{ secrets.AWS_S3_ACCESS_KEY }}
           aws.s3.secretKey: ${{ secrets.AWS_S3_SECRET_KEY }}
@@ -56,4 +59,4 @@ jobs:
           script: |
             cd ./project
             sudo fuser -k -n tcp 8080 || true
-            nohup java -jar app.jar > ./output.log 2>&1 &
+            nohup java -Duser.timezone=Asia/Seoul -jar app.jar > ./output.log 2>&1 &

.github/workflows/pr_weekly_ci.yml

@@ -28,6 +28,9 @@ jobs:
         with:
           files: ./src/main/resources/application-prod.yml
         env:
+          spring.datasource.url: ${{ secrets.RDS_URL }}
+          spring.datasource.username: ${{ secrets.RDS_USERNAME }}
+          spring.datasource.password: ${{ secrets.RDS_PASSWORD }}
           aws.s3.bucket: ${{ secrets.AWS_S3_BUCKET }}
           aws.s3.accessKey: ${{ secrets.AWS_S3_ACCESS_KEY }}
           aws.s3.secretKey: ${{ secrets.AWS_S3_SECRET_KEY }}

build.gradle

@@ -38,6 +38,7 @@ dependencies {
 
     compileOnly 'org.projectlombok:lombok'
     runtimeOnly 'com.h2database:h2'
+    implementation 'org.hibernate:hibernate-spatial:6.6.1.Final'
     runtimeOnly 'com.mysql:mysql-connector-j'
     annotationProcessor 'org.projectlombok:lombok'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'

src/main/java/com/potatocake/everymoment/config/GeometryConfig.java

@@ -0,0 +1,14 @@
+package com.potatocake.everymoment.config;
+
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.PrecisionModel;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class GeometryConfig {
+    @Bean
+    public GeometryFactory geometryFactory() {
+        return new GeometryFactory(new PrecisionModel(), 4326);
+    }
+}

src/main/java/com/potatocake/everymoment/controller/CategoryController.java

@@ -5,6 +5,12 @@
 import com.potatocake.everymoment.dto.response.CategoryResponse;
 import com.potatocake.everymoment.security.MemberDetails;
 import com.potatocake.everymoment.service.CategoryService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
@@ -19,44 +25,64 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+@Tag(name = "Categories", description = "카테고리 관리 API")
 @RequiredArgsConstructor
 @RequestMapping("/api/categories")
 @RestController
 public class CategoryController {
 
     private final CategoryService categoryService;
 
+    @Operation(summary = "카테고리 목록 조회", description = "사용자의 카테고리 목록을 조회합니다.")
+    @ApiResponse(responseCode = "200", description = "카테고리 목록 조회 성공", content = @Content(schema = @Schema(implementation = CategoryResponse.class)))
     @GetMapping
     public ResponseEntity<SuccessResponse<CategoryResponse>> getCategories(
+            @Parameter(description = "인증된 사용자 정보", hidden = true)
             @AuthenticationPrincipal MemberDetails memberDetails) {
         List<CategoryResponse> categories = categoryService.getCategories(memberDetails.getId());
 
         return ResponseEntity.ok()
                 .body(SuccessResponse.ok(categories));
     }
 
+    @Operation(summary = "카테고리 추가", description = "새로운 카테고리를 추가합니다.")
+    @ApiResponse(responseCode = "200", description = "카테고리 추가 성공")
     @PostMapping
-    public ResponseEntity<SuccessResponse> addCategory(@RequestBody @Valid CategoryCreateRequest request,
-                                                       @AuthenticationPrincipal MemberDetails memberDetails) {
+    public ResponseEntity<SuccessResponse> addCategory(
+            @Parameter(description = "카테고리 생성 정보", required = true)
+            @RequestBody @Valid CategoryCreateRequest request,
+            @Parameter(description = "인증된 사용자 정보", hidden = true)
+            @AuthenticationPrincipal MemberDetails memberDetails) {
         categoryService.addCategory(memberDetails.getId(), request);
 
         return ResponseEntity.ok()
                 .body(SuccessResponse.ok());
     }
 
+    @Operation(summary = "카테고리 수정", description = "기존 카테고리를 수정합니다.")
+    @ApiResponse(responseCode = "200", description = "카테고리 수정 성공")
     @PatchMapping("/{categoryId}")
-    public ResponseEntity<SuccessResponse> updateCategory(@PathVariable Long categoryId,
-                                                          @RequestBody @Valid CategoryCreateRequest request,
-                                                          @AuthenticationPrincipal MemberDetails memberDetails) {
+    public ResponseEntity<SuccessResponse> updateCategory(
+            @Parameter(description = "수정할 카테고리 ID", required = true)
+            @PathVariable Long categoryId,
+            @Parameter(description = "카테고리 수정 정보", required = true)
+            @RequestBody @Valid CategoryCreateRequest request,
+            @Parameter(description = "인증된 사용자 정보", hidden = true)
+            @AuthenticationPrincipal MemberDetails memberDetails) {
         categoryService.updateCategory(categoryId, memberDetails.getId(), request);
 
         return ResponseEntity.ok()
                 .body(SuccessResponse.ok());
     }
 
+    @Operation(summary = "카테고리 삭제", description = "카테고리를 삭제합니다.")
+    @ApiResponse(responseCode = "200", description = "카테고리 삭제 성공")
     @DeleteMapping("/{categoryId}")
-    public ResponseEntity<SuccessResponse> deleteCategory(@PathVariable Long categoryId,
-                                                          @AuthenticationPrincipal MemberDetails memberDetails) {
+    public ResponseEntity<SuccessResponse> deleteCategory(
+            @Parameter(description = "삭제할 카테고리 ID", required = true)
+            @PathVariable Long categoryId,
+            @Parameter(description = "인증된 사용자 정보", hidden = true)
+            @AuthenticationPrincipal MemberDetails memberDetails) {
         categoryService.deleteCategory(categoryId, memberDetails.getId());
 
         return ResponseEntity.ok()

src/main/java/com/potatocake/everymoment/controller/CommentController.java

@@ -4,8 +4,11 @@
 import com.potatocake.everymoment.dto.request.CommentRequest;
 import com.potatocake.everymoment.security.MemberDetails;
 import com.potatocake.everymoment.service.CommentService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -15,18 +18,23 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+@Tag(name = "Comments", description = "댓글 관리 API")
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/api/comments")
 public class CommentController {
 
     private final CommentService commentService;
 
-    //댓글 수정
+    @Operation(summary = "댓글 수정", description = "기존 댓글을 수정합니다.")
+    @ApiResponse(responseCode = "200", description = "댓글 수정 성공")
     @PatchMapping("/{commentId}")
     public ResponseEntity<SuccessResponse<Void>> updateComment(
+            @Parameter(description = "인증된 사용자 정보", hidden = true)
             @AuthenticationPrincipal MemberDetails memberDetails,
+            @Parameter(description = "수정할 댓글 ID", required = true)
             @PathVariable Long commentId,
+            @Parameter(description = "댓글 수정 정보", required = true)
             @RequestBody CommentRequest commentRequest) {
         Long memberId = memberDetails.getId();
 
@@ -36,10 +44,13 @@ public ResponseEntity<SuccessResponse<Void>> updateComment(
                 .body(SuccessResponse.ok());
     }
 
-    //댓글 삭제
+    @Operation(summary = "댓글 삭제", description = "댓글을 삭제합니다.")
+    @ApiResponse(responseCode = "200", description = "댓글 삭제 성공")
     @DeleteMapping("/{commentId}")
     public ResponseEntity<SuccessResponse<Void>> deleteComment(
+            @Parameter(description = "인증된 사용자 정보", hidden = true)
             @AuthenticationPrincipal MemberDetails memberDetails,
+            @Parameter(description = "삭제할 댓글 ID", required = true)
             @PathVariable Long commentId) {
         Long memberId = memberDetails.getId();