From b0b0384e0aace12bab9cd8b669b96d4230e3e986 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?dhji=28=EC=A7=80=EB=8C=80=ED=95=9C=29?= <dhji@palnet.co.kr>
Date: Fri, 15 Mar 2024 17:44:18 +0900
Subject: [PATCH] refactor: merge socket branch

---
 .gitignore                                    |  3 ++
 .../test/java/kr/co/palnet/kac/BaseTest.java  | 41 ++++++++-----------
 2 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8832db1..732652b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,6 +39,9 @@ out/
 .DS_Store
 **/.DS_Store
 
+### local
+/.java-version
+
 ### logs ###
 logs/
 logs/**
diff --git a/app/kac-app/src/test/java/kr/co/palnet/kac/BaseTest.java b/app/kac-app/src/test/java/kr/co/palnet/kac/BaseTest.java
index b96ab51..f5d582f 100644
--- a/app/kac-app/src/test/java/kr/co/palnet/kac/BaseTest.java
+++ b/app/kac-app/src/test/java/kr/co/palnet/kac/BaseTest.java
@@ -1,15 +1,12 @@
 package kr.co.palnet.kac;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import jakarta.servlet.ServletException;
-import kr.co.palnet.kac.api.v1.user.account.model.detail.SearchUserRS;
 import kr.co.palnet.kac.api.v1.user.account.model.register.FormRegisterRQ;
 import kr.co.palnet.kac.api.v1.user.account.service.UserAccountService;
 import kr.co.palnet.kac.app.KacAppApplication;
 import kr.co.palnet.kac.config.security.model.BaseUserDetails;
 import kr.co.palnet.kac.config.security.service.BaseUserDetailsService;
 import kr.co.palnet.kac.config.security.util.JwtUtil;
-import kr.co.palnet.kac.util.ObjectMapperUtils;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,7 +16,6 @@ import org.springframework.restdocs.RestDocumentationContextProvider;
 import org.springframework.restdocs.RestDocumentationExtension;
 import org.springframework.restdocs.mockmvc.MockMvcRestDocumentation;
 import org.springframework.security.config.BeanIds;
-import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.web.context.WebApplicationContext;
@@ -27,7 +23,6 @@ import org.springframework.web.filter.CharacterEncodingFilter;
 import org.springframework.web.filter.DelegatingFilterProxy;
 
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 
 import static org.springframework.restdocs.operation.preprocess.Preprocessors.modifyUris;
 import static org.springframework.restdocs.operation.preprocess.Preprocessors.prettyPrint;
@@ -70,26 +65,26 @@ public class BaseTest {
                 .build();
     }
 
-    protected String getUserToken(){
+    protected String getUserToken() {
 
         String username = "TEST_" + System.currentTimeMillis();
 
         String jsonRQ = """
-            {
-                "cstrmDivCd" : "MEMBER",
-                "cstrmStatusCd" : "ACTIVE",
-                "userId" : "%s",
-                "authId" : "USER",
-                "siteCode" : "DRONE",
-                "userPswd" : "%s",
-                "joinCrtfyCd" : "HP_CRTFD",
-                "memberName" : "이경도",
-                "brthdyDate" : "1999-09-07",
-                "email" : "lkd9125@naver.com",
-                "hpno" : "01083703435",
-                "clncd" : "+82"
-            }
-        """.formatted(username, this.CREATE_PASSWORD);
+                    {
+                        "cstrmDivCd" : "MEMBER",
+                        "cstrmStatusCd" : "ACTIVE",
+                        "userId" : "%s",
+                        "authId" : "USER",
+                        "siteCode" : "DRONE",
+                        "userPswd" : "%s",
+                        "joinCrtfyCd" : "HP_CRTFD",
+                        "memberName" : "이경도",
+                        "brthdyDate" : "1999-09-07",
+                        "email" : "lkd9125@naver.com",
+                        "hpno" : "01083703435",
+                        "clncd" : "+82"
+                    }
+                """.formatted(username, this.CREATE_PASSWORD);
 
         FormRegisterRQ rq = new FormRegisterRQ();
         rq.setCstrmDivCd("MEMBER");
@@ -105,9 +100,9 @@ public class BaseTest {
         rq.setHpno("01083703435");
         rq.setClncd("+82");
 
-        try{
+        try {
             userAccountService.createUser(rq);
-        } catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
         }