refactor: rest doc gradle test option 적용

7 months ago · 67ab2bba16
5 changed files with 91 additions and 80 deletions
--- a/app/kac-app/build.gradle
+++ b/app/kac-app/build.gradle
@ -8,6 +8,7 @@ configurations {
    }
    asciidoctorExt
 }
+
 dependencies {
    implementation "$boot:spring-boot-starter-web"
    // security
@ -38,67 +39,69 @@ dependencies {
    implementation project(":common-util")
    implementation project(":common-security")
    implementation project(":web-api-com")
-    // TDOO: 제거...
-//    implementation project(":data-cns")
-//    implementation project(":data-com")
-//    implementation project(":data-ctr")
-//    implementation project(":data-flt")
-//    implementation project(":data-other")
-//    implementation project(":data-pty")
 }

 ext {
    snippetsDir = file('build/generated-snippets')
 }

-test {
-    useJUnitPlatform()
-    outputs.dir snippetsDir
-}
-asciidoctor {
-    if(project.hasProperty("excludeTest")){
+tasks {
+    def isTest = gradle.startParameter.excludedTaskNames.contains('test')
+
+    if (!isTest) {
+        asciidoctor {
+            println("isTest(asciidoctor) :: $isTest")
            dependsOn test
            inputs.dir snippetsDir
+            doFirst {
+                println("isTest(asciidoctor.doFirst) :: $isTest")
+                delete file('src/main/resources/static/docs')
+            }
+        }
    }
-}

-bootJar {
+    test {
+        outputs.dir snippetsDir
+    }
+
+
+    bootJar {
+        if (!isTest) {
            dependsOn asciidoctor
-    from ("${asciidoctor.outputDir}/html5") {
+            from("${asciidoctor.outputDir}/html5") {
                into 'static/docs'
            }
-}
-
-asciidoctor.doFirst {
-    if(project.hasProperty("excludeTest")) {
-        delete file('src/main/resources/static/docs')
        }
-}
+    }

-task copyDocument(type: Copy) {
+    task copyDocument(type: Copy) {
+        if (!isTest) {
            dependsOn asciidoctor
            from file("build/docs/asciidoc")
            into file("src/main/resources/static/docs")
-}
+        }
+    }

-build {
-    if(project.hasProperty("excludeTest")){
+    build {
+        if (!isTest) {
            dependsOn copyDocument
        }
-}
-
-// querydsl
-def querydslDir = layout.buildDirectory.dir("generated/querydsl").get().asFile
+    }

-sourceSets {
+    // querydsl
+    def querydslDir = layout.buildDirectory.dir("generated/querydsl").get().asFile
+    sourceSets {
        main.java.srcDir(querydslDir)
-}
+    }

-tasks.withType(JavaCompile) {
+    compileJava {
        options.getGeneratedSourceOutputDirectory().set(file(querydslDir))
-}
+    }

-clean {
+    clean {
        delete file(querydslDir)
+    }
 }

+
+
--- a/app/kac-app/src/main/resources/static/docs/index.html
+++ b/app/kac-app/src/main/resources/static/docs/index.html
@ -519,7 +519,7 @@ Content-Type: application/json;charset=UTF-8
 Content-Length: 143

 [ {
-  "groupCd" : "NEW_GROUP_1707128903",
+  "groupCd" : "NEW_GROUP_1707807494",
  "siteCd" : "KAC",
  "groupCdNm" : "신규그룹001",
  "rm" : "비고....",
@ -626,7 +626,7 @@ Content-Length: 143
 <h4 id="_http_request_info_2"><a class="link" href="#_http_request_info_2">[HTTP REQUEST INFO]</a></h4>
 <div class="listingblock">
 <div class="content">
-<pre class="highlightjs highlight nowrap"><code data-lang="http" class="language-http hljs">GET /v1/com/code/code?groupCd=NEW_GROUP1002&amp;langDivCd=ko_KR HTTP/1.1
+<pre class="highlightjs highlight nowrap"><code data-lang="http" class="language-http hljs">GET /v1/com/code/code?groupCd=NEW_GROUP_1707807494&amp;langDivCd=ko_KR HTTP/1.1
 Content-Type: application/json;charset=UTF-8
 Accept: application/json
 Host: localhost:8080</code></pre>
@ -665,9 +665,17 @@ Host: localhost:8080</code></pre>
 <div class="content">
 <pre class="highlightjs highlight nowrap"><code data-lang="http" class="language-http hljs">HTTP/1.1 200 OK
 Content-Type: application/json;charset=UTF-8
-Content-Length: 3
+Content-Length: 190

-[ ]</code></pre>
+[ {
+  "groupCd" : "NEW_GROUP_1707807494",
+  "cdId" : "NEW_CODE001",
+  "cdNm" : "신규코드001",
+  "upperCd" : null,
+  "sortOrdr" : 0,
+  "addInfoValue" : "추가!!",
+  "children" : null
+} ]</code></pre>
 </div>
 </div>
 <table class="tableblock frame-all grid-all stretch">
@ -755,7 +763,7 @@ Content-Type: application/json;charset=UTF-8
 Content-Length: 143

 [ {
-  "groupCd" : "NEW_GROUP_1707128903",
+  "groupCd" : "NEW_GROUP_1707807494",
  "siteCd" : "KAC",
  "groupCdNm" : "신규그룹001",
  "rm" : "비고....",
@ -827,7 +835,7 @@ Content-Length: 118
 Host: localhost:8080

 {
-  "groupCd" : "NEW_GROUP_1707128902",
+  "groupCd" : "NEW_GROUP_1707807495",
  "siteCd" : "KAC",
  "groupCdNm" : "신규그룹001",
  "rm" : "비고...."
@ -883,17 +891,17 @@ Host: localhost:8080
 <div class="content">
 <pre class="highlightjs highlight nowrap"><code data-lang="http" class="language-http hljs">HTTP/1.1 200 OK
 Content-Type: application/json;charset=UTF-8
-Content-Length: 276
+Content-Length: 275

 {
-  "groupCd" : "NEW_GROUP_1707128902",
+  "groupCd" : "NEW_GROUP_1707807495",
  "siteCd" : "KAC",
  "groupCdNm" : "신규그룹001",
  "rm" : "비고....",
  "createUserId" : "CREATE_USER",
-  "createDt" : "2024-02-05T19:28:22.548656",
+  "createDt" : "2024-02-13T15:58:15.040606",
  "updateUserId" : "CREATE_USER",
-  "updateDt" : "2024-02-05T19:28:22.548668"
+  "updateDt" : "2024-02-13T15:58:15.04061"
 }</code></pre>
 </div>
 </div>
@ -979,7 +987,7 @@ Content-Length: 132
 Host: localhost:8080

 {
-  "groupCd" : "NEW_GROUP_1707128902",
+  "groupCd" : "NEW_GROUP_1707807495",
  "cdId" : "NEW_CODE001",
  "sortOrdr" : 0,
  "addInfoValue" : "추가!!",
@ -1042,19 +1050,19 @@ Host: localhost:8080
 <div class="content">
 <pre class="highlightjs highlight nowrap"><code data-lang="http" class="language-http hljs">HTTP/1.1 200 OK
 Content-Type: application/json;charset=UTF-8
-Content-Length: 309
+Content-Length: 310

 {
-  "groupCd" : "NEW_GROUP_1707128902",
+  "groupCd" : "NEW_GROUP_1707807495",
  "cdId" : "NEW_CODE001",
  "upperCd" : null,
  "sortOrdr" : 0,
  "addInfoValue" : "추가!!",
  "useYn" : "Y",
  "createUserId" : "CREATE_USER",
-  "createDt" : "2024-02-05T19:28:22.666852",
+  "createDt" : "2024-02-13T15:58:15.017509",
  "updateUserId" : "CREATE_USER",
-  "updateDt" : "2024-02-05T19:28:22.66686"
+  "updateDt" : "2024-02-13T15:58:15.017514"
 }</code></pre>
 </div>
 </div>
@ -1152,7 +1160,7 @@ Content-Length: 144
 Host: localhost:8080

 {
-  "groupCd" : "NEW_GROUP_1707128902",
+  "groupCd" : "NEW_GROUP_1707807494",
  "cdId" : "NEW_CODE001",
  "langDivCd" : "ko_KR",
  "cdNm" : "신규코드001",
@ -1215,18 +1223,18 @@ Host: localhost:8080
 <div class="content">
 <pre class="highlightjs highlight nowrap"><code data-lang="http" class="language-http hljs">HTTP/1.1 200 OK
 Content-Type: application/json;charset=UTF-8
-Content-Length: 301
+Content-Length: 302

 {
-  "groupCd" : "NEW_GROUP_1707128902",
+  "groupCd" : "NEW_GROUP_1707807494",
  "cdId" : "NEW_CODE001",
  "langDivCd" : "ko_KR",
  "cdNm" : "신규코드001",
  "rm" : "비고....",
  "createUserId" : "CREATE_USER",
-  "createDt" : "2024-02-05T19:28:22.717553",
+  "createDt" : "2024-02-13T15:58:14.940372",
  "updateUserId" : "CREATE_USER",
-  "updateDt" : "2024-02-05T19:28:22.71756"
+  "updateDt" : "2024-02-13T15:58:14.940377"
 }</code></pre>
 </div>
 </div>
@ -1318,7 +1326,7 @@ Content-Length: 118
 Host: localhost:8080

 {
-  "groupCd" : "NEW_GROUP_1707128902",
+  "groupCd" : "NEW_GROUP_1707807494",
  "siteCd" : "KAC",
  "groupCdNm" : "신규그룹001",
  "rm" : "비고...."
@ -1377,14 +1385,14 @@ Content-Type: application/json;charset=UTF-8
 Content-Length: 276

 {
-  "groupCd" : "NEW_GROUP_1707128902",
+  "groupCd" : "NEW_GROUP_1707807494",
  "siteCd" : "KAC",
  "groupCdNm" : "신규그룹001",
  "rm" : "비고....",
  "createUserId" : "CREATE_USER",
-  "createDt" : "2024-02-05T19:28:22.763346",
+  "createDt" : "2024-02-13T15:58:14.957926",
  "updateUserId" : "UPDATE_USER",
-  "updateDt" : "2024-02-05T19:28:22.767214"
+  "updateDt" : "2024-02-13T15:58:14.976947"
 }</code></pre>
 </div>
 </div>
@ -1470,7 +1478,7 @@ Content-Length: 132
 Host: localhost:8080

 {
-  "groupCd" : "NEW_GROUP_1707128902",
+  "groupCd" : "NEW_GROUP_1707807494",
  "cdId" : "NEW_CODE001",
  "sortOrdr" : 0,
  "addInfoValue" : "수정!!",
@ -1536,16 +1544,16 @@ Content-Type: application/json;charset=UTF-8
 Content-Length: 310

 {
-  "groupCd" : "NEW_GROUP_1707128902",
+  "groupCd" : "NEW_GROUP_1707807494",
  "cdId" : "NEW_CODE001",
  "upperCd" : null,
  "sortOrdr" : 0,
  "addInfoValue" : "수정!!",
  "useYn" : "Y",
  "createUserId" : "CREATE_USER",
-  "createDt" : "2024-02-05T19:28:22.796567",
+  "createDt" : "2024-02-13T15:58:14.865542",
  "updateUserId" : "UPDATE_USER",
-  "updateDt" : "2024-02-05T19:28:22.814022"
+  "updateDt" : "2024-02-13T15:58:14.881073"
 }</code></pre>
 </div>
 </div>
@ -1643,7 +1651,7 @@ Content-Length: 143
 Host: localhost:8080

 {
-  "groupCd" : "NEW_GROUP_1707128902",
+  "groupCd" : "NEW_GROUP_1707807494",
  "cdId" : "NEW_CODE001",
  "langDivCd" : "ko_KR",
  "cdNm" : "신규코드001",
@ -1709,15 +1717,15 @@ Content-Type: application/json;charset=UTF-8
 Content-Length: 301

 {
-  "groupCd" : "NEW_GROUP_1707128902",
+  "groupCd" : "NEW_GROUP_1707807494",
  "cdId" : "NEW_CODE001",
  "langDivCd" : "ko_KR",
  "cdNm" : "신규코드001",
  "rm" : "수정...",
  "createUserId" : "CREATE_USER",
-  "createDt" : "2024-02-05T19:28:22.862515",
+  "createDt" : "2024-02-13T15:58:14.907037",
  "updateUserId" : "UPDATE_USER",
-  "updateDt" : "2024-02-05T19:28:22.866919"
+  "updateDt" : "2024-02-13T15:58:14.910228"
 }</code></pre>
 </div>
 </div>
@ -1949,7 +1957,7 @@ Host: localhost:8080</code></pre>
 <div id="footer">
 <div id="footer-text">
 Version 1.0.0<br>
-Last updated 2024-01-24 12:50:30 +0900
+Last updated 2024-02-07 14:39:05 +0900
 </div>
 </div>
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.15.6/styles/github.min.css">
--- a/data/cns/src/main/java/kr/co/palnet/kac/data/cns/model/CnsFaqBas.java
+++ b/data/cns/src/main/java/kr/co/palnet/kac/data/cns/model/CnsFaqBas.java
@ -47,7 +47,7 @@ public class CnsFaqBas {

    // 삭제여부
    @Column(name = "DEL_YN", columnDefinition = "char(1) default 'N'", nullable = false)
-    private String delYn = "N";
+    private String delYn;

    // 등록사용자ID
    @Column(name = "CREATE_USER_ID", length = 30, updatable = false, nullable = false)
--- a/data/cns/src/main/java/kr/co/palnet/kac/data/cns/model/CnsQnaBas.java
+++ b/data/cns/src/main/java/kr/co/palnet/kac/data/cns/model/CnsQnaBas.java
@ -77,7 +77,7 @@ public class CnsQnaBas {

    // 조회수
    @Column(name = "VIEW_CNT", columnDefinition = "int default 0", nullable = false)
-    private Integer viewCnt = 0;
+    private Integer viewCnt;

    // 등록사용자ID
    @Column(name = "CREATE_USER_ID", length = 30, updatable = false, nullable = false)
--- a/data/com/src/main/java/kr/co/palnet/kac/data/com/domain/ComIdntfBas.java
+++ b/data/com/src/main/java/kr/co/palnet/kac/data/com/domain/ComIdntfBas.java
@ -11,7 +11,7 @@ import java.time.Instant;
@NoArgsConstructor
@AllArgsConstructor
@Builder
-@ToString(exclude = {"arcrftBas"})
+@ToString(exclude = {"comArcrftBas"})
@IdClass(ComIdntfBas.ComIdntfBasId.class)
@Entity
@Table(name = "COM_IDNTF_BAS")