From 37cea376681fce55e5fb4b5d7abb1fa1c850fa91 Mon Sep 17 00:00:00 2001
From: jiyunio <jiyun3269@naver.com>
Date: Wed, 29 May 2024 14:00:39 +0900
Subject: [PATCH] =?UTF-8?q?[Refactor]=20JPA=20=EC=97=B0=EA=B4=80=EA=B4=80?=
 =?UTF-8?q?=EA=B3=84=20=EB=A7=A4=ED=95=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jiyunio/todolist/category/Category.java   | 10 +++++++++-
 .../com/jiyunio/todolist/category/CategoryService.java |  5 +++++
 src/main/java/com/jiyunio/todolist/todo/Todo.java      |  1 -
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/jiyunio/todolist/category/Category.java b/src/main/java/com/jiyunio/todolist/category/Category.java
index f33a6d8..194afe1 100644
--- a/src/main/java/com/jiyunio/todolist/category/Category.java
+++ b/src/main/java/com/jiyunio/todolist/category/Category.java
@@ -1,12 +1,15 @@
 package com.jiyunio.todolist.category;
 
 import com.jiyunio.todolist.member.Member;
+import com.jiyunio.todolist.todo.Todo;
 import jakarta.persistence.*;
 import lombok.AccessLevel;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
+import java.util.List;
+
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Entity
@@ -24,11 +27,16 @@ public class Category {
 
     private String color;
 
+    @OneToMany(fetch = FetchType.LAZY)
+    @JoinColumn(name = "todoId")
+    List<Todo> todo;
+
     @Builder
-    protected Category(Member member, String content, String color) {
+    protected Category(Member member, String content, String color, List<Todo> todo) {
         this.member = member;
         this.content = content;
         this.color = color;
+        this.todo = todo;
     }
 
     protected void updateCategory(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 96390ec..82952ed 100644
--- a/src/main/java/com/jiyunio/todolist/category/CategoryService.java
+++ b/src/main/java/com/jiyunio/todolist/category/CategoryService.java
@@ -5,15 +5,18 @@
 import com.jiyunio.todolist.member.Member;
 import com.jiyunio.todolist.member.MemberRepository;
 import com.jiyunio.todolist.responseDTO.ResponseCategoryDTO;
+import com.jiyunio.todolist.todo.Todo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.List;
 
 @Service
 @RequiredArgsConstructor
+@Transactional
 public class CategoryService {
     private final CategoryRepository categoryRepository;
     private final MemberRepository memberRepository;
@@ -56,6 +59,8 @@ public ResponseCategoryDTO updateCategory(Long categoryId, CategoryDTO categoryD
         category.updateCategory(categoryDTO);
         categoryRepository.save(category);
 
+        List<Todo> todoList = category.getTodo();
+
         return ResponseCategoryDTO.builder()
                 .categoryId(category.getId())
                 .content(category.getContent())
diff --git a/src/main/java/com/jiyunio/todolist/todo/Todo.java b/src/main/java/com/jiyunio/todolist/todo/Todo.java
index c8b3b2b..5d8c0b5 100644
--- a/src/main/java/com/jiyunio/todolist/todo/Todo.java
+++ b/src/main/java/com/jiyunio/todolist/todo/Todo.java
@@ -35,7 +35,6 @@ public class Todo {
 
     private LocalDate setDate;
 
-    private String color;
 
     @Builder
     protected Todo(Member member, String content, Boolean checked, String category,