fix: 파일 충돌 해결

Author: shinminkyoung1

.github/workflows/deploy.yml

@@ -3,9 +3,15 @@ name: deploy
 on:
   push:
     branches: [ "develop" ]
+<<<<<<< HEAD
   pull_request:
     branches: [ "develop" ]
     types: [closed]
+=======
+#  pull_request:
+#    branches: [ "develop" ]
+#    types: [closed]
+>>>>>>> 4904f89120c9db955ca9d1633e441ec857129ab3
 
 permissions:
   contents: read
@@ -22,7 +28,11 @@ jobs:
     # Gradlew 실행 허용
     - name: Run chmod to make gradlew executable
       run: chmod +x ./gradlew
+<<<<<<< HEAD
     # JDK 11 세팅
+=======
+    # JDK 21 세팅
+>>>>>>> 4904f89120c9db955ca9d1633e441ec857129ab3
     - name: Set up JDK 21
       uses: actions/setup-java@v3
       with:
@@ -31,11 +41,18 @@ jobs:
     # 환경 변수 설정
     - name: Set environment values
       run: |
+<<<<<<< HEAD
         cd ./src/main/resources
         mkdir -p ./gcp
         touch ./application.yml
         echo "${{ secrets.APPLICATION_PROPERTIES }}" > ./application.yml
         echo "${{ secrets.GCP_SERVICE_KEY }}" | base64 --decode > ./gcp/service-key.json
+=======
+        mkdir -p src/main/resources/{gcp,ocr}
+        echo "${{ secrets.APPLICATION_PROPERTIES }}" > src/main/resources/application.yml
+        echo "${{ secrets.GCP_SERVICE_KEY }}" | base64 --decode > src/main/resources/gcp/service-key.json
+        echo "${{ secrets.OCR_SERVICE_KEY }}" | base64 --decode > src/main/resources/ocr/service-key.json
+>>>>>>> 4904f89120c9db955ca9d1633e441ec857129ab3
       shell: bash
     # Gradle build (Test 제외)
     - name: Build with Gradle

.gitignore

@@ -1,12 +1,14 @@
 HELP.md
 .gradle
 build/
+.DS_Store
 !gradle/wrapper/gradle-wrapper.jar
 !**/src/main/**/build/
 !**/src/test/**/build/
 **/application.yml
 **/application-test.yml
 **/resources/gcp/
+**/resources/ocr/
 
 ### STS ###
 .apt_generated
@@ -38,3 +40,5 @@ out/
 
 ### VS Code ###
 .vscode/
+src/main/resources/ocr/service-key.json
+

build.gradle

@@ -78,6 +78,9 @@ dependencies {
 
     // swagger
     implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0'
+
+    // Google Cloud Vision API
+    implementation 'com.google.cloud:google-cloud-vision:3.22.0'
 }
 
 tasks.named('test') {

src/main/java/com/weve/controller/AppreciateController.java

@@ -0,0 +1,52 @@
+package com.weve.controller;
+
+import com.weve.common.api.payload.BasicResponse;
+import com.weve.dto.request.PostAppreciateRequest;
+import com.weve.dto.response.GetAppreciateListResponse;
+import com.weve.dto.response.GetAppreciateResponse;
+import com.weve.service.AppreciateService;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequiredArgsConstructor
+@Validated
+@Slf4j
+@RequestMapping("/api/appreciate")
+@Tag(name = "Appreciate", description = "Appreciate 관련 API입니다.")
+public class AppreciateController {
+
+    private final AppreciateService appreciateService;
+
+    // 감사인사 작성하기
+    @PostMapping
+    public BasicResponse<?> postAppreciate(@AuthenticationPrincipal UserDetails userDetails, @RequestBody PostAppreciateRequest request) {
+
+        String username = userDetails.getUsername();
+        appreciateService.postAppreciate(username, request);
+        return BasicResponse.onSuccess(null);
+    }
+
+    // 감사편지 상세 조회 (어르신용)
+    @GetMapping("/details")
+    public BasicResponse<GetAppreciateResponse.SeniorVer> getAppreciate(@AuthenticationPrincipal UserDetails userDetails, @RequestParam Long worryId) {
+
+        String username = userDetails.getUsername();
+        GetAppreciateResponse.SeniorVer response = appreciateService.getAppreciate(username, worryId);
+        return BasicResponse.onSuccess(response);
+    }
+
+    // 감사편지 목록 조회
+    @GetMapping
+    public BasicResponse<GetAppreciateListResponse> getAppreciateList(@AuthenticationPrincipal UserDetails userDetails) {
+
+        String username = userDetails.getUsername();
+        GetAppreciateListResponse response = appreciateService.getAppreciateList(username).getResult();
+        return BasicResponse.onSuccess(response);
+    }
+}

src/main/java/com/weve/controller/AuthController.java

@@ -2,6 +2,7 @@
 
 import com.weve.common.api.payload.BasicResponse;
 import com.weve.common.api.payload.code.status.ErrorStatus;
+import com.weve.dto.request.LoginRequestDto;
 import com.weve.dto.request.UserRequestDto;
 import com.weve.service.AuthService;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -43,7 +44,7 @@ public BasicResponse<String> register(@RequestBody UserRequestDto request) {
 
     // 로그인
     @PostMapping("/login")
-    public BasicResponse<?> login(@RequestBody UserRequestDto request) {
+    public BasicResponse<?> login(@RequestBody LoginRequestDto request) {
 
         // 전화번호 및 이름 필수 체크
         if (request.getPhoneNumber() == null || request.getPhoneNumber().isBlank()) {

src/main/java/com/weve/controller/GcsController.java

@@ -7,6 +7,10 @@
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+<<<<<<< HEAD
+=======
+import org.springframework.http.MediaType;
+>>>>>>> 4904f89120c9db955ca9d1633e441ec857129ab3
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -26,7 +30,7 @@ public class GcsController {
 
     private final GcsService gcsService;
 
-    @PostMapping("/upload")
+    @PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     @Operation(summary = "파일 업로드", description = "파일을 업로드하여 URL을 생성합니다.")
     public BasicResponse<UploadFileResponse> uploadFile(@RequestPart(value = "file") MultipartFile multipartFile) throws IOException {
 

src/main/java/com/weve/controller/ImageController.java

@@ -0,0 +1,31 @@
+package com.weve.controller;
+
+import com.weve.common.api.payload.BasicResponse;
+import com.weve.domain.User;
+import com.weve.service.ImageService;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.jdbc.support.CustomSQLErrorCodesTranslation;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+
+
+@RestController
+@RequestMapping("/api/image")
+@RequiredArgsConstructor
+@Tag(name = "OCR", description = "OCR 관련 API입니다.")
+public class ImageController {
+
+    private final ImageService imageService;
+
+    @PostMapping
+    public BasicResponse<String> postOcrText(@AuthenticationPrincipal UserDetails userDetails, @RequestParam("imageFile") MultipartFile imageFile) throws IOException {
+
+        String username = userDetails.getUsername();
+        return imageService.postOcrTextByFile(username, imageFile);
+    }
+}

src/main/java/com/weve/domain/Appreciate.java

@@ -23,4 +23,7 @@ public class Appreciate extends BaseEntity {
     private String audioUrl;
 
     private boolean isRead;
+    public void setAsRead(){
+        this.isRead = true;
+    }
 }

src/main/java/com/weve/dto/gemini/GeminiResponse.java

@@ -30,6 +30,8 @@ public static class Content {
 
     @Getter
     @Builder
+    @NoArgsConstructor  // 기본 생성자 추가 (역직렬화 오류 해결)
+    @AllArgsConstructor
     public static class Part {
         private String text;
     }

src/main/java/com/weve/dto/request/PostAppreciateRequest.java

@@ -0,0 +1,10 @@
+package com.weve.dto.request;
+
+import lombok.Getter;
+
+@Getter
+public class PostAppreciateRequest {
+
+    private Long worryId;
+    private String content; // 감사인사 내용
+}