From e986ad4848b332d42939f6b378f8a3c6f367e89c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?dhji=28=EC=A7=80=EB=8C=80=ED=95=9C=29?= Date: Thu, 11 Jan 2024 16:51:37 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20module=20=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/kac-app/build.gradle | 3 ++- .../palnet/kac/app/config/KacJpaConfig.java | 5 +++- data/com/build.gradle | 7 +++++ .../palnet/kac/data/com/domain}/ComCdBas.java | 4 +-- .../kac/data/com/domain}/ComCdGroupBas.java | 9 ++++--- .../kac/data/com/domain}/ComCdLangCtg.java | 3 +-- .../com/repository/ComCdBasRepository.java | 2 +- .../repository/ComCdGroupBasRepository.java | 2 +- .../repository/ComCdLangCtgRepository.java | 2 +- .../com/service/ComCodeDomainService.java | 6 ++--- .../data/com/DataComApplicationTestApp.java | 27 +++++++++++++++++++ .../com/service/ComCodeDomainServiceTest.java | 11 ++++---- data/user/build.gradle | 7 ----- web/api-com/build.gradle | 9 +++++++ .../code/controller/ComCodeController.java | 2 +- .../kac/api/v1/com/code/model/CodeDTO.java | 2 +- .../api/v1/com/code/model/CodeGroupDTO.java | 2 +- .../api/v1/com/code/model/CodeGroupRS.java | 2 +- .../api/v1/com/code/model/CodeLangDTO.java | 2 +- .../kac/api/v1/com/code/model/CodeRS.java | 2 +- .../v1/com/code/model/FormCodeGroupRQ.java | 2 +- .../api/v1/com/code/model/FormCodeLangRQ.java | 2 +- .../kac/api/v1/com/code/model/FormCodeRQ.java | 2 +- .../v1/com/code/model/SearchCodeAllRQ.java | 0 .../api/v1/com/code/model/SearchCodeRQ.java | 0 .../v1/com/code/service/ComCodeService.java | 7 ++--- web/api-user/build.gradle | 6 ----- 27 files changed, 82 insertions(+), 46 deletions(-) create mode 100644 data/com/build.gradle rename {app/kac-app/src/main/java/kr/co/palnet/kac/data/com/model => data/com/src/main/java/kr/co/palnet/kac/data/com/domain}/ComCdBas.java (96%) rename {app/kac-app/src/main/java/kr/co/palnet/kac/data/com/model => data/com/src/main/java/kr/co/palnet/kac/data/com/domain}/ComCdGroupBas.java (92%) rename {app/kac-app/src/main/java/kr/co/palnet/kac/data/com/model => data/com/src/main/java/kr/co/palnet/kac/data/com/domain}/ComCdLangCtg.java (98%) rename {app/kac-app => data/com}/src/main/java/kr/co/palnet/kac/data/com/repository/ComCdBasRepository.java (88%) rename {app/kac-app => data/com}/src/main/java/kr/co/palnet/kac/data/com/repository/ComCdGroupBasRepository.java (83%) rename {app/kac-app => data/com}/src/main/java/kr/co/palnet/kac/data/com/repository/ComCdLangCtgRepository.java (85%) rename {app/kac-app => data/com}/src/main/java/kr/co/palnet/kac/data/com/service/ComCodeDomainService.java (97%) create mode 100644 data/com/src/test/java/kr/co/palnet/kac/data/com/DataComApplicationTestApp.java rename {app/kac-app => data/com}/src/test/java/kr/co/palnet/kac/data/com/service/ComCodeDomainServiceTest.java (95%) delete mode 100644 data/user/build.gradle create mode 100644 web/api-com/build.gradle rename {app/kac-app => web/api-com}/src/main/java/kr/co/palnet/kac/api/v1/com/code/controller/ComCodeController.java (100%) rename {app/kac-app => web/api-com}/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/CodeDTO.java (97%) rename {app/kac-app => web/api-com}/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/CodeGroupDTO.java (96%) rename {app/kac-app => web/api-com}/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/CodeGroupRS.java (93%) rename {app/kac-app => web/api-com}/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/CodeLangDTO.java (96%) rename {app/kac-app => web/api-com}/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/CodeRS.java (94%) rename {app/kac-app => web/api-com}/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/FormCodeGroupRQ.java (92%) rename {app/kac-app => web/api-com}/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/FormCodeLangRQ.java (93%) rename {app/kac-app => web/api-com}/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/FormCodeRQ.java (94%) rename {app/kac-app => web/api-com}/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/SearchCodeAllRQ.java (100%) rename {app/kac-app => web/api-com}/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/SearchCodeRQ.java (100%) rename {app/kac-app => web/api-com}/src/main/java/kr/co/palnet/kac/api/v1/com/code/service/ComCodeService.java (96%) delete mode 100644 web/api-user/build.gradle diff --git a/app/kac-app/build.gradle b/app/kac-app/build.gradle index e53a513..0453cea 100644 --- a/app/kac-app/build.gradle +++ b/app/kac-app/build.gradle @@ -7,6 +7,7 @@ dependencies { implementation "org.bgee.log4jdbc-log4j2:log4jdbc-log4j2-jdbc4:1.16" implementation "$boot:spring-boot-starter-data-jpa" - compileOnly project(":data-user") + + implementation project(":web-api-com") } diff --git a/app/kac-app/src/main/java/kr/co/palnet/kac/app/config/KacJpaConfig.java b/app/kac-app/src/main/java/kr/co/palnet/kac/app/config/KacJpaConfig.java index cc37389..1cd5d09 100644 --- a/app/kac-app/src/main/java/kr/co/palnet/kac/app/config/KacJpaConfig.java +++ b/app/kac-app/src/main/java/kr/co/palnet/kac/app/config/KacJpaConfig.java @@ -51,7 +51,10 @@ public class KacJpaConfig { return builder.dataSource(kacDataSource()) .properties(prop) - .packages("kr.co.palnet.kac.data.**.model") + .packages( + "kr.co.palnet.kac.data.**.model", + "kr.co.palnet.kac.data.**.domain" + ) .persistenceUnit("kac") .build(); } diff --git a/data/com/build.gradle b/data/com/build.gradle new file mode 100644 index 0000000..74caa18 --- /dev/null +++ b/data/com/build.gradle @@ -0,0 +1,7 @@ + + +dependencies { + implementation("$boot:spring-boot-starter-data-jpa") + testRuntimeOnly("com.h2database:h2") +} + diff --git a/app/kac-app/src/main/java/kr/co/palnet/kac/data/com/model/ComCdBas.java b/data/com/src/main/java/kr/co/palnet/kac/data/com/domain/ComCdBas.java similarity index 96% rename from app/kac-app/src/main/java/kr/co/palnet/kac/data/com/model/ComCdBas.java rename to data/com/src/main/java/kr/co/palnet/kac/data/com/domain/ComCdBas.java index 32a36d4..4d686cc 100644 --- a/app/kac-app/src/main/java/kr/co/palnet/kac/data/com/model/ComCdBas.java +++ b/data/com/src/main/java/kr/co/palnet/kac/data/com/domain/ComCdBas.java @@ -1,4 +1,4 @@ -package kr.co.palnet.kac.data.com.model; +package kr.co.palnet.kac.data.com.domain; import com.fasterxml.jackson.annotation.JsonIgnore; import jakarta.persistence.*; @@ -86,7 +86,7 @@ public class ComCdBas { private ComCdGroupBas comCdGroupBas; @OneToMany(mappedBy = "comCdBas", fetch = FetchType.LAZY, cascade = CascadeType.REMOVE) - private List comCdLangCtgList = new ArrayList<>(); + private List comCdLangCtgList; public void update(ComCdBas comCdBas) { if (comCdBas == null) return; diff --git a/app/kac-app/src/main/java/kr/co/palnet/kac/data/com/model/ComCdGroupBas.java b/data/com/src/main/java/kr/co/palnet/kac/data/com/domain/ComCdGroupBas.java similarity index 92% rename from app/kac-app/src/main/java/kr/co/palnet/kac/data/com/model/ComCdGroupBas.java rename to data/com/src/main/java/kr/co/palnet/kac/data/com/domain/ComCdGroupBas.java index ee36a39..2024bd2 100644 --- a/app/kac-app/src/main/java/kr/co/palnet/kac/data/com/model/ComCdGroupBas.java +++ b/data/com/src/main/java/kr/co/palnet/kac/data/com/domain/ComCdGroupBas.java @@ -1,7 +1,10 @@ -package kr.co.palnet.kac.data.com.model; +package kr.co.palnet.kac.data.com.domain; import jakarta.persistence.*; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; import java.time.LocalDateTime; import java.util.ArrayList; @@ -51,7 +54,7 @@ public class ComCdGroupBas { private LocalDateTime updateDt; @OneToMany(mappedBy = "comCdGroupBas", fetch = FetchType.LAZY, cascade = CascadeType.REMOVE) - private List comCdBasList = new ArrayList<>(); + private List comCdBasList; public void update(ComCdGroupBas comCdGroupBas) { if(comCdGroupBas == null) return; diff --git a/app/kac-app/src/main/java/kr/co/palnet/kac/data/com/model/ComCdLangCtg.java b/data/com/src/main/java/kr/co/palnet/kac/data/com/domain/ComCdLangCtg.java similarity index 98% rename from app/kac-app/src/main/java/kr/co/palnet/kac/data/com/model/ComCdLangCtg.java rename to data/com/src/main/java/kr/co/palnet/kac/data/com/domain/ComCdLangCtg.java index 0ccd0a2..e3d9947 100644 --- a/app/kac-app/src/main/java/kr/co/palnet/kac/data/com/model/ComCdLangCtg.java +++ b/data/com/src/main/java/kr/co/palnet/kac/data/com/domain/ComCdLangCtg.java @@ -1,11 +1,10 @@ -package kr.co.palnet.kac.data.com.model; +package kr.co.palnet.kac.data.com.domain; import com.fasterxml.jackson.annotation.JsonIgnore; import jakarta.persistence.*; import lombok.*; import java.io.Serializable; -import java.time.Instant; import java.time.LocalDateTime; @Data diff --git a/app/kac-app/src/main/java/kr/co/palnet/kac/data/com/repository/ComCdBasRepository.java b/data/com/src/main/java/kr/co/palnet/kac/data/com/repository/ComCdBasRepository.java similarity index 88% rename from app/kac-app/src/main/java/kr/co/palnet/kac/data/com/repository/ComCdBasRepository.java rename to data/com/src/main/java/kr/co/palnet/kac/data/com/repository/ComCdBasRepository.java index 12eed30..14d2a0d 100644 --- a/app/kac-app/src/main/java/kr/co/palnet/kac/data/com/repository/ComCdBasRepository.java +++ b/data/com/src/main/java/kr/co/palnet/kac/data/com/repository/ComCdBasRepository.java @@ -1,6 +1,6 @@ package kr.co.palnet.kac.data.com.repository; -import kr.co.palnet.kac.data.com.model.ComCdBas; +import kr.co.palnet.kac.data.com.domain.ComCdBas; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; diff --git a/app/kac-app/src/main/java/kr/co/palnet/kac/data/com/repository/ComCdGroupBasRepository.java b/data/com/src/main/java/kr/co/palnet/kac/data/com/repository/ComCdGroupBasRepository.java similarity index 83% rename from app/kac-app/src/main/java/kr/co/palnet/kac/data/com/repository/ComCdGroupBasRepository.java rename to data/com/src/main/java/kr/co/palnet/kac/data/com/repository/ComCdGroupBasRepository.java index a18c50e..4141300 100644 --- a/app/kac-app/src/main/java/kr/co/palnet/kac/data/com/repository/ComCdGroupBasRepository.java +++ b/data/com/src/main/java/kr/co/palnet/kac/data/com/repository/ComCdGroupBasRepository.java @@ -1,6 +1,6 @@ package kr.co.palnet.kac.data.com.repository; -import kr.co.palnet.kac.data.com.model.ComCdGroupBas; +import kr.co.palnet.kac.data.com.domain.ComCdGroupBas; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; diff --git a/app/kac-app/src/main/java/kr/co/palnet/kac/data/com/repository/ComCdLangCtgRepository.java b/data/com/src/main/java/kr/co/palnet/kac/data/com/repository/ComCdLangCtgRepository.java similarity index 85% rename from app/kac-app/src/main/java/kr/co/palnet/kac/data/com/repository/ComCdLangCtgRepository.java rename to data/com/src/main/java/kr/co/palnet/kac/data/com/repository/ComCdLangCtgRepository.java index a62972f..e0db675 100644 --- a/app/kac-app/src/main/java/kr/co/palnet/kac/data/com/repository/ComCdLangCtgRepository.java +++ b/data/com/src/main/java/kr/co/palnet/kac/data/com/repository/ComCdLangCtgRepository.java @@ -1,6 +1,6 @@ package kr.co.palnet.kac.data.com.repository; -import kr.co.palnet.kac.data.com.model.ComCdLangCtg; +import kr.co.palnet.kac.data.com.domain.ComCdLangCtg; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; diff --git a/app/kac-app/src/main/java/kr/co/palnet/kac/data/com/service/ComCodeDomainService.java b/data/com/src/main/java/kr/co/palnet/kac/data/com/service/ComCodeDomainService.java similarity index 97% rename from app/kac-app/src/main/java/kr/co/palnet/kac/data/com/service/ComCodeDomainService.java rename to data/com/src/main/java/kr/co/palnet/kac/data/com/service/ComCodeDomainService.java index c863589..e1ff409 100644 --- a/app/kac-app/src/main/java/kr/co/palnet/kac/data/com/service/ComCodeDomainService.java +++ b/data/com/src/main/java/kr/co/palnet/kac/data/com/service/ComCodeDomainService.java @@ -1,8 +1,8 @@ package kr.co.palnet.kac.data.com.service; -import kr.co.palnet.kac.data.com.model.ComCdBas; -import kr.co.palnet.kac.data.com.model.ComCdGroupBas; -import kr.co.palnet.kac.data.com.model.ComCdLangCtg; +import kr.co.palnet.kac.data.com.domain.ComCdBas; +import kr.co.palnet.kac.data.com.domain.ComCdGroupBas; +import kr.co.palnet.kac.data.com.domain.ComCdLangCtg; import kr.co.palnet.kac.data.com.repository.ComCdBasRepository; import kr.co.palnet.kac.data.com.repository.ComCdGroupBasRepository; import kr.co.palnet.kac.data.com.repository.ComCdLangCtgRepository; diff --git a/data/com/src/test/java/kr/co/palnet/kac/data/com/DataComApplicationTestApp.java b/data/com/src/test/java/kr/co/palnet/kac/data/com/DataComApplicationTestApp.java new file mode 100644 index 0000000..ee9eeb1 --- /dev/null +++ b/data/com/src/test/java/kr/co/palnet/kac/data/com/DataComApplicationTestApp.java @@ -0,0 +1,27 @@ +package kr.co.palnet.kac.data.com; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.domain.EntityScan; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Configuration; +import org.springframework.data.jpa.repository.config.EnableJpaRepositories; + +@SpringBootApplication +public class DataComApplicationTestApp { + public static void main(String[] args) { + SpringApplication.run(DataComApplicationTestApp.class, args); + } + + @Configuration + @ComponentScan("kr.co.palnet.kac.data.com") + @EnableJpaRepositories(basePackages = { + "kr.co.palnet.kac.data.com.repository" + }) + @EntityScan(basePackages = { + "kr.co.palnet.kac.data.com.domain" + }) + public class Config { + } + +} diff --git a/app/kac-app/src/test/java/kr/co/palnet/kac/data/com/service/ComCodeDomainServiceTest.java b/data/com/src/test/java/kr/co/palnet/kac/data/com/service/ComCodeDomainServiceTest.java similarity index 95% rename from app/kac-app/src/test/java/kr/co/palnet/kac/data/com/service/ComCodeDomainServiceTest.java rename to data/com/src/test/java/kr/co/palnet/kac/data/com/service/ComCodeDomainServiceTest.java index d1042b7..0dac903 100644 --- a/app/kac-app/src/test/java/kr/co/palnet/kac/data/com/service/ComCodeDomainServiceTest.java +++ b/data/com/src/test/java/kr/co/palnet/kac/data/com/service/ComCodeDomainServiceTest.java @@ -1,9 +1,8 @@ package kr.co.palnet.kac.data.com.service; -import kr.co.palnet.kac.app.KacAppApplication; -import kr.co.palnet.kac.data.com.model.ComCdBas; -import kr.co.palnet.kac.data.com.model.ComCdGroupBas; -import kr.co.palnet.kac.data.com.model.ComCdLangCtg; +import kr.co.palnet.kac.data.com.domain.ComCdBas; +import kr.co.palnet.kac.data.com.domain.ComCdGroupBas; +import kr.co.palnet.kac.data.com.domain.ComCdLangCtg; import kr.co.palnet.kac.data.com.repository.ComCdBasRepository; import kr.co.palnet.kac.data.com.repository.ComCdGroupBasRepository; import kr.co.palnet.kac.data.com.repository.ComCdLangCtgRepository; @@ -12,12 +11,12 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; import java.time.LocalDateTime; @Slf4j -@SpringBootTest(classes = KacAppApplication.class) +@DataJpaTest class ComCodeDomainServiceTest { @Autowired diff --git a/data/user/build.gradle b/data/user/build.gradle deleted file mode 100644 index 535b2ce..0000000 --- a/data/user/build.gradle +++ /dev/null @@ -1,7 +0,0 @@ - - -dependencies { - implementation "$boot:spring-boot-starter-data-jpa" - testRuntimeOnly "com.h2database:h2" -} - diff --git a/web/api-com/build.gradle b/web/api-com/build.gradle new file mode 100644 index 0000000..449ecc7 --- /dev/null +++ b/web/api-com/build.gradle @@ -0,0 +1,9 @@ + + +dependencies { + implementation("$boot:spring-boot-starter-web") + implementation("org.springframework.data:spring-data-commons") + + implementation project(":data-com") +} + diff --git a/app/kac-app/src/main/java/kr/co/palnet/kac/api/v1/com/code/controller/ComCodeController.java b/web/api-com/src/main/java/kr/co/palnet/kac/api/v1/com/code/controller/ComCodeController.java similarity index 100% rename from app/kac-app/src/main/java/kr/co/palnet/kac/api/v1/com/code/controller/ComCodeController.java rename to web/api-com/src/main/java/kr/co/palnet/kac/api/v1/com/code/controller/ComCodeController.java index 8c80c62..49e5c8d 100644 --- a/app/kac-app/src/main/java/kr/co/palnet/kac/api/v1/com/code/controller/ComCodeController.java +++ b/web/api-com/src/main/java/kr/co/palnet/kac/api/v1/com/code/controller/ComCodeController.java @@ -1,7 +1,7 @@ package kr.co.palnet.kac.api.v1.com.code.controller; -import kr.co.palnet.kac.api.v1.com.code.service.ComCodeService; import kr.co.palnet.kac.api.v1.com.code.model.*; +import kr.co.palnet.kac.api.v1.com.code.service.ComCodeService; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; diff --git a/app/kac-app/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/CodeDTO.java b/web/api-com/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/CodeDTO.java similarity index 97% rename from app/kac-app/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/CodeDTO.java rename to web/api-com/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/CodeDTO.java index 9853f8e..781c1a6 100644 --- a/app/kac-app/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/CodeDTO.java +++ b/web/api-com/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/CodeDTO.java @@ -1,6 +1,6 @@ package kr.co.palnet.kac.api.v1.com.code.model; -import kr.co.palnet.kac.data.com.model.ComCdBas; +import kr.co.palnet.kac.data.com.domain.ComCdBas; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/app/kac-app/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/CodeGroupDTO.java b/web/api-com/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/CodeGroupDTO.java similarity index 96% rename from app/kac-app/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/CodeGroupDTO.java rename to web/api-com/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/CodeGroupDTO.java index a7f561b..c3ec437 100644 --- a/app/kac-app/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/CodeGroupDTO.java +++ b/web/api-com/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/CodeGroupDTO.java @@ -1,6 +1,6 @@ package kr.co.palnet.kac.api.v1.com.code.model; -import kr.co.palnet.kac.data.com.model.ComCdGroupBas; +import kr.co.palnet.kac.data.com.domain.ComCdGroupBas; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/app/kac-app/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/CodeGroupRS.java b/web/api-com/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/CodeGroupRS.java similarity index 93% rename from app/kac-app/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/CodeGroupRS.java rename to web/api-com/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/CodeGroupRS.java index 1ef4955..fd83b21 100644 --- a/app/kac-app/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/CodeGroupRS.java +++ b/web/api-com/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/CodeGroupRS.java @@ -1,6 +1,6 @@ package kr.co.palnet.kac.api.v1.com.code.model; -import kr.co.palnet.kac.data.com.model.ComCdGroupBas; +import kr.co.palnet.kac.data.com.domain.ComCdGroupBas; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/app/kac-app/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/CodeLangDTO.java b/web/api-com/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/CodeLangDTO.java similarity index 96% rename from app/kac-app/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/CodeLangDTO.java rename to web/api-com/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/CodeLangDTO.java index e676311..22bc72e 100644 --- a/app/kac-app/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/CodeLangDTO.java +++ b/web/api-com/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/CodeLangDTO.java @@ -1,6 +1,6 @@ package kr.co.palnet.kac.api.v1.com.code.model; -import kr.co.palnet.kac.data.com.model.ComCdLangCtg; +import kr.co.palnet.kac.data.com.domain.ComCdLangCtg; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/app/kac-app/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/CodeRS.java b/web/api-com/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/CodeRS.java similarity index 94% rename from app/kac-app/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/CodeRS.java rename to web/api-com/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/CodeRS.java index 3a08522..c84506f 100644 --- a/app/kac-app/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/CodeRS.java +++ b/web/api-com/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/CodeRS.java @@ -1,6 +1,6 @@ package kr.co.palnet.kac.api.v1.com.code.model; -import kr.co.palnet.kac.data.com.model.ComCdBas; +import kr.co.palnet.kac.data.com.domain.ComCdBas; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/app/kac-app/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/FormCodeGroupRQ.java b/web/api-com/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/FormCodeGroupRQ.java similarity index 92% rename from app/kac-app/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/FormCodeGroupRQ.java rename to web/api-com/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/FormCodeGroupRQ.java index 20f25d2..ae252ef 100644 --- a/app/kac-app/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/FormCodeGroupRQ.java +++ b/web/api-com/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/FormCodeGroupRQ.java @@ -1,6 +1,6 @@ package kr.co.palnet.kac.api.v1.com.code.model; -import kr.co.palnet.kac.data.com.model.ComCdGroupBas; +import kr.co.palnet.kac.data.com.domain.ComCdGroupBas; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/app/kac-app/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/FormCodeLangRQ.java b/web/api-com/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/FormCodeLangRQ.java similarity index 93% rename from app/kac-app/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/FormCodeLangRQ.java rename to web/api-com/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/FormCodeLangRQ.java index b0f92fb..5fb0aa9 100644 --- a/app/kac-app/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/FormCodeLangRQ.java +++ b/web/api-com/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/FormCodeLangRQ.java @@ -1,6 +1,6 @@ package kr.co.palnet.kac.api.v1.com.code.model; -import kr.co.palnet.kac.data.com.model.ComCdLangCtg; +import kr.co.palnet.kac.data.com.domain.ComCdLangCtg; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/app/kac-app/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/FormCodeRQ.java b/web/api-com/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/FormCodeRQ.java similarity index 94% rename from app/kac-app/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/FormCodeRQ.java rename to web/api-com/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/FormCodeRQ.java index 5cfebd8..0aa740f 100644 --- a/app/kac-app/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/FormCodeRQ.java +++ b/web/api-com/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/FormCodeRQ.java @@ -1,6 +1,6 @@ package kr.co.palnet.kac.api.v1.com.code.model; -import kr.co.palnet.kac.data.com.model.ComCdBas; +import kr.co.palnet.kac.data.com.domain.ComCdBas; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/app/kac-app/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/SearchCodeAllRQ.java b/web/api-com/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/SearchCodeAllRQ.java similarity index 100% rename from app/kac-app/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/SearchCodeAllRQ.java rename to web/api-com/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/SearchCodeAllRQ.java diff --git a/app/kac-app/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/SearchCodeRQ.java b/web/api-com/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/SearchCodeRQ.java similarity index 100% rename from app/kac-app/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/SearchCodeRQ.java rename to web/api-com/src/main/java/kr/co/palnet/kac/api/v1/com/code/model/SearchCodeRQ.java diff --git a/app/kac-app/src/main/java/kr/co/palnet/kac/api/v1/com/code/service/ComCodeService.java b/web/api-com/src/main/java/kr/co/palnet/kac/api/v1/com/code/service/ComCodeService.java similarity index 96% rename from app/kac-app/src/main/java/kr/co/palnet/kac/api/v1/com/code/service/ComCodeService.java rename to web/api-com/src/main/java/kr/co/palnet/kac/api/v1/com/code/service/ComCodeService.java index e3c811c..862d732 100644 --- a/app/kac-app/src/main/java/kr/co/palnet/kac/api/v1/com/code/service/ComCodeService.java +++ b/web/api-com/src/main/java/kr/co/palnet/kac/api/v1/com/code/service/ComCodeService.java @@ -1,9 +1,9 @@ package kr.co.palnet.kac.api.v1.com.code.service; import kr.co.palnet.kac.api.v1.com.code.model.*; -import kr.co.palnet.kac.data.com.model.ComCdBas; -import kr.co.palnet.kac.data.com.model.ComCdGroupBas; -import kr.co.palnet.kac.data.com.model.ComCdLangCtg; +import kr.co.palnet.kac.data.com.domain.ComCdBas; +import kr.co.palnet.kac.data.com.domain.ComCdGroupBas; +import kr.co.palnet.kac.data.com.domain.ComCdLangCtg; import kr.co.palnet.kac.data.com.service.ComCodeDomainService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -16,6 +16,7 @@ import java.util.List; @RequiredArgsConstructor @Service public class ComCodeService { + private final ComCodeDomainService comCodeDomainService; // 모든 코드 조회 diff --git a/web/api-user/build.gradle b/web/api-user/build.gradle deleted file mode 100644 index 6875d3b..0000000 --- a/web/api-user/build.gradle +++ /dev/null @@ -1,6 +0,0 @@ - - -dependencies { - -} -