Merge pull request #9 from AI-SIP/develop

get processImage from fastApi Server
AI-SIP · Jul 25, 2024 · c44665c · c44665c
2 parents 7348ab9 + 58f3766
commit c44665c
Show file tree

Hide file tree

Showing 9 changed files with 71 additions and 31 deletions.
diff --git a/src/main/java/com/aisip/OnO/backend/Dto/Problem/ProblemResponseDto.java b/src/main/java/com/aisip/OnO/backend/Dto/Problem/ProblemResponseDto.java
@@ -1,12 +1,10 @@
 package com.aisip.OnO.backend.Dto.Problem;
 
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
+import lombok.*;
 
 import java.time.LocalDateTime;
 
+@Builder
 @Getter
 @Setter
 @NoArgsConstructor

diff --git a/src/main/java/com/aisip/OnO/backend/Dto/User/UserResponseDto.java b/src/main/java/com/aisip/OnO/backend/Dto/User/UserResponseDto.java
@@ -1,11 +1,9 @@
 package com.aisip.OnO.backend.Dto.User;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
+import lombok.*;
 
+@Builder
 @Getter
 @Setter
 @NoArgsConstructor
@@ -15,10 +13,6 @@ public class UserResponseDto {
 
     private Long userId;
 
-    private String socialId;
-
-    private String socialLoginType;
-
     private String userName;
 
     private String userEmail;

diff --git a/src/main/java/com/aisip/OnO/backend/controller/UserController.java b/src/main/java/com/aisip/OnO/backend/controller/UserController.java
@@ -1,5 +1,6 @@
 package com.aisip.OnO.backend.controller;
 
+import com.aisip.OnO.backend.Dto.User.UserResponseDto;
 import com.aisip.OnO.backend.service.AuthService;
 import com.aisip.OnO.backend.entity.User;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,9 +20,9 @@ public class UserController {
     @GetMapping("/info")
     public ResponseEntity<?> getUserInfo(Authentication authentication) {
         Long userId = (Long) authentication.getPrincipal();
-        User user = authService.getUserById(userId);
-        if (user != null) {
-            return ResponseEntity.ok(user);
+        UserResponseDto userResponseDto = authService.getUserById(userId);
+        if (userResponseDto != null) {
+            return ResponseEntity.ok(userResponseDto);
         } else {
             return ResponseEntity.status(404).body(new ErrorResponse("User not found"));
         }

diff --git a/src/main/java/com/aisip/OnO/backend/converter/ProblemConverter.java b/src/main/java/com/aisip/OnO/backend/converter/ProblemConverter.java
@@ -1,5 +1,6 @@
 package com.aisip.OnO.backend.converter;
 
+import com.aisip.OnO.backend.Dto.Problem.ProblemRegisterDto;
 import com.aisip.OnO.backend.Dto.Problem.ProblemResponseDto;
 import com.aisip.OnO.backend.entity.Image.ImageData;
 import com.aisip.OnO.backend.entity.Problem;
@@ -13,30 +14,31 @@ public static ProblemResponseDto convertToResponseDto(Problem problem, List<Imag
             return null;
         }
 
-        ProblemResponseDto dto = new ProblemResponseDto();
-        dto.setProblemId(problem.getId());
-        dto.setMemo(problem.getMemo());
-        dto.setReference(problem.getReference());
-        dto.setSolvedAt(problem.getSolvedAt());
-
+        ProblemResponseDto problemResponseDto = ProblemResponseDto.builder()
+                .problemId(problem.getId())
+                .memo(problem.getMemo())
+                .reference(problem.getReference())
+                .solvedAt(problem.getSolvedAt())
+                .build();
+
         // 이미지 데이터를 DTO에 설정
         for (ImageData image : images) {
             switch (image.getImageType()) {
                 case PROBLEM_IMAGE:
-                    dto.setProblemImageUrl(image.getImageUrl());
+                    problemResponseDto.setProblemImageUrl(image.getImageUrl());
                     break;
                 case PROCESS_IMAGE:
-                    dto.setProcessImageUrl(image.getImageUrl());
+                    problemResponseDto.setProcessImageUrl(image.getImageUrl());
                     break;
                 case ANSWER_IMAGE:
-                    dto.setAnswerImageUrl(image.getImageUrl());
+                    problemResponseDto.setAnswerImageUrl(image.getImageUrl());
                     break;
                 case SOLVE_IMAGE:
-                    dto.setSolveImageUrl(image.getImageUrl());
+                    problemResponseDto.setSolveImageUrl(image.getImageUrl());
                     break;
             }
         }
 
-        return dto;
+        return problemResponseDto;
     }
 }
diff --git a/src/main/java/com/aisip/OnO/backend/converter/UserConverter.java b/src/main/java/com/aisip/OnO/backend/converter/UserConverter.java
@@ -0,0 +1,22 @@
+package com.aisip.OnO.backend.converter;
+
+import com.aisip.OnO.backend.Dto.User.UserResponseDto;
+import com.aisip.OnO.backend.entity.User;
+
+public class UserConverter {
+
+    public static UserResponseDto convertToResponseDto(User user){
+
+        if (user == null) {
+            return null;
+        }
+
+        UserResponseDto userResponseDto = UserResponseDto.builder()
+                .userId(user.getUserId())
+                .userName(user.getName())
+                .userEmail(user.getEmail())
+                .build();
+
+        return userResponseDto;
+    }
+}
diff --git a/src/main/java/com/aisip/OnO/backend/entity/User.java b/src/main/java/com/aisip/OnO/backend/entity/User.java
@@ -14,7 +14,9 @@ public class User {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long userId;
+
     private String email;
+
     private String name;
 }
 
diff --git a/src/main/java/com/aisip/OnO/backend/service/AuthService.java b/src/main/java/com/aisip/OnO/backend/service/AuthService.java
@@ -1,5 +1,7 @@
 package com.aisip.OnO.backend.service;
 
+import com.aisip.OnO.backend.Dto.User.UserResponseDto;
+import com.aisip.OnO.backend.converter.UserConverter;
 import com.aisip.OnO.backend.repository.UserRepository;
 import com.aisip.OnO.backend.entity.User;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,10 +21,14 @@ public User registerOrLoginUser(String email, String name) {
             user.setName(name);
             userRepository.save(user);
         }
+
         return user;
     }
 
-    public User getUserById(Long userId) {
-        return userRepository.findById(userId).orElse(null);
+    public UserResponseDto getUserById(Long userId) {
+
+        User user = userRepository.findById(userId).orElse(null);
+
+        return UserConverter.convertToResponseDto(user);
     }
 }
diff --git a/src/main/java/com/aisip/OnO/backend/service/FileUploadServiceImpl.java b/src/main/java/com/aisip/OnO/backend/service/FileUploadServiceImpl.java
@@ -7,6 +7,8 @@
 import com.amazonaws.services.s3.AmazonS3Client;
 import com.amazonaws.services.s3.model.DeleteObjectRequest;
 import com.amazonaws.services.s3.model.ObjectMetadata;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -60,7 +62,7 @@ public ImageData saveImageData(String imageUrl, Problem problem, ImageType image
     @Override
     public String getProcessImageUrlFromProblemImageUrl(String problemImageUrl) {
         RestTemplate restTemplate = new RestTemplate();
-        String url = fastApiUrl + "/show-url";
+        String url = fastApiUrl + "/process-color";
 
         UriComponentsBuilder uriBuilder = UriComponentsBuilder.fromHttpUrl(url)
                 .queryParam("full_url", problemImageUrl);
@@ -70,7 +72,20 @@ public String getProcessImageUrlFromProblemImageUrl(String problemImageUrl) {
 
         // 응답 로그 출력
         System.out.println("Response from server: " + response);
-        return response;
+
+        // JSON 응답 파싱
+        try {
+            ObjectMapper objectMapper = new ObjectMapper();
+            JsonNode rootNode = objectMapper.readTree(response);
+            JsonNode pathNode = rootNode.path("path");
+            String inputPath = pathNode.path("output_path").asText();
+
+            return "https://" + bucket + ".s3.ap-northeast-2.amazonaws.com/" + inputPath;
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new RuntimeException("Failed to parse response", e);
+        }
     }
 
     @Transactional(readOnly = true)

diff --git a/src/main/java/com/aisip/OnO/backend/service/ProblemServiceImpl.java b/src/main/java/com/aisip/OnO/backend/service/ProblemServiceImpl.java
@@ -91,7 +91,7 @@ public boolean saveProblem(Long userId, ProblemRegisterDto problemRegisterDto) {
 
                 if (problemImageUrl != null && !problemImageUrl.isEmpty()) {
                     String processImageUrl = fileUploadService.getProcessImageUrlFromProblemImageUrl(problemImageUrl);
-                    fileUploadService.saveImageData("processImageUrl", savedProblem, ImageType.PROCESS_IMAGE);
+                    fileUploadService.saveImageData(processImageUrl, savedProblem, ImageType.PROCESS_IMAGE);
                 }
 
                 return true;