[Refactor] todo 수정

jiyunio · May 29, 2024 · 1754098 · 1754098
1 parent 577fe5d
commit 1754098
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 13 deletions.
diff --git a/src/main/java/com/jiyunio/todolist/responseDTO/ResponseTodoDTO.java b/src/main/java/com/jiyunio/todolist/responseDTO/ResponseTodoDTO.java
@@ -16,16 +16,16 @@ public class ResponseTodoDTO {
     private boolean checked;
     private LocalDate writeDate;
     private LocalDate setDate;
-    private Long categoryId;
+    private ResponseCategoryDTO category;
 
     @Builder
     protected ResponseTodoDTO(Long todoId, String content, boolean checked,
-                               LocalDate writeDate, LocalDate setDate, Long categoryId){
+                               LocalDate writeDate, LocalDate setDate, ResponseCategoryDTO category){
         this.todoId = todoId;
         this.content = content;
         this.checked = checked;
         this.writeDate = writeDate;
         this.setDate = setDate;
-        this.categoryId = categoryId;
+        this.category = category;
     }
 }
diff --git a/src/main/java/com/jiyunio/todolist/todo/Todo.java b/src/main/java/com/jiyunio/todolist/todo/Todo.java
@@ -1,6 +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.todo.dto.GetUpdateTodoDTO;
 import jakarta.persistence.*;
@@ -34,25 +35,26 @@ public class Todo {
 
     private LocalDate setDate;
 
-    private Long categoryId;
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "categoryId")
+    private Category category;
 
 
     @Builder
     protected Todo(Member member, String content, Boolean checked,
-                   LocalDate writeDate, LocalDate setDate, Long categoryId) {
+                   LocalDate writeDate, LocalDate setDate, Category category) {
         this.member = member;
         this.content = content;
         this.checked = checked;
         this.writeDate = writeDate;
         this.setDate = setDate;
-        this.categoryId = categoryId;
+        this.category = category;
     }
 
     protected void updateTodo(GetUpdateTodoDTO getUpdateTodoDto) {
         this.content = getUpdateTodoDto.getContent();
         this.checked = getUpdateTodoDto.getChecked();
         this.writeDate = getUpdateTodoDto.getWriteDate();
         this.setDate = getUpdateTodoDto.getSetDate();
-        this.categoryId = getUpdateTodoDto.getCategoryId();
     }
 }
diff --git a/src/main/java/com/jiyunio/todolist/todo/TodoRepository.java b/src/main/java/com/jiyunio/todolist/todo/TodoRepository.java
@@ -9,5 +9,4 @@ public interface TodoRepository extends JpaRepository<Todo, Long> {
     List<Todo> findByMemberId(Long memberId);
 
     Optional<Todo> findById(Long todoId);
-
 }
diff --git a/src/main/java/com/jiyunio/todolist/todo/TodoService.java b/src/main/java/com/jiyunio/todolist/todo/TodoService.java
@@ -4,6 +4,7 @@
 import com.jiyunio.todolist.customError.ErrorCode;
 import com.jiyunio.todolist.member.Member;
 import com.jiyunio.todolist.member.MemberRepository;
+import com.jiyunio.todolist.responseDTO.ResponseCategoryDTO;
 import com.jiyunio.todolist.responseDTO.ResponseTodoDTO;
 import com.jiyunio.todolist.todo.dto.CreateTodoDTO;
 import com.jiyunio.todolist.todo.dto.GetUpdateTodoDTO;
@@ -32,7 +33,6 @@ public ResponseTodoDTO createTodo(Long memberId, CreateTodoDTO createTodo) {
                 .writeDate(createTodo.getWriteDate())
                 .setDate(createTodo.getSetDate())
                 .checked(false)
-                .categoryId(createTodo.getCategoryId())
                 .build();
 
         todoRepository.save(todo);
@@ -43,7 +43,11 @@ public ResponseTodoDTO createTodo(Long memberId, CreateTodoDTO createTodo) {
                 .checked(todo.getChecked())
                 .writeDate(todo.getWriteDate())
                 .setDate(todo.getSetDate())
-                .categoryId(todo.getCategoryId())
+                .category(ResponseCategoryDTO.builder()
+                        .categoryId(todo.getCategory().getId())
+                        .content(todo.getCategory().getContent())
+                        .color(todo.getCategory().getColor())
+                        .build())
                 .build();
     }
 
@@ -58,13 +62,17 @@ public List<ResponseTodoDTO> getTodo(Long memberId) {
                     .writeDate(todo.getWriteDate())
                     .setDate(todo.getSetDate())
                     .checked(todo.getChecked())
-                    .categoryId(todo.getCategoryId())
+                    .category(ResponseCategoryDTO.builder()
+                            .categoryId(todo.getCategory().getId())
+                            .content(todo.getCategory().getContent())
+                            .color(todo.getCategory().getColor())
+                            .build())
                     .build());
         }
         return getTodoList;
     }
 
-    public ResponseTodoDTO updateTodo(Long todoId,GetUpdateTodoDTO updateTodo) {
+    public ResponseTodoDTO updateTodo(Long todoId, GetUpdateTodoDTO updateTodo) {
         Todo todo = todoRepository.findById(todoId).get();
         todo.updateTodo(updateTodo);
         todoRepository.save(todo);
@@ -75,7 +83,6 @@ public ResponseTodoDTO updateTodo(Long todoId,GetUpdateTodoDTO updateTodo) {
                 .checked(todo.getChecked())
                 .writeDate(todo.getWriteDate())
                 .setDate(todo.getSetDate())
-                .categoryId(todo.getCategoryId())
                 .build();
     }
 

diff --git a/src/main/java/com/jiyunio/todolist/todo/dto/GetUpdateTodoDTO.java b/src/main/java/com/jiyunio/todolist/todo/dto/GetUpdateTodoDTO.java
@@ -1,6 +1,7 @@
 package com.jiyunio.todolist.todo.dto;
 
 import com.jiyunio.todolist.category.Category;
+import com.jiyunio.todolist.category.CategoryDTO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,5 +9,4 @@ public interface TodoRepository extends JpaRepository<Todo, Long> {
		List<Todo> findByMemberId(Long memberId);

		Optional<Todo> findById(Long todoId);

		}