Merge pull request #14 from Timetris-Trendithon/mainpage

🐛 Fix: LocalTime 필드 데이터 저장 안되던 문제 수정, 카테고리 업데이트 시 아이디 필요했던 현상 수정
Timetris-Trendithon · Feb 19, 2024 · 2e4862e · 2e4862e
2 parents 3db18e7 + ca09d76
commit 2e4862e
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 17 deletions.
diff --git a/src/main/java/com/trendithon/timetris/domain/mainpage/controller/CategoryController.java b/src/main/java/com/trendithon/timetris/domain/mainpage/controller/CategoryController.java
@@ -72,9 +72,9 @@ public ApiResponse<CategoryRequestDTO> createCategory(HttpServletRequest request
     }
 
     @PutMapping("/{categoryId}")
-    public ApiResponse<CategoryViewDTO> updateCategory(HttpServletRequest request,
+    public ApiResponse<CategoryRequestDTO> updateCategory(HttpServletRequest request,
                                       @PathVariable long categoryId,
-                                      @RequestBody CategoryViewDTO categoryViewDTO)
+                                      @RequestBody CategoryRequestDTO categoryRequestDTO)
     {
         String accessToken = tokenProvider.extractAccessToken(request).orElse(null);
 
@@ -90,8 +90,8 @@ public ApiResponse<CategoryViewDTO> updateCategory(HttpServletRequest request,
             throw new CustomException(ErrorStatus.USER_NOT_FOUND_ERROR);
         }
 
-        categoryService.updateCategory(userId, categoryId, categoryViewDTO);
-        return ApiResponse.success(SuccessStatus.OK, categoryViewDTO);
+        categoryService.updateCategory(userId, categoryId, categoryRequestDTO);
+        return ApiResponse.success(SuccessStatus.OK, categoryRequestDTO);
     }
 
     @DeleteMapping("/{categoryId}")

diff --git a/src/main/java/com/trendithon/timetris/domain/mainpage/domain/Plan.java b/src/main/java/com/trendithon/timetris/domain/mainpage/domain/Plan.java
@@ -5,6 +5,7 @@
 import com.trendithon.timetris.domain.mainpage.repository.PlanRepository;
 import jakarta.persistence.*;
 import lombok.*;
+import org.springframework.data.jpa.convert.threeten.Jsr310JpaConverters;
 
 import java.time.LocalTime;
 
@@ -19,7 +20,7 @@ public class Plan {
     private String title;
     private LocalTime startTime;
     private LocalTime endTime;
-    private boolean status = false;
+    private boolean status;
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "categoryId")
     private Category category;

diff --git a/src/main/java/com/trendithon/timetris/domain/mainpage/dto/DoRequestDTO.java b/src/main/java/com/trendithon/timetris/domain/mainpage/dto/DoRequestDTO.java
@@ -11,8 +11,8 @@
 public class DoRequestDTO {
 
     private String title;
-    private LocalTime startTime;
-    private LocalTime endTime;
+    private String startTime;
+    private String endTime;
     private long categoryId;
 
 }
diff --git a/src/main/java/com/trendithon/timetris/domain/mainpage/dto/PlanRequestDTO.java b/src/main/java/com/trendithon/timetris/domain/mainpage/dto/PlanRequestDTO.java
@@ -11,9 +11,8 @@
 public class PlanRequestDTO {
 
     private String title;
-    private LocalTime startTime;
-    private LocalTime endTime;
-    private boolean status;
+    private String startTime;
+    private String endTime;
     private long categoryId;
 
 }
diff --git a/src/main/java/com/trendithon/timetris/domain/mainpage/service/CategoryService.java b/src/main/java/com/trendithon/timetris/domain/mainpage/service/CategoryService.java
@@ -13,7 +13,7 @@ public interface CategoryService {
 
     List<CategoryViewDTO> readCategoryAll(long userId);
     Category createCategory(long userId, CategoryRequestDTO categoryRequestDTO);
-    void updateCategory(long userId, long categoryId, CategoryViewDTO categoryViewDTO);
+    void updateCategory(long userId, long categoryId, CategoryRequestDTO categoryRequestDTO);
     void deleteCategory(long userId, long categoryId);
 
 }
diff --git a/src/main/java/com/trendithon/timetris/domain/mainpage/service/CategoryServiceImpl.java b/src/main/java/com/trendithon/timetris/domain/mainpage/service/CategoryServiceImpl.java
@@ -41,13 +41,13 @@ public Category createCategory(long userId, CategoryRequestDTO categoryRequestDT
     }
 
     @Override
-    public void updateCategory(long userId, long categoryId, CategoryViewDTO categoryViewDTO) {
+    public void updateCategory(long userId, long categoryId, CategoryRequestDTO categoryRequestDTO) {
         Category category = categoryRepository.findById(categoryId)
                 .orElseThrow(() -> new CustomException(ErrorStatus.CATEGORY_NOT_FOUND_ERROR));
         if (category.getUser().getId() != userId){
             throw new CustomException(ErrorStatus.NO_PERMISSION_ERROR);
         }
-        category.updateCategory(categoryViewDTO.getName(), categoryViewDTO.getColorCode());
+        category.updateCategory(categoryRequestDTO.getName(), categoryRequestDTO.getColorCode());
         categoryRepository.save(category);
     }
 

diff --git a/src/main/java/com/trendithon/timetris/domain/mainpage/service/DoServiceImpl.java b/src/main/java/com/trendithon/timetris/domain/mainpage/service/DoServiceImpl.java
@@ -14,9 +14,11 @@
 import com.trendithon.timetris.global.exception.CustomException;
 import com.trendithon.timetris.global.exception.enums.ErrorStatus;
 import lombok.RequiredArgsConstructor;
+import org.springframework.data.jpa.convert.threeten.Jsr310JpaConverters;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDate;
+import java.time.LocalTime;
 import java.util.concurrent.CancellationException;
 
 @Service
@@ -35,7 +37,11 @@ public Do createDo(long userId, DoRequestDTO doRequestDTO) {
         UserDate userDate = userDateRepository.findByUser_IdAndDate_Id(userId, date.getId());
         Category category = categoryRepository.findById(doRequestDTO.getCategoryId())
                 .orElseThrow(() -> new CustomException(ErrorStatus.CATEGORY_NOT_FOUND_ERROR));
-        DoCreateDTO doCreateDTO = new DoCreateDTO(doRequestDTO.getTitle(), doRequestDTO.getStartTime(), doRequestDTO.getEndTime(), category);
+        String[] startTime = doRequestDTO.getStartTime().split(":");
+        LocalTime localStartTime = LocalTime.of(Integer.parseInt(startTime[0]), Integer.parseInt(startTime[1]));
+        String[] endTime = doRequestDTO.getEndTime().split(":");
+        LocalTime localEndTime = LocalTime.of(Integer.parseInt(endTime[0]), Integer.parseInt(endTime[1]));
+        DoCreateDTO doCreateDTO = new DoCreateDTO(doRequestDTO.getTitle(), localStartTime, localEndTime, category);
         Do done = new Do(doCreateDTO, userDate);
         return doRepository.save(done);
     }
@@ -49,7 +55,11 @@ public void updateDo(long userId, long doId, DoRequestDTO doRequestDTO) {
         }
         Category category = categoryRepository.findById(doRequestDTO.getCategoryId())
                 .orElseThrow(() -> new CustomException(ErrorStatus.CATEGORY_NOT_FOUND_ERROR));
-        done.updateDo(doRequestDTO.getTitle(), doRequestDTO.getStartTime(), doRequestDTO.getEndTime(), category);
+        String[] startTime = doRequestDTO.getStartTime().split(":");
+        LocalTime localStartTime = LocalTime.of(Integer.parseInt(startTime[0]), Integer.parseInt(startTime[1]));
+        String[] endTime = doRequestDTO.getEndTime().split(":");
+        LocalTime localEndTime = LocalTime.of(Integer.parseInt(endTime[0]), Integer.parseInt(endTime[1]));
+        done.updateDo(doRequestDTO.getTitle(), localStartTime, localEndTime, category);
         doRepository.save(done);
     }
 

diff --git a/src/main/java/com/trendithon/timetris/domain/mainpage/service/PlanServiceImpl.java b/src/main/java/com/trendithon/timetris/domain/mainpage/service/PlanServiceImpl.java
@@ -17,6 +17,7 @@
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDate;
+import java.time.LocalTime;
 
 @Service
 @RequiredArgsConstructor
@@ -34,7 +35,11 @@ public Plan createPlan(long userId, PlanRequestDTO planRequestDTO) {
         UserDate userDate = userDateRepository.findByUser_IdAndDate_Id(userId, date.getId());
         Category category = categoryRepository.findById(planRequestDTO.getCategoryId())
                 .orElseThrow(() -> new CustomException(ErrorStatus.CATEGORY_NOT_FOUND_ERROR));
-        PlanCreateDTO planCreateDTO = new PlanCreateDTO(planRequestDTO.getTitle(), planRequestDTO.getStartTime(), planRequestDTO.getEndTime(), planRequestDTO.isStatus(), category);
+        String[] startTime = planRequestDTO.getStartTime().split(":");
+        LocalTime localStartTime = LocalTime.of(Integer.parseInt(startTime[0]), Integer.parseInt(startTime[1]));
+        String[] endTime = planRequestDTO.getEndTime().split(":");
+        LocalTime localEndTime = LocalTime.of(Integer.parseInt(endTime[0]), Integer.parseInt(endTime[1]));
+        PlanCreateDTO planCreateDTO = new PlanCreateDTO(planRequestDTO.getTitle(), localStartTime, localEndTime, false, category);
         Plan plan = new Plan(planCreateDTO, userDate);
         return planRepository.save(plan);
     }
@@ -49,7 +54,11 @@ public void updatePlan(long userId, long planId, PlanRequestDTO planRequestDTO)
         if (plan.getUserDate().getUser().getId() != userId) {
             throw new CustomException(ErrorStatus.NO_PERMISSION_ERROR);
         }
-        plan.updatePlan(planRequestDTO.getTitle(), planRequestDTO.getStartTime(), planRequestDTO.getEndTime(), category);
+        String[] startTime = planRequestDTO.getStartTime().split(":");
+        LocalTime localStartTime = LocalTime.of(Integer.parseInt(startTime[0]), Integer.parseInt(startTime[1]));
+        String[] endTime = planRequestDTO.getEndTime().split(":");
+        LocalTime localEndTime = LocalTime.of(Integer.parseInt(endTime[0]), Integer.parseInt(endTime[1]));
+        plan.updatePlan(planRequestDTO.getTitle(), localStartTime, localEndTime, category);
         planRepository.save(plan);
     }
 
@@ -71,5 +80,6 @@ public void donePlan(long userId, long planId) {
             throw new CustomException(ErrorStatus.NO_PERMISSION_ERROR);
         }
         plan.donePlan();
+        planRepository.save(plan);
     }
 }