[REFACTOR] /get/me API 테스트.

server/.gitignore

@@ -269,15 +269,14 @@ gradle-app.setting
 
 src/main/generated/**
 
-src/main/resources/application-prd.yml
-src/main/resources/application.properties
+application-prd.yml
+application-swagger.yml
+application.properties
 
 
 ## logs ##
 logs/
 
-### security information
-application.yml
 
 ### operation log
 replay_pid.*.log

server/build.gradle

@@ -69,8 +69,6 @@ dependencies {
 //	}
     runtimeOnly 'com.mysql:mysql-connector-j'
 
-    runtimeOnly 'com.mysql:mysql-connector-j'
-
     annotationProcessor 'org.projectlombok:lombok'
 
     // spring boot 3.0 query dsl setting.

server/scripts/deploy-swagger.sh

@@ -0,0 +1,60 @@
+#!/bin/bash
+
+# prd
+REPOSITORY=/home/bside/311TEN003
+
+# local
+#REPOSITORY=/Users/dongseoklee/github/311TEN003
+
+# common
+PROJECT_LOCATION_FOLDER_NAME=server
+PROJECT_NAME=bside_311
+
+cd $REPOSITORY/$PROJECT_LOCATION_FOLDER_NAME/
+
+echo "> Git reset --hard"
+git reset --hard
+
+echo "> Git Pull"
+
+git pull
+
+echo "Release Version Updated"
+#grep "^Release" ./releasenote.txt | tail -1 > ./src/main/frontend/public/latestReleaseVer.txt
+
+
+echo "> gradlew, deploy.sh 권한 변경 "
+chmod 777 gradlew
+chmod 774 scripts/deploy.sh
+
+echo "> 프로젝트 Build 시작"
+./gradlew build --exclude-task test
+
+echo "> Build 파일 복사"
+
+cp ./build/libs/*.jar $REPOSITORY/
+
+echo "> 현재 구동중인 애플리케이션 pid 확인"
+
+#CURRENT_PID=$(pgrep -f ${PROJECT_NAME}.*.jar)
+CURRENT_PID=$(pgrep -f "active=swagger")
+
+echo "$CURRENT_PID"
+
+if [ -z "$CURRENT_PID" ]; then
+    echo "> 현재 구동중인 애플리케이션이 없으므로 종료하지 않습니다."
+else
+    echo "> kill -2 $CURRENT_PID"
+    kill -9 "$CURRENT_PID"
+    sleep 10
+fi
+
+echo "> 새 어플리케이션 배포"
+
+# JAR_NAME=$(ls $REPOSITORY/ |grep jar | tail -n 1)
+JAR_NAME=$(ls $REPOSITORY/ |grep ${PROJECT_NAME}.*.jar | tail -n 1)
+
+echo "> JAR Name: $JAR_NAME"
+
+nohup java -jar $REPOSITORY/"$JAR_NAME"  --spring.profiles.active=swagger &
+

server/scripts/deploy.sh

@@ -36,7 +36,8 @@ cp ./build/libs/*.jar $REPOSITORY/
 
 echo "> 현재 구동중인 애플리케이션 pid 확인"
 
-CURRENT_PID=$(pgrep -f ${PROJECT_NAME}.*.jar)
+#CURRENT_PID=$(pgrep -f ${PROJECT_NAME}.*.jar)
+CURRENT_PID=$(pgrep -f "active=prd")
 
 echo "$CURRENT_PID"
 

server/src/main/java/com/bside/bside_311/Bside311Application.java

@@ -5,27 +5,25 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Bean;
 import org.springframework.data.domain.AuditorAware;
-import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 
 import java.util.Optional;
 
-@EnableJpaAuditing
 @SpringBootApplication
 public class Bside311Application {
 
-	public static void main(String[] args) {
-		SpringApplication.run(Bside311Application.class, args);
-	}
+  public static void main(String[] args) {
+    SpringApplication.run(Bside311Application.class, args);
+  }
 
-	@Bean
-	public AuditorAware<Long> auditorProvider() {
-		return () -> {
-			Long userNoFromAuthentication = AuthUtil.getUserNoFromAuthentication();
-			if (userNoFromAuthentication == null) {
-				return Optional.empty();
-			}
-			return Optional.of(userNoFromAuthentication);
-		};
-	}
+  @Bean
+  public AuditorAware<Long> auditorProvider() {
+    return () -> {
+      Long userNoFromAuthentication = AuthUtil.getUserNoFromAuthentication();
+      if (userNoFromAuthentication == null) {
+        return Optional.empty();
+      }
+      return Optional.of(userNoFromAuthentication);
+    };
+  }
 
 }

server/src/main/java/com/bside/bside_311/config/JpaConfiguration.java

@@ -0,0 +1,11 @@
+package com.bside.bside_311.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
+import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
+
+@Profile("!test")
+@Configuration
+@EnableJpaAuditing
+public class JpaConfiguration {
+}

server/src/main/java/com/bside/bside_311/controller/UserController.java

@@ -12,7 +12,6 @@
 import com.bside.bside_311.dto.UserUpdateRequestDto;
 import com.bside.bside_311.entity.Role;
 import com.bside.bside_311.entity.User;
-import com.bside.bside_311.repository.UserMybatisRepository;
 import com.bside.bside_311.service.UserService;
 import com.bside.bside_311.util.AuthUtil;
 import io.swagger.v3.oas.annotations.Operation;
@@ -39,7 +38,6 @@
 @Tag(name = "유저", description = "유저 API")
 public class UserController {
   private final UserService userService;
-  private final UserMybatisRepository userMybatisRepository;
 
   @Operation(summary = "[o]일반 유저 등록", description = "일반 유저 등록 API")
   @PostMapping("/signup")

server/src/test/java/com/bside/bside_311/controller/ControllerTest.java

@@ -2,40 +2,75 @@
 
 import com.bside.bside_311.Bside311Application;
 import com.bside.bside_311.config.security.WebSecurityConfig;
+import com.bside.bside_311.entity.Role;
+import com.bside.bside_311.entity.User;
+import com.bside.bside_311.util.JwtUtil;
+import org.junit.jupiter.api.BeforeEach;
 import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.authority.AuthorityUtils;
 import org.springframework.test.context.ContextConfiguration;
 
+import static com.bside.bside_311.util.JwtUtil.NORMAL_TOKEN;
+import static com.bside.bside_311.util.JwtUtil.normalValidity;
+
 @ContextConfiguration(classes = {
     Bside311Application.class,
     WebSecurityConfig.class,
 })
 public abstract class ControllerTest {
   protected static final String USER_ID = "UserId";
   protected static final String ADMIN_ID = "AdminId";
-//  @SpyBean
+  //  @SpyBean
 //  protected AccessTokenGenerator accessTokenGenerator;
 //  @MockBean
 //  protected AuthUserDao authUserDao;
+  public User normalUser;
+  @SpyBean
+  protected JwtUtil jwtUtil;
   protected String userAccessToken;
   protected String adminAccessToken;
-//  @SpyBean
+
+
+  //  @SpyBean
 //  private AccessTokenService accessTokenService;
 //
-//  @BeforeEach
-//  void setUpAccessTokenAndUserDetailsDaoForAuthentication() {
-//    userAccessToken = accessTokenGenerator.generate(USER_ID);
-//    adminAccessToken = accessTokenGenerator.generate(ADMIN_ID);
-//
-//    AuthUser user = AuthUser.authenticated(
-//        USER_ID, "ROLE_USER", userAccessToken);
-//
-//    given(authUserDao.findByAccessToken(userAccessToken))
-//        .willReturn(Optional.of(user));
-//
-//    AuthUser admin = AuthUser.authenticated(
-//        ADMIN_ID, "ROLE_ADMIN", adminAccessToken);
-//
-//    given(authUserDao.findByAccessToken(adminAccessToken))
-//        .willReturn(Optional.of(admin));
-//  }
+  @BeforeEach
+  void setUpAccessTokenAndUserDetailsDaoForAuthentication() {
+    normalUser = User.builder()
+                     .id(1L)
+                     .userId("normalUser")
+                     .password("normalUserPassword")
+                     .email("normalUser@example.com")
+                     .nickname("normalUserNickname")
+                     .role(Role.ROLE_USER)
+                     .introduction("normalUserIntroduction")
+                     .build();
+    Authentication normalUserAuthentication
+        = new UsernamePasswordAuthenticationToken(normalUser.getId(),
+        null,
+        AuthorityUtils.createAuthorityList(normalUser.getRole().toString()));
+
+    userAccessToken = jwtUtil.createLocalToken(normalUser, NORMAL_TOKEN, normalValidity,
+        normalUserAuthentication);
+
+
+    User adminUser = User.builder()
+                         .id(2L)
+                         .userId("adminUser")
+                         .password("adminUserPassword")
+                         .email("adminUser@example.com")
+                         .nickname("adminUserNickname")
+                         .role(Role.ROLE_USER)
+                         .introduction("adminUserIntroduction")
+                         .build();
+    Authentication adminUserAuthentication
+        = new UsernamePasswordAuthenticationToken(adminUser.getId(),
+        null,
+        AuthorityUtils.createAuthorityList(adminUser.getRole().toString()));
+
+    adminAccessToken =
+        jwtUtil.createLocalToken(adminUser, NORMAL_TOKEN, normalValidity, adminUserAuthentication);
+  }
 }

server/src/test/java/com/bside/bside_311/controller/UserControllerTest.java

@@ -1,5 +1,6 @@
 package com.bside.bside_311.controller;
 
+import com.bside.bside_311.dto.MyInfoResponseDto;
 import com.bside.bside_311.service.UserService;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
@@ -9,14 +10,16 @@
 import org.springframework.http.MediaType;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.MvcResult;
-import org.springframework.test.web.servlet.ResultActions;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.hamcrest.Matchers.containsString;
+import static org.mockito.BDDMockito.given;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 @WebMvcTest(UserController.class)
-class UserControllerTest extends ControllerTest{
+class UserControllerTest extends ControllerTest {
 
   @Autowired
   private MockMvc mockMvc;
@@ -33,7 +36,7 @@ void signupSuccess() throws Exception {
     String name = "Newbie";
 
     String json = String.format(
-            """
+        """
             {
                 "email": "%s",
                 "password": "%s",
@@ -45,8 +48,8 @@ void signupSuccess() throws Exception {
     );
 
     MvcResult mvcResult = mockMvc.perform(post("/user/signup")
-                                     .contentType(MediaType.APPLICATION_JSON)
-                                     .content(json))
+                                              .contentType(MediaType.APPLICATION_JSON)
+                                              .content(json))
                                  .andExpect(status().isCreated())
                                  .andReturn();
     String responseBody = mvcResult.getResponse().getContentAsString();
@@ -63,21 +66,34 @@ void signupFail_emptynickname() throws Exception {
 
     String json = String.format(
         """
-        {
-            "email": "%s",
-            "password": "%s",
-            "id": "%s"
-        }
-        """,
+            {
+                "email": "%s",
+                "password": "%s",
+                "id": "%s"
+            }
+            """,
         email, password, id, name
     );
 
     MvcResult mvcResult = mockMvc.perform(post("/user/signup")
-                                     .contentType(MediaType.APPLICATION_JSON)
-                                     .content(json))
+                                              .contentType(MediaType.APPLICATION_JSON)
+                                              .content(json))
                                  .andExpect(status().is4xxClientError())
                                  .andReturn();
     String responseBody = mvcResult.getResponse().getContentAsString();
     System.out.println(responseBody);
   }
+
+  @Test
+  @DisplayName("GET /me success")
+  void me() throws Exception {
+    given(userService.getMyInfo(normalUser.getId()))
+        .willReturn(MyInfoResponseDto.of(normalUser, null, 0L,
+            0L));
+
+    mockMvc.perform(get("/user/me")
+                        .header("Authorization", "Bearer " + userAccessToken))
+           .andExpect(status().isOk())
+           .andExpect(content().string(containsString("userNo")));
+  }
 }

server/src/test/resources/application-test.yml

@@ -1,27 +1,29 @@
 spring:
   datasource:
-    url: jdbc:h2:tcp://localhost/~/bside_311
-    username: sa
-    password:
-    driver-class-name: org.h2.Driver
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://localhost:3306/bside_test?serverTimezone=UTC&characterEncoding=UTF-8
+    username: root
+    password: root
+    minimum-idle: 10
+    maximum-pool-size: 10
+    idle-timeout: 30000
+    connection-timeout: 10000
+    validation-timeout: 10000
+    max-lifetime: 30000
+    connection-test-query: SELECT 1
 
   jpa:
+    database: mysql
+    database-platform: org.hibernate.dialect.MySQLDialect
     hibernate:
-      ddl-auto: create
+      ddl-auto: 'create-drop'
     properties:
       hibernate:
         # show_sql: true
         format_sql: true
         use_sql_comments: true
+        default_batch_fetch_size: 1000
 
 logging.level:
   org.hibernate.SQL: debug
-#  org.hibernate.orm.jdbc.bind: trace
-
-p6spy:
-  detail: false
-
-decorator:
-  datasource:
-    p6spy:
-      enable-logging: true
+#  org.hibernate.orm.jdbc.bind: trace

server/src/test/resources/application-testbackup.yml

@@ -0,0 +1,27 @@
+spring:
+  datasource:
+    url: jdbc:h2:tcp://localhost/~/bside_311
+    username: sa
+    password:
+    driver-class-name: org.h2.Driver
+
+  jpa:
+    hibernate:
+      ddl-auto: create
+    properties:
+      hibernate:
+        # show_sql: true
+        format_sql: true
+        use_sql_comments: true
+
+logging.level:
+  org.hibernate.SQL: debug
+#  org.hibernate.orm.jdbc.bind: trace
+
+p6spy:
+  detail: false
+
+decorator:
+  datasource:
+    p6spy:
+      enable-logging: true

server/src/test/resources/application.yml

@@ -0,0 +1,35 @@
+spring:
+  profiles:
+    active: test
+
+mybatis:
+  type-aliases-package: com.bside.bside_311.entity;com.bside.bside_311.dto;java.lang;
+  mapper-locations: mybatis/mapper/**/*.xml
+  configuration:
+    map-underscore-to-camel-case: true
+
+p6spy:
+  detail: false
+
+decorator:
+  datasource:
+    p6spy:
+      enable-logging: true
+
+springdoc:
+  version: '0.0.1'
+  api-docs:
+    groups:
+      enabled: true
+  default-consumes-media-type: application/json
+  default-produces-media-type: application/json
+  swagger-ui:
+    path: /
+    disable-swagger-default-url: true
+    display-request-duration: true
+    operations-sorter: method
+    tags-sorter: alpha
+    displayRequestDuration: true
+    #    doc-expansion: none
+    groups-order: DESC
+    persistAuthorization: true