From d3d70378d6df4a7676a4feb5e45578f4ca37ca42 Mon Sep 17 00:00:00 2001
From: jiyunio <jiyun3269@naver.com>
Date: Wed, 29 May 2024 18:55:58 +0900
Subject: [PATCH] =?UTF-8?q?[Feat]=20todo=EC=9D=98=20category=20=EC=A0=95?=
 =?UTF-8?q?=EB=B3=B4=20update=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../todolist/category/CategoryController.java  |  7 -------
 .../todolist/category/CategoryService.java     | 18 ++----------------
 .../java/com/jiyunio/todolist/todo/Todo.java   |  7 +------
 .../com/jiyunio/todolist/todo/TodoService.java |  4 ++--
 4 files changed, 5 insertions(+), 31 deletions(-)

diff --git a/src/main/java/com/jiyunio/todolist/category/CategoryController.java b/src/main/java/com/jiyunio/todolist/category/CategoryController.java
index 827b3ce..9400a72 100644
--- a/src/main/java/com/jiyunio/todolist/category/CategoryController.java
+++ b/src/main/java/com/jiyunio/todolist/category/CategoryController.java
@@ -33,13 +33,6 @@ public List<ResponseCategoryDTO> getCategories(@Parameter(description = "member
         return categoryService.getCategories(memberId);
     }
 
-    @GetMapping("/{memberId}/{categoryId}")
-    @Operation(summary = "카테고리 조회")
-    public ResponseCategoryDTO getCategory(@Parameter(description = "member의 id") @PathVariable Long memberId,
-                                           @Parameter(description = "category의 id") @PathVariable Long categoryId) {
-        return categoryService.getCategory(memberId, categoryId);
-    }
-
     @PutMapping("/{categoryId}")
     @Operation(summary = "카테고리 수정")
     public ResponseEntity<ResponseCategoryDTO> updateCategory(@Parameter(description = "카테고리의 id") @PathVariable Long categoryId, @RequestBody CategoryDTO categoryDTO) {
diff --git a/src/main/java/com/jiyunio/todolist/category/CategoryService.java b/src/main/java/com/jiyunio/todolist/category/CategoryService.java
index 4a62c66..eed0bae 100644
--- a/src/main/java/com/jiyunio/todolist/category/CategoryService.java
+++ b/src/main/java/com/jiyunio/todolist/category/CategoryService.java
@@ -7,6 +7,7 @@
 import com.jiyunio.todolist.responseDTO.ResponseCategoryDTO;
 import com.jiyunio.todolist.todo.TodoRepository;
 import com.jiyunio.todolist.todo.TodoService;
+import com.jiyunio.todolist.todo.dto.CreateTodoDTO;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
@@ -58,26 +59,11 @@ public List<ResponseCategoryDTO> getCategories(Long memberId) {
         return getCategoryDTO;
     }
 
-    public ResponseCategoryDTO getCategory(Long memberId, Long categoryId) {
-        List<Category> categories = categoryRepository.findByMemberId(memberId);
-        for (Category category : categories) {
-            if (category.getId().equals(categoryId)) {
-                return ResponseCategoryDTO.builder()
-                        .categoryId(categoryId)
-                        .content(category.getContent())
-                        .color(category.getColor())
-                        .build();
-            }
-        }
-        throw new CustomException(HttpStatus.NOT_FOUND, ErrorCode.NOT_EXIST_CATEGORY);
-    }
-
     public ResponseCategoryDTO updateCategory(Long categoryId, CategoryDTO categoryDTO) {
         Category category = categoryRepository.findById(categoryId).get();
         category.updateCategory(categoryDTO);
         categoryRepository.save(category);
-        todoService.updateCategory(ResponseCategoryDTO.builder() //member의 category 상태도 변경
-                .categoryId(categoryId)
+        todoService.updateCategory(categoryId, CategoryDTO.builder() //member의 category 상태도 변경
                 .content(category.getContent())
                 .color(category.getColor())
                 .build());
diff --git a/src/main/java/com/jiyunio/todolist/todo/Todo.java b/src/main/java/com/jiyunio/todolist/todo/Todo.java
index 79639ed..c817e33 100644
--- a/src/main/java/com/jiyunio/todolist/todo/Todo.java
+++ b/src/main/java/com/jiyunio/todolist/todo/Todo.java
@@ -1,10 +1,7 @@
 package com.jiyunio.todolist.todo;
 
-import com.jiyunio.todolist.category.Category;
 import com.jiyunio.todolist.category.CategoryDTO;
 import com.jiyunio.todolist.member.Member;
-import com.jiyunio.todolist.responseDTO.ResponseCategoryDTO;
-import com.jiyunio.todolist.todo.dto.CreateTodoDTO;
 import com.jiyunio.todolist.todo.dto.GetUpdateTodoDTO;
 import jakarta.persistence.*;
 import lombok.AccessLevel;
@@ -12,7 +9,6 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
-import java.awt.*;
 import java.time.LocalDate;
 
 @Getter
@@ -64,8 +60,7 @@ protected void updateTodo(GetUpdateTodoDTO getUpdateTodoDto) {
         this.setDate = getUpdateTodoDto.getSetDate();
     }
 
-    protected void updateCategory(ResponseCategoryDTO categoryDTO){
-        this.categoryId = categoryDTO.getCategoryId();
+    protected void updateCategory(CategoryDTO categoryDTO) {
         this.categoryContent = categoryDTO.getContent();
         this.categoryColor = categoryDTO.getColor();
     }
diff --git a/src/main/java/com/jiyunio/todolist/todo/TodoService.java b/src/main/java/com/jiyunio/todolist/todo/TodoService.java
index e013e7d..4c54926 100644
--- a/src/main/java/com/jiyunio/todolist/todo/TodoService.java
+++ b/src/main/java/com/jiyunio/todolist/todo/TodoService.java
@@ -98,8 +98,8 @@ public ResponseTodoDTO updateTodo(Long todoId, GetUpdateTodoDTO updateTodo) {
                 .build();
     }
 
-    public void updateCategory(ResponseCategoryDTO categoryDTO) {
-        List<Todo> todoList = todoRepository.findByCategoryId(categoryDTO.getCategoryId());
+    public void updateCategory(Long categoryId, CategoryDTO categoryDTO) {
+        List<Todo> todoList = todoRepository.findByCategoryId(categoryId);
         for (Todo todo : todoList) {
             todo.updateCategory(categoryDTO);
             todoRepository.save(todo);