-
GET /v1/com/code/code?groupCd=NEW_GROUP001&langDivCd=ko_KR HTTP/1.1
+GET /v1/com/code/code?groupCd=NEW_GROUP1002&langDivCd=ko_KR HTTP/1.1
Content-Type: application/json;charset=UTF-8
Accept: application/json
Host: localhost:8080
@@ -746,9 +752,15 @@ Host: localhost:8080
HTTP/1.1 200 OK
Content-Type: application/json;charset=UTF-8
-Content-Length: 3
+Content-Length: 143
-[ ]
+[ {
+ "groupCd" : "NEW_GROUP_1707128903",
+ "siteCd" : "KAC",
+ "groupCdNm" : "신규그룹001",
+ "rm" : "비고....",
+ "codeList" : null
+} ]
@@ -811,11 +823,11 @@ Content-Length: 3
POST /v1/com/code/group HTTP/1.1
Content-Type: application/json;charset=UTF-8
Accept: application/json
-Content-Length: 110
+Content-Length: 118
Host: localhost:8080
{
- "groupCd" : "NEW_GROUP001",
+ "groupCd" : "NEW_GROUP_1707128902",
"siteCd" : "KAC",
"groupCdNm" : "신규그룹001",
"rm" : "비고...."
@@ -871,17 +883,17 @@ Host: localhost:8080
HTTP/1.1 200 OK
Content-Type: application/json;charset=UTF-8
-Content-Length: 267
+Content-Length: 276
{
- "groupCd" : "NEW_GROUP001",
+ "groupCd" : "NEW_GROUP_1707128902",
"siteCd" : "KAC",
"groupCdNm" : "신규그룹001",
"rm" : "비고....",
"createUserId" : "CREATE_USER",
- "createDt" : "2024-02-05T15:53:38.24206",
+ "createDt" : "2024-02-05T19:28:22.548656",
"updateUserId" : "CREATE_USER",
- "updateDt" : "2024-02-05T15:53:38.242072"
+ "updateDt" : "2024-02-05T19:28:22.548668"
}
@@ -963,11 +975,11 @@ Content-Length: 267
POST /v1/com/code/code HTTP/1.1
Content-Type: application/json;charset=UTF-8
Accept: application/json
-Content-Length: 124
+Content-Length: 132
Host: localhost:8080
{
- "groupCd" : "NEW_GROUP001",
+ "groupCd" : "NEW_GROUP_1707128902",
"cdId" : "NEW_CODE001",
"sortOrdr" : 0,
"addInfoValue" : "추가!!",
@@ -1030,19 +1042,19 @@ Host: localhost:8080
HTTP/1.1 200 OK
Content-Type: application/json;charset=UTF-8
-Content-Length: 302
+Content-Length: 309
{
- "groupCd" : "NEW_GROUP001",
+ "groupCd" : "NEW_GROUP_1707128902",
"cdId" : "NEW_CODE001",
"upperCd" : null,
"sortOrdr" : 0,
"addInfoValue" : "추가!!",
"useYn" : "Y",
"createUserId" : "CREATE_USER",
- "createDt" : "2024-02-05T15:53:38.341129",
+ "createDt" : "2024-02-05T19:28:22.666852",
"updateUserId" : "CREATE_USER",
- "updateDt" : "2024-02-05T15:53:38.341141"
+ "updateDt" : "2024-02-05T19:28:22.66686"
}
@@ -1136,11 +1148,11 @@ Content-Length: 302
POST /v1/com/code/lang HTTP/1.1
Content-Type: application/json;charset=UTF-8
Accept: application/json
-Content-Length: 136
+Content-Length: 144
Host: localhost:8080
{
- "groupCd" : "NEW_GROUP001",
+ "groupCd" : "NEW_GROUP_1707128902",
"cdId" : "NEW_CODE001",
"langDivCd" : "ko_KR",
"cdNm" : "신규코드001",
@@ -1203,18 +1215,18 @@ Host: localhost:8080
HTTP/1.1 200 OK
Content-Type: application/json;charset=UTF-8
-Content-Length: 294
+Content-Length: 301
{
- "groupCd" : "NEW_GROUP001",
+ "groupCd" : "NEW_GROUP_1707128902",
"cdId" : "NEW_CODE001",
"langDivCd" : "ko_KR",
"cdNm" : "신규코드001",
"rm" : "비고....",
"createUserId" : "CREATE_USER",
- "createDt" : "2024-02-05T15:53:38.391687",
+ "createDt" : "2024-02-05T19:28:22.717553",
"updateUserId" : "CREATE_USER",
- "updateDt" : "2024-02-05T15:53:38.391695"
+ "updateDt" : "2024-02-05T19:28:22.71756"
}
@@ -1302,11 +1314,11 @@ Content-Length: 294
PUT /v1/com/code/group HTTP/1.1
Content-Type: application/json;charset=UTF-8
Accept: application/json
-Content-Length: 110
+Content-Length: 118
Host: localhost:8080
{
- "groupCd" : "NEW_GROUP001",
+ "groupCd" : "NEW_GROUP_1707128902",
"siteCd" : "KAC",
"groupCdNm" : "신규그룹001",
"rm" : "비고...."
@@ -1362,17 +1374,17 @@ Host: localhost:8080
HTTP/1.1 200 OK
Content-Type: application/json;charset=UTF-8
-Content-Length: 268
+Content-Length: 276
{
- "groupCd" : "NEW_GROUP001",
+ "groupCd" : "NEW_GROUP_1707128902",
"siteCd" : "KAC",
"groupCdNm" : "신규그룹001",
"rm" : "비고....",
"createUserId" : "CREATE_USER",
- "createDt" : "2024-02-05T15:53:38.434127",
+ "createDt" : "2024-02-05T19:28:22.763346",
"updateUserId" : "UPDATE_USER",
- "updateDt" : "2024-02-05T15:53:38.438009"
+ "updateDt" : "2024-02-05T19:28:22.767214"
}
@@ -1454,11 +1466,11 @@ Content-Length: 268
PUT /v1/com/code/code HTTP/1.1
Content-Type: application/json;charset=UTF-8
Accept: application/json
-Content-Length: 124
+Content-Length: 132
Host: localhost:8080
{
- "groupCd" : "NEW_GROUP001",
+ "groupCd" : "NEW_GROUP_1707128902",
"cdId" : "NEW_CODE001",
"sortOrdr" : 0,
"addInfoValue" : "수정!!",
@@ -1521,19 +1533,19 @@ Host: localhost:8080
HTTP/1.1 200 OK
Content-Type: application/json;charset=UTF-8
-Content-Length: 302
+Content-Length: 310
{
- "groupCd" : "NEW_GROUP001",
+ "groupCd" : "NEW_GROUP_1707128902",
"cdId" : "NEW_CODE001",
"upperCd" : null,
"sortOrdr" : 0,
"addInfoValue" : "수정!!",
"useYn" : "Y",
"createUserId" : "CREATE_USER",
- "createDt" : "2024-02-05T15:53:38.481948",
+ "createDt" : "2024-02-05T19:28:22.796567",
"updateUserId" : "UPDATE_USER",
- "updateDt" : "2024-02-05T15:53:38.491689"
+ "updateDt" : "2024-02-05T19:28:22.814022"
}
@@ -1627,11 +1639,11 @@ Content-Length: 302
PUT /v1/com/code/lang HTTP/1.1
Content-Type: application/json;charset=UTF-8
Accept: application/json
-Content-Length: 135
+Content-Length: 143
Host: localhost:8080
{
- "groupCd" : "NEW_GROUP001",
+ "groupCd" : "NEW_GROUP_1707128902",
"cdId" : "NEW_CODE001",
"langDivCd" : "ko_KR",
"cdNm" : "신규코드001",
@@ -1694,18 +1706,18 @@ Host: localhost:8080
HTTP/1.1 200 OK
Content-Type: application/json;charset=UTF-8
-Content-Length: 291
+Content-Length: 301
{
- "groupCd" : "NEW_GROUP001",
+ "groupCd" : "NEW_GROUP_1707128902",
"cdId" : "NEW_CODE001",
"langDivCd" : "ko_KR",
"cdNm" : "신규코드001",
"rm" : "수정...",
"createUserId" : "CREATE_USER",
- "createDt" : "2024-02-05T15:53:38.540614",
+ "createDt" : "2024-02-05T19:28:22.862515",
"updateUserId" : "UPDATE_USER",
- "updateDt" : "2024-02-05T15:53:38.5467"
+ "updateDt" : "2024-02-05T19:28:22.866919"
}
diff --git a/app/kac-app/src/test/java/kr/co/palnet/kac/com/code/ComnCodeControllerTest.java b/app/kac-app/src/test/java/kr/co/palnet/kac/com/code/ComnCodeControllerTest.java
index 4098b32..b380373 100644
--- a/app/kac-app/src/test/java/kr/co/palnet/kac/com/code/ComnCodeControllerTest.java
+++ b/app/kac-app/src/test/java/kr/co/palnet/kac/com/code/ComnCodeControllerTest.java
@@ -9,10 +9,14 @@ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilder
import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import java.util.List;
+
import kr.co.palnet.kac.BaseTest;
+import kr.co.palnet.kac.api.v1.com.code.model.CodeRS;
import kr.co.palnet.kac.api.v1.com.code.model.FormCodeGroupRQ;
import kr.co.palnet.kac.api.v1.com.code.model.FormCodeLangRQ;
import kr.co.palnet.kac.api.v1.com.code.model.FormCodeRQ;
+import kr.co.palnet.kac.api.v1.com.code.model.SearchCodeRQ;
import kr.co.palnet.kac.api.v1.com.code.service.ComCodeService;
import lombok.RequiredArgsConstructor;
@@ -27,6 +31,7 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.http.MediaType;
import org.springframework.restdocs.RestDocumentationExtension;
import org.springframework.restdocs.payload.JsonFieldType;
+import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import kr.co.palnet.kac.app.KacAppApplication;
@@ -35,7 +40,7 @@ import kr.co.palnet.kac.app.KacAppApplication;
@ExtendWith({RestDocumentationExtension.class})
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
@RequiredArgsConstructor
-@Transactional
+@Transactional(propagation = Propagation.SUPPORTS)
public class ComnCodeControllerTest extends BaseTest {
@Autowired
@@ -101,6 +106,7 @@ public class ComnCodeControllerTest extends BaseTest {
@Order(12)
@Test
public void deleteCodeGroup() throws Exception {
+
String deleteGroupCd = "NEW_GROUP001";
this.mockMvc.perform(
@@ -124,26 +130,30 @@ public class ComnCodeControllerTest extends BaseTest {
@DisplayName("[6] 코드의 언어코드 수정")
@Order(6)
@Test
+ @Transactional
public void updateCodeLang() throws Exception{
- FormCodeGroupRQ groupRq = FormCodeGroupRQ.builder().groupCd("NEW_GROUP001").siteCd("KAC").groupCdNm("신규그룹001").rm("비고....").build();
+ String randomNm = "NEW_GROUP_" + System.currentTimeMillis();
+ randomNm = randomNm.substring(0, 20);
+
+ FormCodeGroupRQ groupRq = FormCodeGroupRQ.builder().groupCd(randomNm).siteCd("KAC").groupCdNm("신규그룹001").rm("비고....").build();
comCodeService.createCodeGroup(groupRq);
- FormCodeRQ codeRq = FormCodeRQ.builder().groupCd("NEW_GROUP001").cdId("NEW_CODE001").upperCd(null).sortOrdr(0).addInfoValue("추가!!").useYn("Y").build();
+ FormCodeRQ codeRq = FormCodeRQ.builder().groupCd(randomNm).cdId("NEW_CODE001").upperCd(null).sortOrdr(0).addInfoValue("추가!!").useYn("Y").build();
comCodeService.createCode(codeRq);
- FormCodeLangRQ langRq = FormCodeLangRQ.builder().groupCd("NEW_GROUP001").cdId("NEW_CODE001").langDivCd("ko_KR").cdNm("신규코드001").rm("비고....").build();
+ FormCodeLangRQ langRq = FormCodeLangRQ.builder().groupCd(randomNm).cdId("NEW_CODE001").langDivCd("ko_KR").cdNm("신규코드001").rm("비고....").build();
comCodeService.createCodeLang(langRq);
String jsonRQ = """
{
- "groupCd": "NEW_GROUP001",
+ "groupCd": "%s",
"cdId": "NEW_CODE001",
"langDivCd": "ko_KR",
"cdNm": "신규코드001",
"rm": "수정..."
}
- """;
+ """.formatted(randomNm);
this.mockMvc.perform(
put(this.BASE_URL + "/lang")
@@ -182,23 +192,30 @@ public class ComnCodeControllerTest extends BaseTest {
@DisplayName("[5] 코드 수정")
@Order(5)
@Test
+ @Transactional
public void updateCode() throws Exception{
- FormCodeGroupRQ groupRq = FormCodeGroupRQ.builder().groupCd("NEW_GROUP001").siteCd("KAC").groupCdNm("신규그룹001").rm("비고....").build();
+ String randomNm = "NEW_GROUP_" + System.currentTimeMillis();
+ randomNm = randomNm.substring(0, 20);
+
+ FormCodeGroupRQ groupRq = FormCodeGroupRQ.builder().groupCd(randomNm).siteCd("KAC").groupCdNm("신규그룹001").rm("비고....").build();
comCodeService.createCodeGroup(groupRq);
- FormCodeRQ codeRq = FormCodeRQ.builder().groupCd("NEW_GROUP001").cdId("NEW_CODE001").upperCd(null).sortOrdr(0).addInfoValue("추가!!").useYn("Y").build();
+ FormCodeRQ codeRq = FormCodeRQ.builder().groupCd(randomNm).cdId("NEW_CODE001").upperCd(null).sortOrdr(0).addInfoValue("추가!!").useYn("Y").build();
comCodeService.createCode(codeRq);
+ FormCodeLangRQ langRq = FormCodeLangRQ.builder().groupCd(randomNm).cdId("NEW_CODE001").langDivCd("ko_KR").cdNm("신규코드001").rm("비고....").build();
+ comCodeService.createCodeLang(langRq);
+
String jsonRQ = """
{
- "groupCd": "NEW_GROUP001",
+ "groupCd": "%s",
"cdId": "NEW_CODE001",
"sortOrdr": 0,
"addInfoValue": "수정!!",
"useYn": "Y"
}
- """;
+ """.formatted(randomNm);
this.mockMvc.perform(
put(this.BASE_URL + "/code")
@@ -238,19 +255,24 @@ public class ComnCodeControllerTest extends BaseTest {
@DisplayName("[4] 그룹 수정")
@Order(4)
@Test
+ @Transactional
public void updateCodeGroup() throws Exception{
- FormCodeGroupRQ rq = FormCodeGroupRQ.builder().groupCd("NEW_GROUP001").siteCd("KAC").groupCdNm("신규그룹001").rm("비고....").build();
- comCodeService.createCodeGroup(rq);
+ String randomNm = "NEW_GROUP_" + System.currentTimeMillis();
+ randomNm = randomNm.substring(0, 20);
+
+ FormCodeGroupRQ groupRq = FormCodeGroupRQ.builder().groupCd(randomNm).siteCd("KAC").groupCdNm("신규그룹001").rm("비고....").build();
+ comCodeService.createCodeGroup(groupRq);
+
String jsonRQ = """
{
- "groupCd": "NEW_GROUP001",
+ "groupCd": "%s",
"siteCd": "KAC",
"groupCdNm": "신규그룹001",
"rm": "비고...."
}
- """;
+ """.formatted(randomNm);
this.mockMvc.perform(
put(this.BASE_URL + "/group")
@@ -287,19 +309,29 @@ public class ComnCodeControllerTest extends BaseTest {
@DisplayName("[3] 코드의 언어코드 추가")
@Order(3)
@Test
+ @Transactional
public void createCodeLang() throws Exception{
String langDivCd = "ko_KR";
+ String randomNm = "NEW_GROUP_" + System.currentTimeMillis();
+ randomNm = randomNm.substring(0, 20);
+
+ FormCodeGroupRQ groupRq = FormCodeGroupRQ.builder().groupCd(randomNm).siteCd("KAC").groupCdNm("신규그룹001").rm("비고....").build();
+ comCodeService.createCodeGroup(groupRq);
+
+ FormCodeRQ codeRq = FormCodeRQ.builder().groupCd(randomNm).cdId("NEW_CODE001").upperCd(null).sortOrdr(0).addInfoValue("추가!!").useYn("Y").build();
+ comCodeService.createCode(codeRq);
+
String jsonRQ = """
{
- "groupCd": "NEW_GROUP001",
+ "groupCd": "%s",
"cdId": "NEW_CODE001",
"langDivCd": "%s",
"cdNm": "신규코드001",
"rm": "비고...."
}
- """.formatted(langDivCd);
+ """.formatted(randomNm,langDivCd);
this.mockMvc.perform(
post(this.BASE_URL + "/lang")
@@ -339,18 +371,25 @@ public class ComnCodeControllerTest extends BaseTest {
@DisplayName("[2] 코드 추가")
@Order(2)
@Test
+ @Transactional
public void createCode() throws Exception{
String codeNm = "NEW_CODE001";
+ String randomNm = "NEW_GROUP_" + System.currentTimeMillis();
+ randomNm = randomNm.substring(0, 20);
+
+ FormCodeGroupRQ groupRq = FormCodeGroupRQ.builder().groupCd(randomNm).siteCd("KAC").groupCdNm("신규그룹001").rm("비고....").build();
+ comCodeService.createCodeGroup(groupRq);
+
String jsonRQ = """
{
- "groupCd": "NEW_GROUP001",
+ "groupCd": "%s",
"cdId": "%s",
"sortOrdr": 0,
"addInfoValue": "추가!!",
"useYn": "Y"
}
- """.formatted(codeNm);
+ """.formatted(randomNm, codeNm);
this.mockMvc.perform(
post(this.BASE_URL + "/code")
@@ -390,11 +429,11 @@ public class ComnCodeControllerTest extends BaseTest {
@DisplayName("[1] 코드그룹 추가")
@Order(1)
@Test
+ @Transactional
public void createCodeGroup() throws Exception{
- // String randomNm = "NEW_GROUP_" + System.currentTimeMillis();
- String randomNm = "NEW_GROUP001";
- // randomNm = randomNm.substring(0, 20);
+ String randomNm = "NEW_GROUP_" + System.currentTimeMillis();
+ randomNm = randomNm.substring(0, 20);
String jsonRQ = """
{
@@ -440,18 +479,22 @@ public class ComnCodeControllerTest extends BaseTest {
@DisplayName("[7] 모든 코드 조회")
@Order(7)
@Test
+ @Transactional
public void getAllCodeByGroup() throws Exception{
- FormCodeGroupRQ groupRq = FormCodeGroupRQ.builder().groupCd("NEW_GROUP001").siteCd("KAC").groupCdNm("신규그룹001").rm("비고....").build();
+ String randomNm = "NEW_GROUP_" + System.currentTimeMillis();
+ randomNm = randomNm.substring(0, 20);
+
+ FormCodeGroupRQ groupRq = FormCodeGroupRQ.builder().groupCd(randomNm).siteCd("KAC").groupCdNm("신규그룹001").rm("비고....").build();
comCodeService.createCodeGroup(groupRq);
- FormCodeRQ codeRq = FormCodeRQ.builder().groupCd("NEW_GROUP001").cdId("NEW_CODE001").upperCd(null).sortOrdr(0).addInfoValue("추가!!").useYn("Y").build();
+ FormCodeRQ codeRq = FormCodeRQ.builder().groupCd(randomNm).cdId("NEW_CODE001").upperCd(null).sortOrdr(0).addInfoValue("추가!!").useYn("Y").build();
comCodeService.createCode(codeRq);
- FormCodeLangRQ langRq = FormCodeLangRQ.builder().groupCd("NEW_GROUP001").cdId("NEW_CODE001").langDivCd("ko_KR").cdNm("신규코드001").rm("비고....").build();
+ FormCodeLangRQ langRq = FormCodeLangRQ.builder().groupCd(randomNm).cdId("NEW_CODE001").langDivCd("ko_KR").cdNm("신규코드001").rm("비고....").build();
comCodeService.createCodeLang(langRq);
- String groupCd = "NEW_GROUP001";
+ String groupCd = "NEW_GROUP1002";
String langDivCd = "ko_KR";
this.mockMvc.perform(
@@ -487,15 +530,19 @@ public class ComnCodeControllerTest extends BaseTest {
@DisplayName("[8] 모든 그룹과 코드 조회")
@Order(8)
@Test
+ @Transactional
public void getAllGroupCode() throws Exception{
- FormCodeGroupRQ groupRq = FormCodeGroupRQ.builder().groupCd("NEW_GROUP001").siteCd("KAC").groupCdNm("신규그룹001").rm("비고....").build();
+ String randomNm = "NEW_GROUP_" + System.currentTimeMillis();
+ randomNm = randomNm.substring(0, 20);
+
+ FormCodeGroupRQ groupRq = FormCodeGroupRQ.builder().groupCd(randomNm).siteCd("KAC").groupCdNm("신규그룹001").rm("비고....").build();
comCodeService.createCodeGroup(groupRq);
- FormCodeRQ codeRq = FormCodeRQ.builder().groupCd("NEW_GROUP001").cdId("NEW_CODE001").upperCd(null).sortOrdr(0).addInfoValue("추가!!").useYn("Y").build();
+ FormCodeRQ codeRq = FormCodeRQ.builder().groupCd(randomNm).cdId("NEW_CODE001").upperCd(null).sortOrdr(0).addInfoValue("추가!!").useYn("Y").build();
comCodeService.createCode(codeRq);
- FormCodeLangRQ langRq = FormCodeLangRQ.builder().groupCd("NEW_GROUP001").cdId("NEW_CODE001").langDivCd("ko_KR").cdNm("신규코드001").rm("비고....").build();
+ FormCodeLangRQ langRq = FormCodeLangRQ.builder().groupCd(randomNm).cdId("NEW_CODE001").langDivCd("ko_KR").cdNm("신규코드001").rm("비고....").build();
comCodeService.createCodeLang(langRq);
this.mockMvc.perform(
@@ -523,15 +570,19 @@ public class ComnCodeControllerTest extends BaseTest {
@DisplayName("[9] 모든 그룹 조회")
@Order(9)
@Test
+ @Transactional
public void getAllGroup() throws Exception{
- FormCodeGroupRQ groupRq = FormCodeGroupRQ.builder().groupCd("NEW_GROUP001").siteCd("KAC").groupCdNm("신규그룹001").rm("비고....").build();
+ String randomNm = "NEW_GROUP_" + System.currentTimeMillis();
+ randomNm = randomNm.substring(0, 20);
+
+ FormCodeGroupRQ groupRq = FormCodeGroupRQ.builder().groupCd(randomNm).siteCd("KAC").groupCdNm("신규그룹001").rm("비고....").build();
comCodeService.createCodeGroup(groupRq);
- FormCodeRQ codeRq = FormCodeRQ.builder().groupCd("NEW_GROUP001").cdId("NEW_CODE001").upperCd(null).sortOrdr(0).addInfoValue("추가!!").useYn("Y").build();
+ FormCodeRQ codeRq = FormCodeRQ.builder().groupCd(randomNm).cdId("NEW_CODE001").upperCd(null).sortOrdr(0).addInfoValue("추가!!").useYn("Y").build();
comCodeService.createCode(codeRq);
- FormCodeLangRQ langRq = FormCodeLangRQ.builder().groupCd("NEW_GROUP001").cdId("NEW_CODE001").langDivCd("ko_KR").cdNm("신규코드001").rm("비고....").build();
+ FormCodeLangRQ langRq = FormCodeLangRQ.builder().groupCd(randomNm).cdId("NEW_CODE001").langDivCd("ko_KR").cdNm("신규코드001").rm("비고....").build();
comCodeService.createCodeLang(langRq);
String siteCd = "KAC";