diff --git a/app/kac-app/build.gradle b/app/kac-app/build.gradle index b6a0ad0..6573ad8 100644 --- a/app/kac-app/build.gradle +++ b/app/kac-app/build.gradle @@ -14,7 +14,7 @@ dependencies { annotationProcessor "jakarta.annotation:jakarta.annotation-api" annotationProcessor "jakarta.persistence:jakarta.persistence-api" - + implementation project(":common-core") implementation project(":web-api-com") // TDOO: 제거... compileOnly project(":data-com") diff --git a/app/kac-app/src/main/java/kr/co/palnet/kac/app/core/exception/ServerExceptionHandler.java b/app/kac-app/src/main/java/kr/co/palnet/kac/app/core/exception/ServerExceptionHandler.java index fa55d32..68aee78 100644 --- a/app/kac-app/src/main/java/kr/co/palnet/kac/app/core/exception/ServerExceptionHandler.java +++ b/app/kac-app/src/main/java/kr/co/palnet/kac/app/core/exception/ServerExceptionHandler.java @@ -1,6 +1,9 @@ package kr.co.palnet.kac.app.core.exception; -import kr.co.palnet.kac.app.core.exception.model.BaseErrorModel; + +import kr.co.palnet.kac.core.exception.AppException; +import kr.co.palnet.kac.core.exception.ExceptionCode; +import kr.co.palnet.kac.core.exception.model.BaseErrorModel; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; diff --git a/common/core/build.gradle b/common/core/build.gradle index 6875d3b..2671505 100644 --- a/common/core/build.gradle +++ b/common/core/build.gradle @@ -1,6 +1,6 @@ dependencies { - + implementation "$boot:spring-boot-starter-web" } diff --git a/app/kac-app/src/main/java/kr/co/palnet/kac/app/core/exception/AppException.java b/common/core/src/main/java/kr/co/palnet/kac/core/exception/AppException.java similarity index 98% rename from app/kac-app/src/main/java/kr/co/palnet/kac/app/core/exception/AppException.java rename to common/core/src/main/java/kr/co/palnet/kac/core/exception/AppException.java index 0509f91..6a65f5c 100644 --- a/app/kac-app/src/main/java/kr/co/palnet/kac/app/core/exception/AppException.java +++ b/common/core/src/main/java/kr/co/palnet/kac/core/exception/AppException.java @@ -1,10 +1,9 @@ -package kr.co.palnet.kac.app.core.exception; - -import java.util.Locale; +package kr.co.palnet.kac.core.exception; +import lombok.extern.slf4j.Slf4j; import org.springframework.context.MessageSource; -import lombok.extern.slf4j.Slf4j; +import java.util.Locale; @Slf4j public class AppException extends RuntimeException { diff --git a/app/kac-app/src/main/java/kr/co/palnet/kac/app/core/exception/ExceptionCode.java b/common/core/src/main/java/kr/co/palnet/kac/core/exception/ExceptionCode.java similarity index 97% rename from app/kac-app/src/main/java/kr/co/palnet/kac/app/core/exception/ExceptionCode.java rename to common/core/src/main/java/kr/co/palnet/kac/core/exception/ExceptionCode.java index 2417bc2..1112755 100644 --- a/app/kac-app/src/main/java/kr/co/palnet/kac/app/core/exception/ExceptionCode.java +++ b/common/core/src/main/java/kr/co/palnet/kac/core/exception/ExceptionCode.java @@ -1,4 +1,4 @@ -package kr.co.palnet.kac.app.core.exception; +package kr.co.palnet.kac.core.exception; public enum ExceptionCode { diff --git a/app/kac-app/src/main/java/kr/co/palnet/kac/app/core/exception/Level.java b/common/core/src/main/java/kr/co/palnet/kac/core/exception/Level.java similarity index 85% rename from app/kac-app/src/main/java/kr/co/palnet/kac/app/core/exception/Level.java rename to common/core/src/main/java/kr/co/palnet/kac/core/exception/Level.java index cf3136c..e5ca16e 100644 --- a/app/kac-app/src/main/java/kr/co/palnet/kac/app/core/exception/Level.java +++ b/common/core/src/main/java/kr/co/palnet/kac/core/exception/Level.java @@ -1,4 +1,4 @@ -package kr.co.palnet.kac.app.core.exception; +package kr.co.palnet.kac.core.exception; public enum Level { INFO(0), diff --git a/app/kac-app/src/main/java/kr/co/palnet/kac/app/core/exception/Source.java b/common/core/src/main/java/kr/co/palnet/kac/core/exception/Source.java similarity index 50% rename from app/kac-app/src/main/java/kr/co/palnet/kac/app/core/exception/Source.java rename to common/core/src/main/java/kr/co/palnet/kac/core/exception/Source.java index a3be3c8..bc48c63 100644 --- a/app/kac-app/src/main/java/kr/co/palnet/kac/app/core/exception/Source.java +++ b/common/core/src/main/java/kr/co/palnet/kac/core/exception/Source.java @@ -1,4 +1,4 @@ -package kr.co.palnet.kac.app.core.exception; +package kr.co.palnet.kac.core.exception; public enum Source { SERVER, diff --git a/app/kac-app/src/main/java/kr/co/palnet/kac/app/core/exception/model/BaseErrorModel.java b/common/core/src/main/java/kr/co/palnet/kac/core/exception/model/BaseErrorModel.java similarity index 73% rename from app/kac-app/src/main/java/kr/co/palnet/kac/app/core/exception/model/BaseErrorModel.java rename to common/core/src/main/java/kr/co/palnet/kac/core/exception/model/BaseErrorModel.java index a901580..6d1f7f4 100644 --- a/app/kac-app/src/main/java/kr/co/palnet/kac/app/core/exception/model/BaseErrorModel.java +++ b/common/core/src/main/java/kr/co/palnet/kac/core/exception/model/BaseErrorModel.java @@ -1,4 +1,4 @@ -package kr.co.palnet.kac.app.core.exception.model; +package kr.co.palnet.kac.core.exception.model; import lombok.Data; 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 index 205d5a4..958bf66 100644 --- 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 @@ -22,6 +22,7 @@ public class DataComApplicationTestApp { "kr.co.palnet.kac.data.com.domain" }) public class Config { + } // @Configuration diff --git a/web/api-com/build.gradle b/web/api-com/build.gradle index 6d3c4dc..5d30555 100644 --- a/web/api-com/build.gradle +++ b/web/api-com/build.gradle @@ -3,8 +3,10 @@ dependencies { implementation("$boot:spring-boot-starter-web") implementation("org.springframework.data:spring-data-commons") + implementation project(path: ':common-core') - compileOnly 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' + compileOnly 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' implementation project(":data-com") + implementation project(":common-core") } diff --git a/web/api-com/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 index 20eff07..11b2411 100644 --- a/web/api-com/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 @@ -2,8 +2,11 @@ package kr.co.palnet.kac.api.v1.com.code.controller; import java.util.List; +import kr.co.palnet.kac.core.exception.AppException; +import kr.co.palnet.kac.core.exception.ExceptionCode; import kr.co.palnet.kac.data.com.domain.ComCdBas; import kr.co.palnet.kac.data.com.domain.QComCdBas; +import lombok.extern.slf4j.Slf4j; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; @@ -35,6 +38,7 @@ import lombok.RequiredArgsConstructor; @RequiredArgsConstructor @RequestMapping("/v1/com/code") @RestController +@Slf4j public class ComCodeController { private final ComCodeService comCodeService; @@ -44,6 +48,9 @@ public class ComCodeController { @GetMapping("/all") @Operation(summary = "전체 코드 조회", description = "전체 코드를 조회합니다.") public ResponseEntity> getAllGroup(SearchCodeAllRQ rq) { + log.warn("ㅇㅇ => {}", rq); + if(true) throw new AppException(ExceptionCode.DB_ERROR); + List allCode = comCodeService.getAllGroup(rq); return ResponseEntity.ok(allCode); } @@ -126,6 +133,9 @@ public class ComCodeController { public void deleteCode( @Parameter(name="groupCd", description = "그룹 코드", in = ParameterIn.QUERY, example = "NEW_GROUP001") @RequestParam("groupCd") String groupCd, @Parameter(name="cdId", description = "삭제할 코드 아이디", in = ParameterIn.QUERY, example = "NEW_CODE001") @RequestParam("cdId") String cdId) { + + + comCodeService.deleteCode(groupCd, cdId); }