From 338e9678a79f3ef01704defdc1535b87d14dfd8a Mon Sep 17 00:00:00 2001 From: "hyojun.choi" Date: Wed, 21 Aug 2024 10:43:46 +0900 Subject: [PATCH] =?UTF-8?q?api=20=EC=A3=BC=EC=86=8C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...troller.java => ModuleInfoController.java} | 18 +++++----- ...oduleMapper.java => ModuleInfoMapper.java} | 6 ++-- .../qcast/biz/module/ModuleInfoService.java | 18 ++++++++++ .../qcast/biz/module/ModuleService.java | 17 ---------- ...eResponse.java => ModuleInfoResponse.java} | 2 +- .../roofmaterial/RoofMaterialController.java | 24 -------------- .../RoofMaterialInfoController.java | 33 +++++++++++++++++++ .../roofmaterial/RoofMaterialInfoMapper.java | 10 ++++++ .../roofmaterial/RoofMaterialInfoService.java | 23 +++++++++++++ .../biz/roofmaterial/RoofMaterialMapper.java | 10 ------ .../biz/roofmaterial/RoofMaterialService.java | 16 --------- ...nse.java => RoofMaterialInfoResponse.java} | 2 +- .../qcast/biz/trestle/TrestleController.java | 22 ------------- .../qcast/biz/trestle/TrestleInfoMapper.java | 10 ++++++ ...leService.java => TrestleInfoService.java} | 8 ++--- .../qcast/biz/trestle/TrestleMapper.java | 11 ------- ...Response.java => TrestleInfoResponse.java} | 2 +- ...{moduleMapper.xml => moduleInfoMapper.xml} | 4 +-- ...lMapper.xml => roofMaterialInfoMapper.xml} | 4 +-- ...restleMapper.xml => TrestleInfoMapper.xml} | 4 +-- 20 files changed, 119 insertions(+), 125 deletions(-) rename src/main/java/com/interplug/qcast/biz/module/{ModuleController.java => ModuleInfoController.java} (51%) rename src/main/java/com/interplug/qcast/biz/module/{ModuleMapper.java => ModuleInfoMapper.java} (61%) create mode 100644 src/main/java/com/interplug/qcast/biz/module/ModuleInfoService.java delete mode 100644 src/main/java/com/interplug/qcast/biz/module/ModuleService.java rename src/main/java/com/interplug/qcast/biz/module/dto/{ModuleResponse.java => ModuleInfoResponse.java} (88%) delete mode 100644 src/main/java/com/interplug/qcast/biz/roofmaterial/RoofMaterialController.java create mode 100644 src/main/java/com/interplug/qcast/biz/roofmaterial/RoofMaterialInfoController.java create mode 100644 src/main/java/com/interplug/qcast/biz/roofmaterial/RoofMaterialInfoMapper.java create mode 100644 src/main/java/com/interplug/qcast/biz/roofmaterial/RoofMaterialInfoService.java delete mode 100644 src/main/java/com/interplug/qcast/biz/roofmaterial/RoofMaterialMapper.java delete mode 100644 src/main/java/com/interplug/qcast/biz/roofmaterial/RoofMaterialService.java rename src/main/java/com/interplug/qcast/biz/roofmaterial/dto/{RoofMaterialResponse.java => RoofMaterialInfoResponse.java} (86%) delete mode 100644 src/main/java/com/interplug/qcast/biz/trestle/TrestleController.java create mode 100644 src/main/java/com/interplug/qcast/biz/trestle/TrestleInfoMapper.java rename src/main/java/com/interplug/qcast/biz/trestle/{TrestleService.java => TrestleInfoService.java} (52%) delete mode 100644 src/main/java/com/interplug/qcast/biz/trestle/TrestleMapper.java rename src/main/java/com/interplug/qcast/biz/trestle/dto/{TrestleResponse.java => TrestleInfoResponse.java} (90%) rename src/main/resources/mappers/module/{moduleMapper.xml => moduleInfoMapper.xml} (86%) rename src/main/resources/mappers/roofmaterial/{roofMaterialMapper.xml => roofMaterialInfoMapper.xml} (84%) rename src/main/resources/mappers/trestle/{trestleMapper.xml => TrestleInfoMapper.xml} (88%) diff --git a/src/main/java/com/interplug/qcast/biz/module/ModuleController.java b/src/main/java/com/interplug/qcast/biz/module/ModuleInfoController.java similarity index 51% rename from src/main/java/com/interplug/qcast/biz/module/ModuleController.java rename to src/main/java/com/interplug/qcast/biz/module/ModuleInfoController.java index 7e9905e9..907628ac 100644 --- a/src/main/java/com/interplug/qcast/biz/module/ModuleController.java +++ b/src/main/java/com/interplug/qcast/biz/module/ModuleInfoController.java @@ -1,6 +1,6 @@ package com.interplug.qcast.biz.module; -import com.interplug.qcast.biz.module.dto.ModuleResponse; +import com.interplug.qcast.biz.module.dto.ModuleInfoResponse; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import java.util.List; @@ -8,17 +8,17 @@ import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; @RestController -@RequestMapping("/api/module") +@RequestMapping("/api/module/module-infos") @RequiredArgsConstructor -@Tag(name = "ModuleController", description = "모듈 관련 API") -public class ModuleController { - private final ModuleService moduleService; +@Tag(name = "ModuleInfoController", description = "모듈 정보 API") +public class ModuleInfoController { + private final ModuleInfoService moduleService; @Operation(description = "지붕재 ID와 가대 ID에 따라 설치 가능한 모듈 목록을 조회한다.") - @GetMapping("/v1.0/modules/{roofMaterialId}/{trestleId}") - public List getModulesByRoofMaterialIdAndTrestleId( - @PathVariable("roofMaterialId") Integer roofMaterialId, - @PathVariable("trestleId") Integer trestleId) { + @GetMapping + public List getModulesByRoofMaterialIdAndTrestleId( + @RequestParam("roofMaterialId") Integer roofMaterialId, + @RequestParam("trestleId") Integer trestleId) { return moduleService.getModulesByRoofMaterialIdAndTrestleId(roofMaterialId, trestleId); } } diff --git a/src/main/java/com/interplug/qcast/biz/module/ModuleMapper.java b/src/main/java/com/interplug/qcast/biz/module/ModuleInfoMapper.java similarity index 61% rename from src/main/java/com/interplug/qcast/biz/module/ModuleMapper.java rename to src/main/java/com/interplug/qcast/biz/module/ModuleInfoMapper.java index 8a68a0c3..394f01a8 100644 --- a/src/main/java/com/interplug/qcast/biz/module/ModuleMapper.java +++ b/src/main/java/com/interplug/qcast/biz/module/ModuleInfoMapper.java @@ -1,13 +1,13 @@ package com.interplug.qcast.biz.module; -import com.interplug.qcast.biz.module.dto.ModuleResponse; +import com.interplug.qcast.biz.module.dto.ModuleInfoResponse; import java.util.List; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @Mapper -public interface ModuleMapper { +public interface ModuleInfoMapper { - List getModulesByRoofMaterialIdAndTrestleId( + List getModulesByRoofMaterialIdAndTrestleId( @Param("roofMaterialId") Integer roofMaterialId, @Param("trestleId") Integer trestleId); } diff --git a/src/main/java/com/interplug/qcast/biz/module/ModuleInfoService.java b/src/main/java/com/interplug/qcast/biz/module/ModuleInfoService.java new file mode 100644 index 00000000..f0442d26 --- /dev/null +++ b/src/main/java/com/interplug/qcast/biz/module/ModuleInfoService.java @@ -0,0 +1,18 @@ +package com.interplug.qcast.biz.module; + +import com.interplug.qcast.biz.module.dto.ModuleInfoResponse; +import java.util.List; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class ModuleInfoService { + + private final ModuleInfoMapper moduleMapper; + + public List getModulesByRoofMaterialIdAndTrestleId( + Integer roofMaterialId, Integer trestleId) { + return moduleMapper.getModulesByRoofMaterialIdAndTrestleId(roofMaterialId, trestleId); + } +} diff --git a/src/main/java/com/interplug/qcast/biz/module/ModuleService.java b/src/main/java/com/interplug/qcast/biz/module/ModuleService.java deleted file mode 100644 index 5e8532f4..00000000 --- a/src/main/java/com/interplug/qcast/biz/module/ModuleService.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.interplug.qcast.biz.module; - -import com.interplug.qcast.biz.module.dto.ModuleResponse; -import java.util.List; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; - -@Service -@RequiredArgsConstructor -public class ModuleService { - - private final ModuleMapper moduleMapper; - - public List getModulesByRoofMaterialIdAndTrestleId(Integer roofMaterialId, Integer trestleId) { - return moduleMapper.getModulesByRoofMaterialIdAndTrestleId(roofMaterialId, trestleId); - } -} diff --git a/src/main/java/com/interplug/qcast/biz/module/dto/ModuleResponse.java b/src/main/java/com/interplug/qcast/biz/module/dto/ModuleInfoResponse.java similarity index 88% rename from src/main/java/com/interplug/qcast/biz/module/dto/ModuleResponse.java rename to src/main/java/com/interplug/qcast/biz/module/dto/ModuleInfoResponse.java index d25d9cf7..f2b265f2 100644 --- a/src/main/java/com/interplug/qcast/biz/module/dto/ModuleResponse.java +++ b/src/main/java/com/interplug/qcast/biz/module/dto/ModuleInfoResponse.java @@ -9,7 +9,7 @@ import lombok.Setter; @Setter @AllArgsConstructor @NoArgsConstructor -public class ModuleResponse { +public class ModuleInfoResponse { private Integer id; private String name; } diff --git a/src/main/java/com/interplug/qcast/biz/roofmaterial/RoofMaterialController.java b/src/main/java/com/interplug/qcast/biz/roofmaterial/RoofMaterialController.java deleted file mode 100644 index 3d2d40c9..00000000 --- a/src/main/java/com/interplug/qcast/biz/roofmaterial/RoofMaterialController.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.interplug.qcast.biz.roofmaterial; - -import com.interplug.qcast.biz.roofmaterial.dto.RoofMaterialResponse; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import java.util.List; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -@RestController -@RequiredArgsConstructor -@RequestMapping("/api/roof-material") -@Tag(name = "RoofMaterialController", description = "지붕재 관련 API") -public class RoofMaterialController { - private final RoofMaterialService roofService; - - @Operation(description = "지붕재 목록을 조회한다.") - @GetMapping("/v1.0/roof-materials") - public List getRoofMaterials() { - return roofService.getRoofMaterials(); - } -} diff --git a/src/main/java/com/interplug/qcast/biz/roofmaterial/RoofMaterialInfoController.java b/src/main/java/com/interplug/qcast/biz/roofmaterial/RoofMaterialInfoController.java new file mode 100644 index 00000000..cb3f7ce6 --- /dev/null +++ b/src/main/java/com/interplug/qcast/biz/roofmaterial/RoofMaterialInfoController.java @@ -0,0 +1,33 @@ +package com.interplug.qcast.biz.roofmaterial; + +import com.interplug.qcast.biz.roofmaterial.dto.RoofMaterialInfoResponse; +import com.interplug.qcast.biz.trestle.dto.TrestleInfoResponse; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import java.util.List; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/api/roof-material/roof-material-infos") +@Tag(name = "RoofMaterialInfoController", description = "지붕재 정보 API") +public class RoofMaterialInfoController { + private final RoofMaterialInfoService roofMaterialInfoService; + + @Operation(description = "지붕재 목록들을 조회한다.") + @GetMapping + public List getRoofMaterials() { + return roofMaterialInfoService.getRoofMaterials(); + } + + @Operation(description = "지붕재ID에 따라 설치 가능한 가대 목록을 가져온다.") + @GetMapping("/{roofMaterialId}/trestles") + public List getTrestlesByRoofMaterialId( + @PathVariable Integer roofMaterialId) { + return roofMaterialInfoService.getTrestlesByRoofMaterialId(roofMaterialId); + } +} diff --git a/src/main/java/com/interplug/qcast/biz/roofmaterial/RoofMaterialInfoMapper.java b/src/main/java/com/interplug/qcast/biz/roofmaterial/RoofMaterialInfoMapper.java new file mode 100644 index 00000000..8098ddcb --- /dev/null +++ b/src/main/java/com/interplug/qcast/biz/roofmaterial/RoofMaterialInfoMapper.java @@ -0,0 +1,10 @@ +package com.interplug.qcast.biz.roofmaterial; + +import com.interplug.qcast.biz.roofmaterial.dto.RoofMaterialInfoResponse; +import java.util.List; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface RoofMaterialInfoMapper { + List getRoofMaterials(); +} diff --git a/src/main/java/com/interplug/qcast/biz/roofmaterial/RoofMaterialInfoService.java b/src/main/java/com/interplug/qcast/biz/roofmaterial/RoofMaterialInfoService.java new file mode 100644 index 00000000..4b115446 --- /dev/null +++ b/src/main/java/com/interplug/qcast/biz/roofmaterial/RoofMaterialInfoService.java @@ -0,0 +1,23 @@ +package com.interplug.qcast.biz.roofmaterial; + +import com.interplug.qcast.biz.roofmaterial.dto.RoofMaterialInfoResponse; +import com.interplug.qcast.biz.trestle.TrestleInfoService; +import com.interplug.qcast.biz.trestle.dto.TrestleInfoResponse; +import java.util.List; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class RoofMaterialInfoService { + private final RoofMaterialInfoMapper roofMapper; + private final TrestleInfoService trestleInfoService; + + public List getRoofMaterials() { + return roofMapper.getRoofMaterials(); + } + + public List getTrestlesByRoofMaterialId(Integer roofMaterialId) { + return trestleInfoService.getTrestlesByRoofMaterialId(roofMaterialId); + } +} diff --git a/src/main/java/com/interplug/qcast/biz/roofmaterial/RoofMaterialMapper.java b/src/main/java/com/interplug/qcast/biz/roofmaterial/RoofMaterialMapper.java deleted file mode 100644 index 6291ed72..00000000 --- a/src/main/java/com/interplug/qcast/biz/roofmaterial/RoofMaterialMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.interplug.qcast.biz.roofmaterial; - -import com.interplug.qcast.biz.roofmaterial.dto.RoofMaterialResponse; -import java.util.List; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface RoofMaterialMapper { - List getRoofMaterials(); -} diff --git a/src/main/java/com/interplug/qcast/biz/roofmaterial/RoofMaterialService.java b/src/main/java/com/interplug/qcast/biz/roofmaterial/RoofMaterialService.java deleted file mode 100644 index 96976f27..00000000 --- a/src/main/java/com/interplug/qcast/biz/roofmaterial/RoofMaterialService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.interplug.qcast.biz.roofmaterial; - -import com.interplug.qcast.biz.roofmaterial.dto.RoofMaterialResponse; -import java.util.List; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; - -@Service -@RequiredArgsConstructor -public class RoofMaterialService { - private final RoofMaterialMapper roofMapper; - - public List getRoofMaterials() { - return roofMapper.getRoofMaterials(); - } -} diff --git a/src/main/java/com/interplug/qcast/biz/roofmaterial/dto/RoofMaterialResponse.java b/src/main/java/com/interplug/qcast/biz/roofmaterial/dto/RoofMaterialInfoResponse.java similarity index 86% rename from src/main/java/com/interplug/qcast/biz/roofmaterial/dto/RoofMaterialResponse.java rename to src/main/java/com/interplug/qcast/biz/roofmaterial/dto/RoofMaterialInfoResponse.java index b8785001..155367de 100644 --- a/src/main/java/com/interplug/qcast/biz/roofmaterial/dto/RoofMaterialResponse.java +++ b/src/main/java/com/interplug/qcast/biz/roofmaterial/dto/RoofMaterialInfoResponse.java @@ -9,7 +9,7 @@ import lombok.Setter; @Setter @NoArgsConstructor @AllArgsConstructor -public class RoofMaterialResponse { +public class RoofMaterialInfoResponse { private Integer id; private String name; diff --git a/src/main/java/com/interplug/qcast/biz/trestle/TrestleController.java b/src/main/java/com/interplug/qcast/biz/trestle/TrestleController.java deleted file mode 100644 index a52a1b9b..00000000 --- a/src/main/java/com/interplug/qcast/biz/trestle/TrestleController.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.interplug.qcast.biz.trestle; - -import com.interplug.qcast.biz.trestle.dto.TrestleResponse; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import java.util.List; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.*; - -@RestController -@RequiredArgsConstructor -@RequestMapping("/api/trestle") -@Tag(name = "TrestleController", description = "가대 관련 API") -public class TrestleController { - private final TrestleService trestleService; - - @Operation(description = "지붕재 ID에 따라 가대 목록을 조회한다.") - @GetMapping("/v1.0/trestles/{roofMaterialId}") - public List getTrestlesByRoofMaterialId(@PathVariable Integer roofMaterialId) { - return trestleService.getTrestlesByRoofMaterialId(roofMaterialId); - } -} diff --git a/src/main/java/com/interplug/qcast/biz/trestle/TrestleInfoMapper.java b/src/main/java/com/interplug/qcast/biz/trestle/TrestleInfoMapper.java new file mode 100644 index 00000000..c124d5b1 --- /dev/null +++ b/src/main/java/com/interplug/qcast/biz/trestle/TrestleInfoMapper.java @@ -0,0 +1,10 @@ +package com.interplug.qcast.biz.trestle; + +import com.interplug.qcast.biz.trestle.dto.TrestleInfoResponse; +import java.util.List; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface TrestleInfoMapper { + List getTrestlesByRoofMaterialId(Integer roofMaterialId); +} diff --git a/src/main/java/com/interplug/qcast/biz/trestle/TrestleService.java b/src/main/java/com/interplug/qcast/biz/trestle/TrestleInfoService.java similarity index 52% rename from src/main/java/com/interplug/qcast/biz/trestle/TrestleService.java rename to src/main/java/com/interplug/qcast/biz/trestle/TrestleInfoService.java index 9f9bcd35..03a69e9b 100644 --- a/src/main/java/com/interplug/qcast/biz/trestle/TrestleService.java +++ b/src/main/java/com/interplug/qcast/biz/trestle/TrestleInfoService.java @@ -1,17 +1,17 @@ package com.interplug.qcast.biz.trestle; -import com.interplug.qcast.biz.trestle.dto.TrestleResponse; +import com.interplug.qcast.biz.trestle.dto.TrestleInfoResponse; import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @Service @RequiredArgsConstructor -public class TrestleService { +public class TrestleInfoService { - private final TrestleMapper trestleMapper; + private final TrestleInfoMapper trestleMapper; - public List getTrestlesByRoofMaterialId(Integer roofMaterialId) { + public List getTrestlesByRoofMaterialId(Integer roofMaterialId) { return trestleMapper.getTrestlesByRoofMaterialId(roofMaterialId); } } diff --git a/src/main/java/com/interplug/qcast/biz/trestle/TrestleMapper.java b/src/main/java/com/interplug/qcast/biz/trestle/TrestleMapper.java deleted file mode 100644 index 8d67ece4..00000000 --- a/src/main/java/com/interplug/qcast/biz/trestle/TrestleMapper.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.interplug.qcast.biz.trestle; - -import com.interplug.qcast.biz.trestle.dto.TrestleResponse; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -@Mapper -public interface TrestleMapper { - List getTrestlesByRoofMaterialId(Integer roofMaterialId); -} diff --git a/src/main/java/com/interplug/qcast/biz/trestle/dto/TrestleResponse.java b/src/main/java/com/interplug/qcast/biz/trestle/dto/TrestleInfoResponse.java similarity index 90% rename from src/main/java/com/interplug/qcast/biz/trestle/dto/TrestleResponse.java rename to src/main/java/com/interplug/qcast/biz/trestle/dto/TrestleInfoResponse.java index 386b0dda..542d5035 100644 --- a/src/main/java/com/interplug/qcast/biz/trestle/dto/TrestleResponse.java +++ b/src/main/java/com/interplug/qcast/biz/trestle/dto/TrestleInfoResponse.java @@ -9,7 +9,7 @@ import lombok.Setter; @Setter @AllArgsConstructor @NoArgsConstructor -public class TrestleResponse { +public class TrestleInfoResponse { private Integer id; private String name; private Integer manufacturerId; diff --git a/src/main/resources/mappers/module/moduleMapper.xml b/src/main/resources/mappers/module/moduleInfoMapper.xml similarity index 86% rename from src/main/resources/mappers/module/moduleMapper.xml rename to src/main/resources/mappers/module/moduleInfoMapper.xml index e2eb3bfc..30d4aedd 100644 --- a/src/main/resources/mappers/module/moduleMapper.xml +++ b/src/main/resources/mappers/module/moduleInfoMapper.xml @@ -1,8 +1,8 @@ - - SELECT B.ID , B.NAME FROM TB_MAP_ROOF_MATERIAL_TRESTLE_MODULE A diff --git a/src/main/resources/mappers/roofmaterial/roofMaterialMapper.xml b/src/main/resources/mappers/roofmaterial/roofMaterialInfoMapper.xml similarity index 84% rename from src/main/resources/mappers/roofmaterial/roofMaterialMapper.xml rename to src/main/resources/mappers/roofmaterial/roofMaterialInfoMapper.xml index 7f9b866c..a710c623 100644 --- a/src/main/resources/mappers/roofmaterial/roofMaterialMapper.xml +++ b/src/main/resources/mappers/roofmaterial/roofMaterialInfoMapper.xml @@ -1,8 +1,8 @@ - - SELECT ID , NAME FROM TB_ROOF_MATERIAL diff --git a/src/main/resources/mappers/trestle/trestleMapper.xml b/src/main/resources/mappers/trestle/TrestleInfoMapper.xml similarity index 88% rename from src/main/resources/mappers/trestle/trestleMapper.xml rename to src/main/resources/mappers/trestle/TrestleInfoMapper.xml index ea1b370e..6b1ca1f3 100644 --- a/src/main/resources/mappers/trestle/trestleMapper.xml +++ b/src/main/resources/mappers/trestle/TrestleInfoMapper.xml @@ -1,9 +1,9 @@ - +