Merge pull request #48 from kookmin-sw/backend/feat/#47

Backend/feat/#47
kookmin-sw · Apr 2, 2024 · d744a36 · d744a36
2 parents ed47881 + ba090c7
commit d744a36
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 6 deletions.
diff --git a/...nd/moment/moment-server/scheduler/src/main/java/com/moment/scheduler/client/AiClient.java b/...nd/moment/moment-server/scheduler/src/main/java/com/moment/scheduler/client/AiClient.java
@@ -1,10 +1,12 @@
 package com.moment.scheduler.client;
 
+import com.moment.scheduler.dto.request.AiModelRunRequestDTO;
 import com.moment.scheduler.dto.response.AiModelRunResponseDTO;
 import com.moment.scheduler.dto.response.EmotionResponseDTO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
 @FeignClient(name = "ai-service")
@@ -15,6 +17,6 @@ public interface AiClient {
      * @Param String fileName
      */
     @PostMapping("/ai/run")
-    AiModelRunResponseDTO.RunModel runAi(@RequestParam String file_name);
+    AiModelRunResponseDTO.RunModel runAi(@RequestBody AiModelRunRequestDTO.RunModel request);
 
 }
diff --git a/...t/moment-server/scheduler/src/main/java/com/moment/scheduler/controller/AiController.java b/...t/moment-server/scheduler/src/main/java/com/moment/scheduler/controller/AiController.java
@@ -19,6 +19,6 @@ public class AiController {
 
     @PostMapping("/run")
     public AiModelRunResponseDTO.RunModel runAi(@RequestBody AiModelRunRequestDTO.RunModel request) {
-        return aiService.runAi(request.getFileName());
+        return aiService.runAi(request.getFile_name());
     }
 }
diff --git a/...server/scheduler/src/main/java/com/moment/scheduler/dto/request/AiModelRunRequestDTO.java b/...server/scheduler/src/main/java/com/moment/scheduler/dto/request/AiModelRunRequestDTO.java
@@ -12,6 +12,7 @@ public class AiModelRunRequestDTO {
     @NoArgsConstructor
     @AllArgsConstructor
     public static class RunModel {
-        private String fileName;
+        private String file_name;
+        private String file_path;
     }
 }
diff --git a/...rver/scheduler/src/main/java/com/moment/scheduler/dto/response/AiModelRunResponseDTO.java b/...rver/scheduler/src/main/java/com/moment/scheduler/dto/response/AiModelRunResponseDTO.java
@@ -13,7 +13,6 @@ public static class RunModel {
         private final String status;
         private final EmotionResponseDTO.GetEmotionList emotions;
         private final String text;
-        private final List<String> log;
         private final String error;
     }
 }
diff --git a/...-server/scheduler/src/main/java/com/moment/scheduler/dto/response/EmotionResponseDTO.java b/...-server/scheduler/src/main/java/com/moment/scheduler/dto/response/EmotionResponseDTO.java
@@ -15,7 +15,6 @@ public static class GetEmotionList {
         private final Float happy;
         private final Float sad;
         private final Float angry;
-        private final Float excited;
         private final Float neutral;
     }
 

diff --git a/.../moment/moment-server/scheduler/src/main/java/com/moment/scheduler/service/AiService.java b/.../moment/moment-server/scheduler/src/main/java/com/moment/scheduler/service/AiService.java
@@ -1,6 +1,7 @@
 package com.moment.scheduler.service;
 
 import com.moment.scheduler.client.AiClient;
+import com.moment.scheduler.dto.request.AiModelRunRequestDTO;
 import com.moment.scheduler.dto.response.AiModelRunResponseDTO;
 import com.moment.scheduler.dto.response.EmotionResponseDTO;
 import lombok.AllArgsConstructor;
@@ -10,8 +11,14 @@
 @AllArgsConstructor
 public class AiService {
     private final AiClient aiClient;
+    private final static String file_path = "";
 
     public AiModelRunResponseDTO.RunModel runAi(String fileName) {
-        return aiClient.runAi(fileName);
+        return aiClient.runAi(
+                AiModelRunRequestDTO.RunModel.builder()
+                        .file_name(fileName)
+                        .file_path(file_path)
+                        .build()
+        );
     }
 }