diff --git a/src/main/java/com/kamco/cd/kamcoback/code/dto/CommonCodeDto.java b/src/main/java/com/kamco/cd/kamcoback/code/dto/CommonCodeDto.java index 244cd71a..b30cf2db 100644 --- a/src/main/java/com/kamco/cd/kamcoback/code/dto/CommonCodeDto.java +++ b/src/main/java/com/kamco/cd/kamcoback/code/dto/CommonCodeDto.java @@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.kamco.cd.kamcoback.common.utils.interfaces.JsonFormatDttm; import com.kamco.cd.kamcoback.postgres.entity.CommonCodeEntity; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.Valid; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.PositiveOrZero; @@ -53,6 +54,7 @@ public class CommonCodeDto { @NoArgsConstructor @AllArgsConstructor public static class OrderReq { + @Valid List orders; } diff --git a/src/main/java/com/kamco/cd/kamcoback/code/service/CommonCodeService.java b/src/main/java/com/kamco/cd/kamcoback/code/service/CommonCodeService.java index ed779e35..54261d81 100644 --- a/src/main/java/com/kamco/cd/kamcoback/code/service/CommonCodeService.java +++ b/src/main/java/com/kamco/cd/kamcoback/code/service/CommonCodeService.java @@ -1,6 +1,9 @@ package com.kamco.cd.kamcoback.code.service; -import com.kamco.cd.kamcoback.code.dto.CommonCodeDto; +import com.kamco.cd.kamcoback.code.dto.CommonCodeDto.AddReq; +import com.kamco.cd.kamcoback.code.dto.CommonCodeDto.Basic; +import com.kamco.cd.kamcoback.code.dto.CommonCodeDto.ModifyReq; +import com.kamco.cd.kamcoback.code.dto.CommonCodeDto.OrderReq; import com.kamco.cd.kamcoback.postgres.core.CommonCodeCoreService; import java.util.List; import lombok.RequiredArgsConstructor; @@ -17,18 +20,18 @@ public class CommonCodeService { /** * 공통코드 목록 조회 - * @return + * @return 모튼 코드 정보 */ - public List getFindAll() { + public List getFindAll() { return commonCodeCoreService.findAll(); } /** * 공통코드 단건 조회 * @param id - * @return + * @return 코드 아이디로 조회한 코드 정보 */ - public CommonCodeDto.Basic getOneById(Long id) { + public Basic getOneById(Long id) { return commonCodeCoreService.getOneById(id); } @@ -38,7 +41,7 @@ public class CommonCodeService { * @return 생성된 코드 id */ @Transactional - public Long save(CommonCodeDto.AddReq req) { + public Long save(AddReq req) { return commonCodeCoreService.save(req).getId(); } @@ -46,11 +49,10 @@ public class CommonCodeService { * 공통코드 수정 요청 * @param id 코드 아이디 * @param req 수정요청 정보 - * @return */ @Transactional - public Long update(Long id, CommonCodeDto.ModifyReq req) { - return commonCodeCoreService.update(id, req).getId(); + public void update(Long id, ModifyReq req) { + commonCodeCoreService.update(id, req); } /** @@ -64,19 +66,19 @@ public class CommonCodeService { /** * 공통코드 순서 변경 - * @param req + * @param req id, order 정보를 가진 List */ @Transactional - public void updateOrder(CommonCodeDto.OrderReq req) { + public void updateOrder(OrderReq req) { commonCodeCoreService.updateOrder(req); } /** * 코드기반 조회 - * @param code - * @return + * @param code 코드 + * @return 코드로 조회한 공통코드 정보 */ - public List findByCode(String code) { + public List findByCode(String code) { return commonCodeCoreService.findByCode(code); } } diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/core/CommonCodeCoreService.java b/src/main/java/com/kamco/cd/kamcoback/postgres/core/CommonCodeCoreService.java index 59705297..743ce101 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/core/CommonCodeCoreService.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/core/CommonCodeCoreService.java @@ -8,7 +8,6 @@ import com.kamco.cd.kamcoback.postgres.repository.CommonCodeRepository; import com.kamco.cd.kamcoback.zoo.dto.AnimalDto.SearchReq; import jakarta.persistence.EntityNotFoundException; import java.util.List; -import java.util.Optional; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.stereotype.Service;