[Refactor] return categoryId

jiyunio · May 28, 2024 · e419160 · e419160
1 parent 8ae69ec
commit e419160
Show file tree

Hide file tree

Showing 9 changed files with 44 additions and 57 deletions.
diff --git a/src/main/java/com/jiyunio/todolist/category/CategoryController.java b/src/main/java/com/jiyunio/todolist/category/CategoryController.java
@@ -29,7 +29,7 @@ public ResponseEntity<ResponseCategoryDTO> createCategory(@Parameter(description
 
     @GetMapping("/{memberId}")
     @Operation(summary = "카테고리 조회")
-    public List<CategoryDTO> getCategory(@Parameter(description = "member의 id") @PathVariable Long memberId) {
+    public List<ResponseCategoryDTO> getCategory(@Parameter(description = "member의 id") @PathVariable Long memberId) {
         return categoryService.getCategory(memberId);
     }
 

diff --git a/src/main/java/com/jiyunio/todolist/category/CategoryService.java b/src/main/java/com/jiyunio/todolist/category/CategoryService.java
@@ -37,12 +37,13 @@ public ResponseCategoryDTO createCategory(Long memberId, CategoryDTO categoryDTO
                 .build();
     }
 
-    public List<CategoryDTO> getCategory(Long memberId) {
+    public List<ResponseCategoryDTO> getCategory(Long memberId) {
         List<Category> categories = categoryRepository.findByMemberId(memberId);
-        List<CategoryDTO> getCategoryDTO = new ArrayList<>();
+        List<ResponseCategoryDTO> getCategoryDTO = new ArrayList<>();
 
         for (Category category : categories) {
-            getCategoryDTO.add(CategoryDTO.builder()
+            getCategoryDTO.add(ResponseCategoryDTO.builder()
+                    .categoryId(category.getId())
                     .content(category.getContent())
                     .color(category.getColor())
                     .build());

diff --git a/src/main/java/com/jiyunio/todolist/responseDTO/ResponseTodoDTO.java b/src/main/java/com/jiyunio/todolist/responseDTO/ResponseTodoDTO.java
@@ -16,15 +16,17 @@ public class ResponseTodoDTO {
     private String category;
     private LocalDate writeDate;
     private LocalDate setDate;
+    private String color;
 
     @Builder
     protected ResponseTodoDTO(Long todoId, String content, boolean checked,
-                              String category, LocalDate writeDate, LocalDate setDate){
+                              String category, LocalDate writeDate, LocalDate setDate, String color){
         this.todoId = todoId;
         this.content = content;
         this.checked = checked;
         this.category = category;
         this.writeDate = writeDate;
         this.setDate = setDate;
+        this.color = color;
     }
 }
diff --git a/src/main/java/com/jiyunio/todolist/todo/Todo.java b/src/main/java/com/jiyunio/todolist/todo/Todo.java
@@ -1,7 +1,7 @@
 package com.jiyunio.todolist.todo;
 
 import com.jiyunio.todolist.member.Member;
-import com.jiyunio.todolist.todo.dto.UpdateTodoDTO;
+import com.jiyunio.todolist.todo.dto.GetUpdateTodoDTO;
 import jakarta.persistence.*;
 import lombok.AccessLevel;
 import lombok.Builder;
@@ -20,7 +20,7 @@ public class Todo {
     private Long id;
 
     @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "member  Id")
+    @JoinColumn(name = "memberId")
     private Member member;
 
     @Lob // 길이 제한 X
@@ -44,11 +44,11 @@ protected Todo(Member member, String content, Boolean checked, String category,
         this.setDate = setDate;
     }
 
-    protected void updateTodo(UpdateTodoDTO updateTodoDto) {
-        this.content = updateTodoDto.getContent();
-        this.checked = updateTodoDto.getChecked();
-        this.writeDate = updateTodoDto.getWriteDate();
-        this.setDate = updateTodoDto.getSetDate();
-        this.category = updateTodoDto.getCategory();
+    protected void updateTodo(GetUpdateTodoDTO getUpdateTodoDto) {
+        this.content = getUpdateTodoDto.getContent();
+        this.checked = getUpdateTodoDto.getChecked();
+        this.writeDate = getUpdateTodoDto.getWriteDate();
+        this.setDate = getUpdateTodoDto.getSetDate();
+        this.category = getUpdateTodoDto.getCategory();
     }
-}
+}
diff --git a/src/main/java/com/jiyunio/todolist/todo/TodoController.java b/src/main/java/com/jiyunio/todolist/todo/TodoController.java
@@ -3,8 +3,7 @@
 import com.jiyunio.todolist.responseDTO.ResponseDTO;
 import com.jiyunio.todolist.responseDTO.ResponseTodoDTO;
 import com.jiyunio.todolist.todo.dto.CreateTodoDTO;
-import com.jiyunio.todolist.todo.dto.GetTodoDTO;
-import com.jiyunio.todolist.todo.dto.UpdateTodoDTO;
+import com.jiyunio.todolist.todo.dto.GetUpdateTodoDTO;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -31,13 +30,13 @@ public ResponseEntity<ResponseTodoDTO> createTodo(@Parameter(description = "memb
 
     @GetMapping("/{memberId}")
     @Operation(summary = "todo 조회")
-    public List<GetTodoDTO> getTodo(@Parameter(description = "member의 id") @PathVariable Long memberId) {
+    public List<GetUpdateTodoDTO> getTodo(@Parameter(description = "member의 id") @PathVariable Long memberId) {
         return todoService.getTodo(memberId);
     }
 
     @PutMapping("/{todoId}")
     @Operation(summary = "todo 수정")
-    public ResponseEntity<?> updateTodo(@Parameter(description = "todo의 id") @PathVariable Long todoId, @Valid @RequestBody UpdateTodoDTO updateTodo) {
+    public ResponseEntity<?> updateTodo(@Parameter(description = "todo의 id") @PathVariable Long todoId, @Valid @RequestBody GetUpdateTodoDTO updateTodo) {
         return ResponseEntity.ok(todoService.updateTodo(todoId, updateTodo));
     }
 

diff --git a/src/main/java/com/jiyunio/todolist/todo/TodoService.java b/src/main/java/com/jiyunio/todolist/todo/TodoService.java
@@ -6,8 +6,7 @@
 import com.jiyunio.todolist.member.MemberRepository;
 import com.jiyunio.todolist.responseDTO.ResponseTodoDTO;
 import com.jiyunio.todolist.todo.dto.CreateTodoDTO;
-import com.jiyunio.todolist.todo.dto.GetTodoDTO;
-import com.jiyunio.todolist.todo.dto.UpdateTodoDTO;
+import com.jiyunio.todolist.todo.dto.GetUpdateTodoDTO;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
@@ -47,12 +46,12 @@ public ResponseTodoDTO createTodo(Long memberId, CreateTodoDTO createTodo) {
                 .build();
     }
 
-    public List<GetTodoDTO> getTodo(Long memberId) {
+    public List<GetUpdateTodoDTO> getTodo(Long memberId) {
         List<Todo> todoList = todoRepository.findByMemberId(memberId);
-        List<GetTodoDTO> getTodoList = new ArrayList<>();
+        List<GetUpdateTodoDTO> getTodoList = new ArrayList<>();
 
         for (Todo todo : todoList) {
-            getTodoList.add(GetTodoDTO.builder()
+            getTodoList.add(GetUpdateTodoDTO.builder()
                     .content(todo.getContent())
                     .category(todo.getCategory())
                     .writeDate(todo.getWriteDate())
@@ -63,7 +62,7 @@ public List<GetTodoDTO> getTodo(Long memberId) {
         return getTodoList;
     }
 
-    public ResponseTodoDTO updateTodo(Long todoId, UpdateTodoDTO updateTodo) {
+    public ResponseTodoDTO updateTodo(Long todoId, GetUpdateTodoDTO updateTodo) {
         Todo todo = todoRepository.findById(todoId).get();
         todo.updateTodo(updateTodo);
         todoRepository.save(todo);

diff --git a/src/main/java/com/jiyunio/todolist/todo/dto/CreateTodoDTO.java b/src/main/java/com/jiyunio/todolist/todo/dto/CreateTodoDTO.java
@@ -23,4 +23,7 @@ public class CreateTodoDTO {
 
     @NotNull(message = "설정 일자를 선택해주세요.")
     private LocalDate setDate;
+
+    @NotBlank
+    private String color;
 }
diff --git a/src/main/java/com/jiyunio/todolist/todo/dto/GetTodoDTO.java b/src/main/java/com/jiyunio/todolist/todo/dto/GetTodoDTO.java
diff --git a/...unio/todolist/todo/dto/UpdateTodoDTO.java → ...o/todolist/todo/dto/GetUpdateTodoDTO.java b/...unio/todolist/todo/dto/UpdateTodoDTO.java → ...o/todolist/todo/dto/GetUpdateTodoDTO.java
@@ -3,6 +3,7 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
+import lombok.Builder;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -11,7 +12,7 @@
 @Getter
 @Setter
 @Schema(description = "todo 수정")
-public class UpdateTodoDTO {
+public class GetUpdateTodoDTO {
     @NotBlank(message = "todo를 작성해주세요.")
     private String content;
 
@@ -26,4 +27,18 @@ public class UpdateTodoDTO {
 
     @NotNull(message = "설정 일자를 선택해주세요.")
     private LocalDate setDate;
+
+    @NotBlank
+    private String color;
+
+    @Builder
+    protected GetUpdateTodoDTO(String content, Boolean checked, String category,
+                               LocalDate writeDate, LocalDate setDate, String color) {
+        this.content = content;
+        this.checked = checked;
+        this.category = category;
+        this.writeDate = writeDate;
+        this.setDate = setDate;
+        this.color = color;
+    }
 }