Merge pull request #68 from 5-mo/feat/#65-patch-schedule

[FIX] nlp 호출 경로 환경변수로 등록

Author: hyojin425

.github/workflows/dev_deploy.yml

@@ -38,9 +38,6 @@ jobs:
             sudo docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
             sudo docker pull ${{ secrets.DOCKER_USERNAME }}/ohmo:latest
 
-            # 네트워크 생성
-            sudo docker network create oh-mo-backend_app-network || true
-
             # Stop and remove old container
             sudo docker stop ohmo || true
             sudo docker rm ohmo || true
@@ -49,9 +46,10 @@ jobs:
             sudo docker run -d \
               --name ohmo \
               -p 8080:8080 \
-              --network oh-mo-backend_app-network \
+              --network ohmo-network \
               -e DATABASE_URL=${{ secrets.DATABASE_URL }} \
               -e DATABASE_USERNAME=${{ secrets.DATABASE_USERNAME }} \
               -e DATABASE_PASSWORD=${{ secrets.DATABASE_PASSWORD }} \
               -e JWT_SECRET_KEY=${{ secrets.JWT_SECRET_KEY }} \
+              -e NLP_API_URL=${{ secrets.NLP_API_URL }} \
               ${{ secrets.DOCKER_USERNAME }}/ohmo:latest

src/main/java/com/example/ohmobackend/service/scheduleService/ScheduleCommandServiceImpl.java

@@ -15,6 +15,7 @@
 import com.example.ohmobackend.web.dto.scheduleDto.ScheduleResponseDto;
 import com.example.ohmobackend.web.dto.todoDto.TodoResponseDto;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
@@ -39,11 +40,14 @@
 @Transactional
 public class ScheduleCommandServiceImpl implements ScheduleCommandService {
 
+    @Value("${nlp.api-url}")
+    private String nlpApiUrl;
     final private MemberCategoryRepository memberCategoryRepository;
     final private ScheduleRepository scheduleRepository;
     final private TodoRepository todoRepository;
     final private RoutineRepository routineRepository;
 
+
     @Override
     public List<RoutineResponseDto.RoutineDto> addRoutine(
             ScheduleRequestDto.AddRequestDto requestDto,
@@ -275,8 +279,7 @@ private Map<String, Object> callNlpApi(String text) {
         headers.setContentType(MediaType.TEXT_PLAIN);
         HttpEntity<String> entity = new HttpEntity<>(text, headers);
 
-        String apiUrl = "http://localhost:8000/nlp/extract-text";
-        ResponseEntity<Map> response = restTemplate.postForEntity(apiUrl, entity, Map.class);
+        ResponseEntity<Map> response = restTemplate.postForEntity(nlpApiUrl + "/nlp/extract-text", entity, Map.class);
 
         if (!response.getStatusCode().is2xxSuccessful() || response.getBody() == null) {
             throw new ScheduleHandler(ErrorStatus.NLP_PARSE_FAILED);
@@ -286,4 +289,5 @@ private Map<String, Object> callNlpApi(String text) {
     }
 
 
+
 }

src/main/resources/application.yml

@@ -22,4 +22,7 @@ spring:
         default_batch_fetch_size: 1000${}
 
 jwt:
-  secret: ${JWT_SECRET_KEY}
+  secret: ${JWT_SECRET_KEY}
+
+nlp:
+  api-url: ${NLP_API_URL:http://localhost:8000}