diff --git a/src/main/java/com/indayvidual/server/domain/todo/controller/ColorController.java b/src/main/java/com/indayvidual/server/domain/todo/controller/ColorController.java index 8956676..42f7ec3 100644 --- a/src/main/java/com/indayvidual/server/domain/todo/controller/ColorController.java +++ b/src/main/java/com/indayvidual/server/domain/todo/controller/ColorController.java @@ -1,7 +1,6 @@ package com.indayvidual.server.domain.todo.controller; -import com.indayvidual.server.domain.todo.dto.response.ColorResponseDTO; -import com.indayvidual.server.domain.todo.service.color.ColorQueryService; +import com.indayvidual.server.domain.todo.service.color.ColorService; import com.indayvidual.server.global.api.code.status.SuccessStatus; import com.indayvidual.server.global.api.response.ApiResponse; import io.swagger.v3.oas.annotations.Operation; @@ -19,13 +18,13 @@ @RequestMapping("/api/colors") public class ColorController { - private final ColorQueryService colorQueryService; + private final ColorService colorService; @Operation(summary = "색상 목록 조회", description = "색상 목록을 조회합니다.") @GetMapping("") - public ApiResponse> getColors() { + public ApiResponse> getColors() { return ApiResponse.onSuccess( - colorQueryService.findAll(), + colorService.findAll(), SuccessStatus.GET_COLORS_SUCCESS.getCode(), SuccessStatus.GET_COLORS_SUCCESS.getMessage()); } diff --git a/src/main/java/com/indayvidual/server/domain/todo/converter/ColorConverter.java b/src/main/java/com/indayvidual/server/domain/todo/converter/ColorConverter.java deleted file mode 100644 index f13ecc9..0000000 --- a/src/main/java/com/indayvidual/server/domain/todo/converter/ColorConverter.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.indayvidual.server.domain.todo.converter; - -import com.indayvidual.server.domain.todo.dto.response.ColorResponseDTO; -import com.indayvidual.server.domain.todo.entity.Color; -import org.springframework.stereotype.Component; - -import java.util.List; -import java.util.stream.Collectors; - -@Component -public class ColorConverter { - - public ColorResponseDTO toResponse(Color color) { - return ColorResponseDTO.builder() - .colorId(color.getId()) - .code(color.getColor_code()) - .build(); - } - - public List toResponseList(List colors) { - return colors.stream() - .map(this::toResponse) - .collect(Collectors.toList()); - } -} \ No newline at end of file diff --git a/src/main/java/com/indayvidual/server/domain/todo/dto/response/ColorResponseDTO.java b/src/main/java/com/indayvidual/server/domain/todo/dto/response/ColorResponseDTO.java deleted file mode 100644 index 2c19b5c..0000000 --- a/src/main/java/com/indayvidual/server/domain/todo/dto/response/ColorResponseDTO.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.indayvidual.server.domain.todo.dto.response; - -import lombok.Builder; -import lombok.Getter; - -@Builder -@Getter -public class ColorResponseDTO { - - private Long colorId; - private String code; -} diff --git a/src/main/java/com/indayvidual/server/domain/todo/entity/Color.java b/src/main/java/com/indayvidual/server/domain/todo/entity/Color.java deleted file mode 100644 index 2646751..0000000 --- a/src/main/java/com/indayvidual/server/domain/todo/entity/Color.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.indayvidual.server.domain.todo.entity; - -import com.indayvidual.server.common.BaseEntity; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import lombok.AccessLevel; -import jakarta.persistence.Table; -import lombok.Getter; -import lombok.NoArgsConstructor; - -@Entity -@Getter -@Table(name="color") -@NoArgsConstructor(access = AccessLevel.PROTECTED) -public class Color extends BaseEntity { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long id; - - @Column(length = 10, nullable = false) - private String color_code; -} diff --git a/src/main/java/com/indayvidual/server/domain/todo/repository/ColorRepository.java b/src/main/java/com/indayvidual/server/domain/todo/repository/ColorRepository.java deleted file mode 100644 index b45a17a..0000000 --- a/src/main/java/com/indayvidual/server/domain/todo/repository/ColorRepository.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.indayvidual.server.domain.todo.repository; - -import com.indayvidual.server.domain.todo.entity.Color; -import org.springframework.data.jpa.repository.JpaRepository; - -import java.util.List; - -public interface ColorRepository extends JpaRepository { - - List findAllByOrderByIdAsc(); -} diff --git a/src/main/java/com/indayvidual/server/domain/todo/service/color/ColorQueryService.java b/src/main/java/com/indayvidual/server/domain/todo/service/color/ColorQueryService.java deleted file mode 100644 index 137bf7e..0000000 --- a/src/main/java/com/indayvidual/server/domain/todo/service/color/ColorQueryService.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.indayvidual.server.domain.todo.service.color; - -import com.indayvidual.server.domain.todo.converter.ColorConverter; -import com.indayvidual.server.domain.todo.dto.response.ColorResponseDTO; -import com.indayvidual.server.domain.todo.entity.Color; -import com.indayvidual.server.domain.todo.repository.ColorRepository; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; - -import java.util.List; - -@Service -@RequiredArgsConstructor -public class ColorQueryService { - - private final ColorRepository colorRepository; - private final ColorConverter colorConverter; - - public List findAll() { - List colors = colorRepository.findAllByOrderByIdAsc(); - return colorConverter.toResponseList(colors); - } -} diff --git a/src/main/java/com/indayvidual/server/domain/todo/service/color/ColorService.java b/src/main/java/com/indayvidual/server/domain/todo/service/color/ColorService.java new file mode 100644 index 0000000..20d85cf --- /dev/null +++ b/src/main/java/com/indayvidual/server/domain/todo/service/color/ColorService.java @@ -0,0 +1,58 @@ +package com.indayvidual.server.domain.todo.service.color; + +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.Arrays; +import java.util.List; + +@Service +@RequiredArgsConstructor +public class ColorService { + + public List findAll() { + List colors = Arrays.asList( + "#CD7AFB", + "#C69ADF", + "#CDB4DB", + "#E5D3EF", + "#EFE5F9", + "#FB6F92", + "#FF8FAB", + "#FFB3C6", + "#FFC2D1", + "#FFE5EC", + "#F08080", + "#F4978E", + "#F8AD9D", + "#FBC4AB", + "#FFDAB9", + "#FFD400", + "#FFE14B", + "#F7E06E", + "#FFED93", + "#FFF3B6", + "#338A17", + "#11AF22", + "#20C933", + "#93E088", + "#D1F7C4", + "#02AAA4", + "#06A09B", + "#20D9D2", + "#72DDC3", + "#C2F5E9", + "#005FA7", + "#0077B6", + "#00B4D8", + "#5CCFE6", + "#CAF0F8", + "#4E5052", + "#808284", + "#999B9D", + "#D7D9DB", + "#F2F4F6" + ); + return colors; + } +}