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

[FEAT] AI로 일정 추가하기 API

Author: hyojin425

src/main/java/com/example/ohmobackend/apiPayload/code/status/ErrorStatus.java

@@ -40,6 +40,7 @@ public enum ErrorStatus implements BaseErrorCode {
     SCHEDULE_NOT_TO_DO_TYPE(HttpStatus.BAD_REQUEST, "SCHEDULE4004", "일정이 투두가 아닙니다."),
     SCHEDULE_INVALID_ALARM_TIME(HttpStatus.BAD_REQUEST, "SCHEDULE4005", "알람 시간 등록이 불가능한 일정입니다."),
     SCHEDULE_NOT_GROUP_TYPE(HttpStatus.BAD_REQUEST, "SCHEDULE4006", "그룹 일정이 아닙니다."),
+    NLP_PARSE_FAILED(HttpStatus.BAD_REQUEST, "SCHEDULE4007", "텍스트 파싱 실패"),
 
     // 질문 관련
     QUESTION_NOT_FOUND(HttpStatus.BAD_REQUEST, "QUESTION4001", "등록된 질문이 없습니다."),

src/main/java/com/example/ohmobackend/converter/ScheduleConverter.java

@@ -10,8 +10,10 @@
 
 import java.time.DayOfWeek;
 import java.time.LocalDate;
+import java.time.LocalTime;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
@@ -20,16 +22,50 @@ public class ScheduleConverter {
     static public Schedule toEntity(
             ScheduleRequestDto.AddRequestDto requestDto,
             MemberCategory memberCategory) {
-        return Schedule.builder()
+        Schedule.ScheduleBuilder builder = Schedule.builder()
                 .date(requestDto.getDate())
                 .time(requestDto.getTime())
                 .alarmTime(requestDto.getAlarmTime())
                 .content(requestDto.getContent())
                 .scheduleType(memberCategory.getScheduleType())
-                .memberCategory(memberCategory)
-                .repeatWeek(new HashSet<>())
-                .build();
+                .memberCategory(memberCategory);
+
+        if (memberCategory.getScheduleType() == ScheduleType.ROUTINE) {
+            builder.repeatWeek(new HashSet<>(requestDto.getRoutineWeek()));
+        }
+
+        return builder.build();
+    }
+
+    static public Schedule parsedResultToEntity(
+            Map<String, Object> parsedResult,
+            MemberCategory memberCategory) {
+
+        LocalDate date = parseDate(parsedResult.get("date"));
+        LocalTime time = parseTime(parsedResult.get("time"));
+        LocalTime alarmTime = parseTime(parsedResult.get("alarm_time"));
+
+        return Schedule.builder()
+                .date(date)
+                .time(time)
+                .alarmTime(alarmTime)
+                .content((String) parsedResult.get("content"))
+                .scheduleType(memberCategory.getScheduleType())
+                .memberCategory(memberCategory).build();
+    }
+
+    private static LocalDate parseDate(Object obj) {
+        if (obj instanceof String str && !str.isEmpty()) {
+            return LocalDate.parse(str);
+        }
+        return null;
+    }
 
+    private static LocalTime parseTime(Object obj) {
+        if (obj instanceof String str && !str.isEmpty()) {
+            return LocalTime.parse(str);
+        }
+        return null;
     }
 
     static public Schedule groupScheduleToEntity(

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

@@ -16,6 +16,8 @@ public interface ScheduleCommandService {
 
     public TodoResponseDto.TodoDto addTodo(ScheduleRequestDto.AddRequestDto requestDto, Member member);
 
+    public TodoResponseDto.TodoDto nlpAddTodo(ScheduleRequestDto.NlpAddRequestDto requestDto, Member member);
+
     public TodoResponseDto.TodoDto updateTodo(Long scheduleId, ScheduleRequestDto.AddRequestDto requestDto, Member member);
 
     public ScheduleResponseDto.ScheduleTodoDto updateScheduleDate(ScheduleRequestDto.UpdateTodoDateRequestDto requestDto, Member member);

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

@@ -15,12 +15,18 @@
 import com.example.ohmobackend.web.dto.scheduleDto.ScheduleResponseDto;
 import com.example.ohmobackend.web.dto.todoDto.TodoResponseDto;
 import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.client.RestTemplate;
 
 import java.time.LocalDate;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
@@ -71,7 +77,6 @@ public List<RoutineResponseDto.RoutineDto> addRoutine(
     }
 
     @Override
-    @Transactional
     public List<RoutineResponseDto.RoutineDto> updateRoutine(
             Long scheduleId,
             ScheduleRequestDto.AddRequestDto requestDto,
@@ -100,6 +105,19 @@ public TodoResponseDto.TodoDto addTodo(ScheduleRequestDto.AddRequestDto requestD
         return TodoConverter.toTodoDto(todo);
     }
 
+    @Override
+    public TodoResponseDto.TodoDto nlpAddTodo(ScheduleRequestDto.NlpAddRequestDto requestDto, Member member) {
+        Map<String, Object> parsedResult = callNlpApi(requestDto.getText());
+        MemberCategory memberCategory = memberCategoryRepository.findByMemberAndCategoryNameAndScheduleType(
+                        member, "default", ScheduleType.TO_DO)
+                .orElseThrow(() -> new MemberCategoryHandler(ErrorStatus.MEMBER_CATEGORY_NOT_FOUND));
+
+        Schedule schedule = ScheduleConverter.parsedResultToEntity(parsedResult, memberCategory);
+        scheduleRepository.save(schedule);
+        Todo todo = todoRepository.save(TodoConverter.toEntity(schedule));
+        return TodoConverter.toTodoDto(todo);
+    }
+
     @Override
     public TodoResponseDto.TodoDto updateTodo(Long scheduleId, ScheduleRequestDto.AddRequestDto requestDto, Member member) {
         Schedule schedule = scheduleRepository.findById(scheduleId)
@@ -251,4 +269,21 @@ private List<RoutineResponseDto.RoutineDto> findRoutineDtos(Schedule schedule) {
                 .toList();
     }
 
+    private Map<String, Object> callNlpApi(String text) {
+        RestTemplate restTemplate = new RestTemplate();
+        HttpHeaders headers = new HttpHeaders();
+        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);
+
+        if (!response.getStatusCode().is2xxSuccessful() || response.getBody() == null) {
+            throw new ScheduleHandler(ErrorStatus.NLP_PARSE_FAILED);
+        }
+
+        return (Map<String, Object>) response.getBody().get("result");
+    }
+
+
 }

src/main/java/com/example/ohmobackend/web/controller/ScheduleController.java

@@ -68,6 +68,17 @@ public ApiResponse<TodoResponseDto.TodoDto> updateTodo(
         return ApiResponse.onSuccess(SuccessStatus.TODO_UPDATE_OK, todoDto);
     }
 
+    @PatchMapping("/nlp/todo")
+    @Operation(summary = "투두 AI 일정 등록 API",
+            description = "투두 AI 일정 등록 API입니다. " +
+                    "입력 필수 요소: text")
+    public ApiResponse<TodoResponseDto.TodoDto> nlpAddTodo(
+            @Valid @RequestBody ScheduleRequestDto.NlpAddRequestDto request,
+            @AuthUser Member member) {
+        TodoResponseDto.TodoDto todoDto = scheduleCommandService.nlpAddTodo(request, member);
+        return ApiResponse.onSuccess(SuccessStatus.ROUTINE_UPDATE_OK, todoDto);
+    }
+
     @PatchMapping ("/alarm")
     @Operation(summary = "알람 시간 등록 API", description = "알람 시간 등록 API 입니다.")
     public ApiResponse<Object> updateScheduleAlarmTime(@RequestBody ScheduleRequestDto.UpdateScheduleAlarmTimeDto request, @AuthUser Member member) {

src/main/java/com/example/ohmobackend/web/dto/scheduleDto/ScheduleRequestDto.java

@@ -42,4 +42,9 @@ public static class UpdateScheduleAlarmTimeDto {
         private Long scheduleId;
         private LocalTime alarmTime;
     }
+
+    @Getter
+    public static class NlpAddRequestDto {
+        private String text;
+    }
 }