Feat [#42] 타이머 API 수정 (#43)

Author: geniusYoo

jaksim/src/main/java/org/sopt/jaksim/global/config/SwaggerConfig.java

@@ -12,8 +12,8 @@ public class SwaggerConfig {
     @Bean
     public OpenAPI openAPI() {
         Info info = new Info()
-                .title("Jaksim Swagger")
-                .description("Jaksim Swagger dev API")
+                .title("Morib 스웩")
+                .description("Morib Swagger")
                 .version("v1");
 
         return new OpenAPI()

jaksim/src/main/java/org/sopt/jaksim/task/api/TimerApiController.java

@@ -30,7 +30,7 @@ public class TimerApiController {
     private final TodoService todoService;
 
     @GetMapping("/timer")
-    public ResponseEntity<BaseResponse<?>> getTotalTimeToday(@RequestParam("targetDate") String targetDate) {
+    public ResponseEntity<BaseResponse<?>> getTotalTimeToday(@RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate targetDate) {
         TotalTimeTodayResponse response = userTimerService.getTotalTimeToday(targetDate);
         return ApiResponseUtil.success(SuccessMessage.SUCCESS, response);
     }

jaksim/src/main/java/org/sopt/jaksim/task/domain/TaskTimer.java

@@ -4,6 +4,7 @@
 import jakarta.persistence.*;
 import lombok.*;
 import org.sopt.jaksim.global.common.BaseTimeEntity;
+import org.sopt.jaksim.task.repository.TaskTimerRepository;
 
 import java.time.LocalDate;
 
@@ -25,4 +26,12 @@ public class TaskTimer extends BaseTimeEntity {
     private LocalDate targetDate;
     private int targetTime;
 
+    public static TaskTimer create(Long userId, Long taskId) {
+        return TaskTimer.builder()
+                .userId(userId)
+                .taskId(taskId)
+                .targetDate(LocalDate.now())
+                .targetTime(0)
+                .build();
+    }
 }

jaksim/src/main/java/org/sopt/jaksim/task/domain/UserTimer.java

@@ -3,6 +3,9 @@
 import jakarta.persistence.*;
 import lombok.*;
 import org.sopt.jaksim.global.common.BaseTimeEntity;
+import org.springframework.cglib.core.Local;
+
+import java.time.LocalDate;
 
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @AllArgsConstructor(access = AccessLevel.PRIVATE)
@@ -17,10 +20,10 @@ public class UserTimer extends BaseTimeEntity {
     @Column(nullable = false)
     private Long userId;
     @Column(nullable = false)
-    private String targetDate;
+    private LocalDate targetDate;
     private int targetTime;
 
-    public static UserTimer create(Long userId, String targetDate) {
+    public static UserTimer create(Long userId, LocalDate targetDate) {
         return UserTimer.builder()
                 .userId(userId)
                 .targetDate(targetDate)

jaksim/src/main/java/org/sopt/jaksim/task/dto/StopTimerRequest.java

@@ -1,7 +1,9 @@
 package org.sopt.jaksim.task.dto;
 
+import java.time.LocalDate;
+
 public record StopTimerRequest(
-        String targetDate,
+        LocalDate targetDate,
         int elapsedTime
 ) {
 }

jaksim/src/main/java/org/sopt/jaksim/task/dto/TotalTimeTodayResponse.java

@@ -1,10 +1,12 @@
 package org.sopt.jaksim.task.dto;
 
+import java.time.LocalDate;
+
 public record TotalTimeTodayResponse(
-        String targetDate,
+        LocalDate targetDate,
         int targetTime
 ) {
-    public static TotalTimeTodayResponse of(String targetDate, int targetTime) {
+    public static TotalTimeTodayResponse of(LocalDate targetDate, int targetTime) {
         return new TotalTimeTodayResponse(targetDate, targetTime);
     }
 }

jaksim/src/main/java/org/sopt/jaksim/task/repository/TaskTimerRepository.java

@@ -3,8 +3,11 @@
 import org.sopt.jaksim.task.domain.TaskTimer;
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import java.time.LocalDate;
 import java.util.List;
+import java.util.Optional;
 
 public interface TaskTimerRepository extends JpaRepository<TaskTimer, Long> {
-    List<TaskTimer> findByTaskIdIn(List<Long> taskId);
+    List<TaskTimer> findByUserIdAndTargetDateAndTaskIdIn(Long userId, LocalDate targetDate, List<Long> taskId);
+    Optional<TaskTimer> findByUserIdAndTargetDateAndTaskId(Long userId, LocalDate targetDate, Long taskId);
 }

jaksim/src/main/java/org/sopt/jaksim/task/repository/UserTimerRepository.java

@@ -4,9 +4,10 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.repository.CrudRepository;
 
+import java.time.LocalDate;
 import java.util.Optional;
 
 public interface UserTimerRepository extends JpaRepository<UserTimer, Long> {
-    UserTimer findByUserIdAndTargetDate(Long userId, String targetDate);
+    UserTimer findByUserIdAndTargetDate(Long userId, LocalDate targetDate);
     UserTimer findByUserId(Long userId);
 }

jaksim/src/main/java/org/sopt/jaksim/task/service/TaskService.java

@@ -60,9 +60,8 @@ public void toggleTaskCompletionStatus(Long taskId) {
     }
 
     public List<Task> getTasksByTodoTask(List<TodoTask> todoTaskList) {
-        List<Long> taskIdList = todoTaskList.stream().map(TodoTask::getId).collect(Collectors.toList());
+        List<Long> taskIdList = todoTaskList.stream().map(TodoTask::getTaskId).collect(Collectors.toList());
         return taskRepository.findAllById(taskIdList);
-
     }
 
 }

jaksim/src/main/java/org/sopt/jaksim/task/service/TaskTimerService.java

@@ -6,9 +6,9 @@
 import org.sopt.jaksim.global.message.ErrorMessage;
 import org.sopt.jaksim.task.domain.Task;
 import org.sopt.jaksim.task.domain.TaskTimer;
-import org.sopt.jaksim.task.domain.TodoTask;
 import org.sopt.jaksim.task.dto.StopTimerRequest;
 import org.sopt.jaksim.task.repository.TaskTimerRepository;
+import org.sopt.jaksim.user.facade.UserFacade;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDate;
@@ -21,17 +21,19 @@
 @RequiredArgsConstructor
 public class TaskTimerService {
     private final TaskTimerRepository taskTimerRepository;
+    private final UserFacade userFacade;
 
     public void calculateTaskTimerOnStop(Long taskId, StopTimerRequest stopTimerRequest) {
-        TaskTimer taskTimer = taskTimerRepository.findById(taskId).orElseThrow(
+//        userFacade.getUserByPrincipal().getId()
+        TaskTimer taskTimer = taskTimerRepository.findByUserIdAndTargetDateAndTaskId(1L, stopTimerRequest.targetDate(), taskId).orElseThrow(
                 () -> new NotFoundException(ErrorMessage.NOT_FOUND)
         );
         taskTimer.setTargetTime(taskTimer.getTargetTime() + stopTimerRequest.elapsedTime());
         taskTimerRepository.save(taskTimer);
     }
 
-    public Map<Long, TaskTimer> getTaskTimerMapByTaskList(List<Task> taskList) {
+    public Map<Long, TaskTimer> getTaskTimerMapByTaskList(Long userId, LocalDate targetDate, List<Task> taskList) {
         List<Long> taskIdList = taskList.stream().map(Task::getId).collect(Collectors.toList());
-        return taskTimerRepository.findByTaskIdIn(taskIdList).stream().collect(Collectors.toMap(TaskTimer::getTaskId, task -> task));
+        return taskTimerRepository.findByUserIdAndTargetDateAndTaskIdIn(userId, targetDate, taskIdList).stream().collect(Collectors.toMap(TaskTimer::getTaskId, task -> task));
     }
 }

jaksim/src/main/java/org/sopt/jaksim/task/service/TodoService.java

@@ -2,6 +2,8 @@
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.sopt.jaksim.global.exception.NotFoundException;
+import org.sopt.jaksim.global.message.ErrorMessage;
 import org.sopt.jaksim.task.domain.Task;
 import org.sopt.jaksim.task.domain.TaskTimer;
 import org.sopt.jaksim.task.domain.Todo;
@@ -55,15 +57,21 @@ public boolean isExist(LocalDate targetDate) {
     public TodoCardResponse getTodoCard(LocalDate targetDate) {
         //        Long userId = userFacade.getUserByPrincipal().getId();
         Long userId = 1L;
+        // 유저의 오늘 할일을 찾기 ok
         Todo todo = todoRepository.findByUserIdAndTargetDate(userId, targetDate);
+        // 할일에 등록된 todoTask를 가져오기 ok
         List<TodoTask> todoTaskList = todoTaskService.getTodoTaskByTodoId(todo.getId());
-        Map<Long, TodoTask> todoTaskMap = todoTaskService.getTodoTaskByTodoId(todo.getId()).stream().collect(Collectors.toMap(TodoTask::getTaskId, task -> task));
-        int targetTime = userTimerService.getTotalTimeToday(String.valueOf(targetDate)).targetTime();
+        // 오늘 나의 작업시간 조회
+        int targetTime = userTimerService.getTotalTimeToday(targetDate).targetTime();
+        // 할일에 등록된 task들 가져오기
         List<Task> taskList = taskService.getTasksByTodoTask(todoTaskList);
-        Map<Long, TaskTimer> taskTimerMap = taskTimerService.getTaskTimerMapByTaskList(taskList);
+        Map<Long, TaskTimer> taskTimerMap = taskTimerService.getTaskTimerMapByTaskList(userId, targetDate, taskList);
         List<TaskInTodoCard> taskInTodoCardList = new ArrayList<>();
         for (Task task : taskList) {
-            taskInTodoCardList.add(TaskInTodoCard.of(task, taskTimerMap.get(task.getId())));
+            if (taskTimerMap.get(task.getId()) == null) {
+                throw new NotFoundException(ErrorMessage.NOT_FOUND);
+            }
+            else taskInTodoCardList.add(TaskInTodoCard.of(task, taskTimerMap.get(task.getId())));
         }
         return TodoCardResponse.of(targetTime, taskInTodoCardList);
     }

jaksim/src/main/java/org/sopt/jaksim/task/service/TodoTaskService.java

@@ -2,10 +2,13 @@
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.sopt.jaksim.task.domain.TaskTimer;
 import org.sopt.jaksim.task.domain.Todo;
 import org.sopt.jaksim.task.domain.TodoTask;
+import org.sopt.jaksim.task.repository.TaskTimerRepository;
 import org.sopt.jaksim.task.repository.TodoRepository;
 import org.sopt.jaksim.task.repository.TodoTaskRepository;
+import org.sopt.jaksim.user.facade.UserFacade;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
@@ -15,8 +18,9 @@
 @Service
 @RequiredArgsConstructor
 public class TodoTaskService {
+    private final TaskTimerRepository taskTimerRepository;
     private final TodoTaskRepository todoTaskRepository;
-
+    private final UserFacade userFacade;
     public void excute(Todo todo, List<Long> newTaskIdList) {
         // 새로운 태스크들을 TodoTask로 생성
         List<TodoTask> newTodoTask = new ArrayList<>();
@@ -46,6 +50,7 @@ public void syncTodoTasks(List<TodoTask> previous, List<TodoTask> current) {
         for (TodoTask newTask : current) {
             if (!oldTaskMap.containsKey(newTask.getTaskId())) {
                 oldTaskMap.put(newTask.getTaskId(), newTask);
+                taskTimerRepository.save(TaskTimer.create(userFacade.getUserByPrincipal().getId(), newTask.getTaskId()));
             }
         }
 

jaksim/src/main/java/org/sopt/jaksim/task/service/UserTimerService.java

@@ -11,6 +11,7 @@
 import org.sopt.jaksim.task.repository.UserTimerRepository;
 import org.sopt.jaksim.user.domain.User;
 import org.sopt.jaksim.user.facade.UserFacade;
+import org.springframework.data.relational.core.dialect.LockClause;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDate;
@@ -22,7 +23,7 @@ public class UserTimerService {
     private final UserTimerRepository userTimerRepository;
     private final UserFacade userFacade;
 
-    public TotalTimeTodayResponse getTotalTimeToday(String targetDate) {
+    public TotalTimeTodayResponse getTotalTimeToday(LocalDate targetDate) {
         if (!isToday(targetDate)) {
             throw new InvalidValueException(ErrorMessage.IS_NOT_TODAY);
         }
@@ -34,21 +35,23 @@ public TotalTimeTodayResponse getTotalTimeToday(String targetDate) {
         return TotalTimeTodayResponse.of(targetDate, userTimer.getTargetTime());
     }
 
-    public boolean isToday(String targetDate) {
-        if (!LocalDate.now().equals(DateUtil.stringToDate(targetDate))) {
+    public boolean isToday(LocalDate targetDate) {
+        if (!LocalDate.now().equals(targetDate)) {
             return false;
         }
         return true;
     }
 
-    public UserTimer getUserTimerByUserIdAndTargetDate(Long userId, String targetDate) {
+    public UserTimer getUserTimerByUserIdAndTargetDate(Long userId, LocalDate targetDate) {
         return userTimerRepository.findByUserIdAndTargetDate(userId, targetDate);
     }
 
     public void calculateUserTimerOnStop(StopTimerRequest stopTimerRequest) {
-        User user = userFacade.getUserByPrincipal();
-        UserTimer userTimer = userTimerRepository.findByUserId(user.getId());
+//        User user = userFacade.getUserByPrincipal();
+//        user.getId()
+        UserTimer userTimer = userTimerRepository.findByUserIdAndTargetDate(1L, stopTimerRequest.targetDate());
         userTimer.setTargetTime(userTimer.getTargetTime() + stopTimerRequest.elapsedTime());
+        userTimerRepository.save(userTimer);
     }
 
 }