Merge pull request #413 from depromeet/develop

v1.3.9

Author: mikekks

.gitignore

@@ -2,6 +2,8 @@
 layer-api/src/main/resources/application.yml
 
 layer-api/src/main/resources/application-secret.properties
+layer-batch/src/test/resources/application-secret.properties
+
 
 # q
 layer-domain/src/main/generated/

build.gradle

@@ -43,18 +43,8 @@ subprojects {
         compileOnly 'org.projectlombok:lombok'
         annotationProcessor 'org.projectlombok:lombok'
 
-        testImplementation platform('org.junit:junit-bom:5.9.1')
-        testImplementation 'org.junit.jupiter:junit-jupiter'
-        testImplementation 'org.springframework.boot:spring-boot-starter-test'
         testCompileOnly 'org.projectlombok:lombok'
         testAnnotationProcessor 'org.projectlombok:lombok'
-
-        implementation 'org.springframework.boot:spring-boot-starter'
-        implementation 'org.springframework.boot:spring-boot-starter-web'
-
-        annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor'
-
-
     }
 
     test {
@@ -69,13 +59,15 @@ project(":layer-api") {
         implementation project(path: ':layer-domain')
         implementation project(path: ':layer-external')
         implementation project(path: ':layer-event')
+
         runtimeOnly project(path: ':layer-admin')
+        runtimeOnly project(path: ':layer-batch')
 
         implementation 'org.springframework.boot:spring-boot-starter-actuator'
         implementation 'org.springframework.boot:spring-boot-starter-validation'
         implementation 'org.springframework.boot:spring-boot-starter-web'
 
-        //== jwt ==//
+        // jwt 관련 설정
         implementation 'io.jsonwebtoken:jjwt-api:0.12.5'
         runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.12.5'
         runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.12.5'
@@ -114,9 +106,8 @@ project(":layer-common") {
     jar.enabled = true
 
     dependencies {
-        implementation 'org.springframework.boot:spring-boot-starter-validation'
+        implementation 'org.springframework.boot:spring-boot-starter-web'
     }
-
 }
 
 
@@ -126,26 +117,24 @@ project(":layer-domain") {
 
     dependencies {
         implementation project(path: ':layer-common')
+        implementation 'org.springframework.boot:spring-boot-starter-web'
         implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
         implementation 'org.springframework.boot:spring-boot-starter-validation'
         implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
 
         // h2
         runtimeOnly 'com.h2database:h2'
 
-
         //QueryDSL
         implementation 'com.querydsl:querydsl-jpa:5.0.0:jakarta'
         annotationProcessor "com.querydsl:querydsl-apt:5.0.0:jakarta"
         annotationProcessor "jakarta.annotation:jakarta.annotation-api"
         annotationProcessor "jakarta.persistence:jakarta.persistence-api"
 
-        testImplementation platform('org.junit:junit-bom:5.9.1')
-        testImplementation 'org.junit.jupiter:junit-jupiter'
-
         // test
         testImplementation 'org.springframework.boot:spring-boot-starter-test'
-
+        testImplementation platform('org.junit:junit-bom:5.9.1')
+        testImplementation 'org.junit.jupiter:junit-jupiter'
     }
 }
 
@@ -188,20 +177,21 @@ project(":layer-external") {
 }
 
 project(":layer-batch") {
-    jar.enabled = false
-    bootJar.enabled = true
+    jar.enabled = true
+    bootJar.enabled = false
 
     dependencies {
         implementation project(path: ':layer-common')
         implementation project(path: ':layer-domain')
-        implementation project(path: ':layer-external')
-
-        implementation 'org.springframework.boot:spring-boot-starter-web'
-		implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
-
-        implementation("org.springframework.cloud:spring-cloud-starter-openfeign:4.1.2")
+        implementation project(path: ':layer-event')
 
+        compileOnly 'org.springframework.boot:spring-boot-starter-web'
+        compileOnly 'org.springframework.boot:spring-boot-starter-data-jpa'
         runtimeOnly 'com.mysql:mysql-connector-j'
+
+        testImplementation 'org.springframework.boot:spring-boot-starter-test'
+        testImplementation 'org.springframework.boot:spring-boot-starter-web'
+        testImplementation 'org.springframework.boot:spring-boot-starter-data-jpa'
     }
 
 }
@@ -211,7 +201,7 @@ project(":layer-admin") {
     bootJar.enabled = false
 
     dependencies {
-        compileOnly project(path: ':layer-event')
+        implementation project(path: ':layer-event')
 
         compileOnly 'org.springframework.boot:spring-boot-starter-data-jpa'
         compileOnly 'org.springframework.boot:spring-boot-starter-web'

layer-api/src/main/java/org/layer/aop/RecentAccessHistoryAop.java

@@ -2,7 +2,7 @@
 
 import lombok.RequiredArgsConstructor;
 
-import org.layer.domain.jwt.JwtAuthenticationFilter;
+import org.layer.jwt.JwtAuthenticationFilter;
 import org.springframework.boot.autoconfigure.security.ConditionalOnDefaultWebSecurity;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

layer-api/src/main/java/org/layer/config/SecurityConfig.java

@@ -6,7 +6,7 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
-import org.layer.ai.event.AIAnalyzeStartEvent;
+import org.layer.event.ai.AIAnalyzeStartEvent;
 import org.layer.domain.analyze.entity.Analyze;
 import org.layer.domain.analyze.enums.AnalyzeType;
 import org.layer.domain.analyze.repository.AnalyzeRepository;

layer-api/src/main/java/org/layer/domain/answer/service/AnswerService.java

@@ -1,7 +1,7 @@
 package org.layer.domain.auth.controller.dto;
 
 import lombok.Builder;
-import org.layer.domain.jwt.JwtToken;
+import org.layer.jwt.JwtToken;
 import org.layer.domain.member.entity.Member;
 import org.layer.domain.member.entity.MemberRole;
 import org.layer.domain.member.entity.SocialType;

layer-api/src/main/java/org/layer/domain/auth/controller/dto/ReissueTokenResponse.java

@@ -1,7 +1,7 @@
 package org.layer.domain.auth.controller.dto;
 
 import lombok.Builder;
-import org.layer.domain.jwt.JwtToken;
+import org.layer.jwt.JwtToken;
 import org.layer.domain.member.entity.Member;
 import org.layer.domain.member.entity.MemberRole;
 import org.layer.domain.member.entity.SocialType;

layer-api/src/main/java/org/layer/domain/auth/controller/dto/SignInResponse.java

@@ -1,6 +1,6 @@
 package org.layer.domain.auth.controller.dto;
 
-import org.layer.domain.jwt.JwtToken;
+import org.layer.jwt.JwtToken;
 import org.layer.domain.member.entity.Member;
 import org.layer.domain.member.entity.MemberRole;
 import org.layer.domain.member.entity.SocialType;

layer-api/src/main/java/org/layer/domain/auth/controller/dto/SignUpResponse.java

@@ -7,10 +7,10 @@
 import org.layer.event.member.SignUpEvent;
 import org.layer.domain.auth.controller.dto.*;
 import org.layer.domain.common.time.Time;
-import org.layer.domain.jwt.JwtToken;
-import org.layer.domain.jwt.exception.AuthException;
-import org.layer.domain.jwt.exception.AuthExceptionType;
-import org.layer.domain.jwt.service.JwtService;
+import org.layer.jwt.JwtToken;
+import org.layer.jwt.exception.AuthException;
+import org.layer.jwt.exception.AuthExceptionType;
+import org.layer.jwt.service.JwtService;
 import org.layer.domain.member.entity.Member;
 import org.layer.domain.member.entity.SocialType;
 import org.layer.domain.member.service.MemberService;
@@ -24,7 +24,7 @@
 import java.time.Duration;
 import java.util.UUID;
 
-import static org.layer.domain.jwt.exception.AuthExceptionType.DUPLICATED_SIGN_UP_REQUEST;
+import static org.layer.jwt.exception.AuthExceptionType.DUPLICATED_SIGN_UP_REQUEST;
 
 
 @Slf4j

layer-api/src/main/java/org/layer/domain/auth/service/AuthService.java

@@ -3,7 +3,7 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
-import org.layer.ai.event.AIAnalyzeStartEvent;
+import org.layer.event.ai.AIAnalyzeStartEvent;
 import org.layer.domain.answer.entity.Answers;
 import org.layer.domain.answer.repository.AnswerRepository;
 import org.layer.domain.common.random.CustomRandom;