[Test] Category 데드락 관련 이슈를 찾기 위한 테스트 및 낙관적 락 적용 진행.

README.md

@@ -1,5 +1,6 @@
 # TOASTER-SERVER
-![Frame 31](https://github.com/Link-MIND/TOASTER-Server/assets/92644651/c88432e0-5cb3-423f-9986-137fa4dfd5e1)
+![image](https://github.com/user-attachments/assets/627ffad2-6206-4c96-bfce-7ae7574b3237)
+
 
 더 이상 **링크**를 태우지 마세요. **토스트 먹듯이 간단하게!**
 
@@ -33,7 +34,8 @@
 
 
 ## 📦 ERD
-<img width="780" alt="스크린샷 2024-01-19 오후 10 31 57" src="https://github.com/Link-MIND/TOASTER-Server/assets/92644651/c641f995-92b3-41fb-9e29-19b4062cad14">
+![image](https://github.com/user-attachments/assets/46eed52a-e4bb-4001-9d6d-20246ca4ad1b)
+
 
 <br><br>
 

linkmind/build.gradle

@@ -34,28 +34,36 @@ dependencies {
 	implementation 'mysql:mysql-connector-java:8.0.32'
 	compileOnly 'org.projectlombok:lombok'
 	annotationProcessor 'org.projectlombok:lombok'
+
+    runtimeOnly 'com.h2database:h2'
+
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
-	runtimeOnly 'com.mysql:mysql-connector-j'
-	implementation 'org.springframework.boot:spring-boot-starter-validation'
+	testImplementation group: 'com.h2database', name: 'h2', version: '2.2.224'
+	testCompileOnly 'org.projectlombok:lombok'
+	testAnnotationProcessor 'org.projectlombok:lombok'
 
-	implementation 'io.sentry:sentry-spring-boot-starter:5.7.0'
-	//JWT
-	implementation group: 'io.jsonwebtoken', name: 'jjwt-api', version: '0.11.2'
-	implementation group: 'io.jsonwebtoken', name: 'jjwt-impl', version: '0.11.2'
-	implementation group: 'io.jsonwebtoken', name: 'jjwt-jackson', version: '0.11.2'
+    runtimeOnly 'com.mysql:mysql-connector-j'
+    implementation 'org.springframework.boot:spring-boot-starter-validation'
+
+    implementation 'io.sentry:sentry-spring-boot-starter:5.7.0'
+    //JWT
+    implementation group: 'io.jsonwebtoken', name: 'jjwt-api', version: '0.11.2'
+    implementation group: 'io.jsonwebtoken', name: 'jjwt-impl', version: '0.11.2'
+    implementation group: 'io.jsonwebtoken', name: 'jjwt-jackson', version: '0.11.2'
 
 
 	// FCM
 	implementation 'com.google.firebase:firebase-admin:9.1.1'
 	implementation 'com.squareup.okhttp3:okhttp:4.10.0'  // Firebase 서버로 푸시 메시지 전송 시 필요
 
-	implementation 'org.springframework.boot:spring-boot-starter-actuator'
 
-	//Query DSL
-	implementation "com.querydsl:querydsl-jpa:${queryDslVersion}:jakarta"
-	annotationProcessor "com.querydsl:querydsl-apt:${queryDslVersion}:jakarta"
-	annotationProcessor "jakarta.annotation:jakarta.annotation-api"
-	annotationProcessor "jakarta.persistence:jakarta.persistence-api"
+    implementation 'org.springframework.boot:spring-boot-starter-actuator'
+
+//Query DSL
+    implementation "com.querydsl:querydsl-jpa:${queryDslVersion}:jakarta"
+    annotationProcessor "com.querydsl:querydsl-apt:${queryDslVersion}:jakarta"
+    annotationProcessor "jakarta.annotation:jakarta.annotation-api"
+    annotationProcessor "jakarta.persistence:jakarta.persistence-api"
 
 	// S3 AWS
 	implementation("software.amazon.awssdk:bom:2.21.0")
@@ -71,9 +79,89 @@ dependencies {
 
 	implementation 'io.sentry:sentry-spring-boot-starter:5.7.0'
 
+	// openfeign
+	implementation 'org.springframework.cloud:spring-cloud-starter-openfeign'
+
+}
+
+dependencyManagement {
+	imports {
+		mavenBom("org.springframework.cloud:spring-cloud-dependencies:2023.0.3")
+	}
 }
+//sourceSets {
+//	main {
+//		java {
+//			srcDirs = ["$projectDir/src/main/java", "$projectDir/build/generated"]
+//		}
+//	}
+//}
+//compileJava {	options.compilerArgs << '-parameters'}
 
 
 tasks.named('test') {
-	useJUnitPlatform()
+    useJUnitPlatform()
+//    finalizedBy 'jacocoTestReport' // test가 끝나면 jacocoTestReport 동작
 }
+//// jacoco report 설정
+//jacocoTestReport {
+//    reports {
+//        // html로 report 생성하기
+//        // 빌드경로/jacoco/report.html 폴더 내부로 경로 설정
+//        html.destination file("$jacoco/report.html")
+//    }
+//
+//    // jacocoTestReport가 끝나면 jacocoTestCoverageVerification 동작
+//    finalizedBy 'jacocoTestCoverageVerification'
+//}
+//
+//// jacoco 커버리지 검증 설정
+//jacocoTestCoverageVerification {
+//    violationRules {
+//        rule {
+//            enabled = true // 커버리지 적용 여부
+//            element = 'CLASS' // 커버리지 적용 단위
+//
+//            // 라인 커버리지 설정
+//            // 적용 대상 전체 소스 코드들을 한줄 한줄 따졌을 때 테스트 코드가 작성되어 있는 줄의 빈도
+//            // 테스트 코드가 작성되어 있는 비율이 90% 이상이어야 함
+//            limit {
+//                counter = 'LINE'
+//                value = 'COVEREDRATIO'
+//                minimum = 0.10
+//            }
+//
+//            // 브랜치 커버리지 설정
+//            // if-else 등을 활용하여 발생되는 분기들 중 테스트 코드가 작성되어 있는 빈도
+//            // 테스트 코드가 작성되어 있는 비율이 90% 이상이어야 함
+//            limit {
+//                counter = 'BRANCH'
+//                value = 'COVEREDRATIO'
+//                minimum = 0.00
+//            }
+//
+//            // 라인 최대 갯수 설정
+//            // 빈 줄을 제외하고 하나의 자바 파일에서 작성될 수 있는 최대 라인 갯수
+//            // 한 파일에 최대 500줄까지 작성되어야 함
+//            limit {
+//                counter = 'LINE'
+//                value = 'TOTALCOUNT'
+//                maximum = 500
+//            }
+//            // 커버리지 체크를 제외할 클래스들
+//            excludes = [
+//                    //      '*.test.*',
+//                    '*.common.*',
+//                    '*.config.*',
+//                    '*.controller.*',
+//                    '*.domain.*',
+//                    '*.exception.*',
+//                    '*.external.*',
+//                    '*.infrastructure.*',
+//                    '*.auth.*',
+//                    '*.service.*'
+//
+//            ]
+//        }
+//    }
+//}

linkmind/src/main/java/com/app/toaster/ToasterApplication.java

@@ -3,13 +3,15 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cglib.core.Local;
+import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 
 import javax.annotation.PostConstruct;
 import java.time.LocalTime;
 import java.util.TimeZone;
 
 @SpringBootApplication
+@EnableFeignClients
 @EnableJpaAuditing
 public class ToasterApplication {
 

linkmind/src/main/java/com/app/toaster/controller/AuthController.java → linkmind/src/main/java/com/app/toaster/auth/controller/AuthController.java

@@ -1,4 +1,4 @@
-package com.app.toaster.controller;
+package com.app.toaster.auth.controller;
 
 import java.io.IOException;
 
@@ -13,13 +13,13 @@
 
 import com.app.toaster.common.dto.ApiResponse;
 // import com.app.toaster.config.UserId;
-import com.app.toaster.config.UserId;
-import com.app.toaster.controller.request.auth.SignInRequestDto;
-import com.app.toaster.controller.response.auth.SignInResponseDto;
-import com.app.toaster.controller.response.auth.TokenHealthDto;
-import com.app.toaster.controller.response.auth.TokenResponseDto;
+import com.app.toaster.common.config.UserId;
+import com.app.toaster.auth.controller.request.SignInRequestDto;
+import com.app.toaster.auth.controller.response.SignInResponseDto;
+import com.app.toaster.auth.controller.response.TokenHealthDto;
+import com.app.toaster.auth.controller.response.TokenResponseDto;
 import com.app.toaster.exception.Success;
-import com.app.toaster.service.auth.AuthService;
+import com.app.toaster.auth.service.AuthService;
 
 import lombok.RequiredArgsConstructor;
 

linkmind/src/main/java/com/app/toaster/controller/request/auth/SignInRequestDto.java → linkmind/src/main/java/com/app/toaster/auth/controller/request/SignInRequestDto.java

@@ -1,4 +1,4 @@
-package com.app.toaster.controller.request.auth;
+package com.app.toaster.auth.controller.request;
 
 public record SignInRequestDto(String socialType, String fcmToken) {
 }

linkmind/src/main/java/com/app/toaster/controller/response/auth/SignInResponseDto.java → linkmind/src/main/java/com/app/toaster/auth/controller/response/SignInResponseDto.java

@@ -1,4 +1,4 @@
-package com.app.toaster.controller.response.auth;
+package com.app.toaster.auth.controller.response;
 
 public record SignInResponseDto(Long userId, String accessToken, String refreshToken, String fcmToken, Boolean isRegistered,Boolean fcmIsAllowed, String profile) {
 	public static SignInResponseDto of(Long userId, String accessToken, String refreshToken, String fcmToken,

linkmind/src/main/java/com/app/toaster/controller/response/auth/TokenHealthDto.java → linkmind/src/main/java/com/app/toaster/auth/controller/response/TokenHealthDto.java

@@ -1,4 +1,4 @@
-package com.app.toaster.controller.response.auth;
+package com.app.toaster.auth.controller.response;
 
 public record TokenHealthDto(boolean tokenHealth) {
 	public static TokenHealthDto of(boolean tokenHealth){return new TokenHealthDto(tokenHealth);}

linkmind/src/main/java/com/app/toaster/controller/response/auth/TokenResponseDto.java → linkmind/src/main/java/com/app/toaster/auth/controller/response/TokenResponseDto.java

@@ -1,4 +1,4 @@
-package com.app.toaster.controller.response.auth;
+package com.app.toaster.auth.controller.response;
 
 public record TokenResponseDto(String accessToken, String refreshToken) {
 	public static TokenResponseDto of(String accessToken, String refreshToken){

linkmind/src/main/java/com/app/toaster/service/auth/AuthService.java → linkmind/src/main/java/com/app/toaster/auth/service/AuthService.java

@@ -1,38 +1,41 @@
-package com.app.toaster.service.auth;
+package com.app.toaster.auth.service;
 
 import java.io.IOException;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.client.RestTemplate;
-
-import com.app.toaster.common.dto.ApiResponse;
-import com.app.toaster.config.jwt.JwtService;
-import com.app.toaster.controller.request.auth.SignInRequestDto;
-import com.app.toaster.controller.response.auth.SignInResponseDto;
-import com.app.toaster.controller.response.auth.TokenHealthDto;
-import com.app.toaster.controller.response.auth.TokenResponseDto;
-import com.app.toaster.domain.SocialType;
-import com.app.toaster.domain.User;
+
+
+import com.app.toaster.common.config.jwt.JwtService;
+import com.app.toaster.auth.controller.request.SignInRequestDto;
+import com.app.toaster.auth.controller.response.SignInResponseDto;
+import com.app.toaster.auth.controller.response.TokenHealthDto;
+import com.app.toaster.auth.controller.response.TokenResponseDto;
+import com.app.toaster.user.domain.SocialType;
+import com.app.toaster.user.domain.User;
 import com.app.toaster.exception.Error;
-import com.app.toaster.exception.Success;
-import com.app.toaster.exception.model.BadRequestException;
 import com.app.toaster.exception.model.CustomException;
 import com.app.toaster.exception.model.NotFoundException;
 import com.app.toaster.exception.model.UnprocessableEntityException;
+import com.app.toaster.external.client.discord.DiscordMessageProvider;
+import com.app.toaster.external.client.discord.NotificationDto;
+import com.app.toaster.external.client.discord.NotificationType;
 import com.app.toaster.external.client.slack.SlackApi;
-import com.app.toaster.infrastructure.CategoryRepository;
-import com.app.toaster.infrastructure.TimerRepository;
-import com.app.toaster.infrastructure.ToastRepository;
-import com.app.toaster.infrastructure.UserRepository;
-import com.app.toaster.service.auth.apple.AppleSignInService;
-import com.app.toaster.service.auth.kakao.KakaoSignInService;
-import com.app.toaster.service.auth.kakao.LoginResult;
-import com.app.toaster.service.toast.ToastService;
+import com.app.toaster.category.infrastructure.CategoryRepository;
+import com.app.toaster.timer.infrastructure.TimerRepository;
+import com.app.toaster.toast.infrastructure.ToastRepository;
+import com.app.toaster.user.infrastructure.UserRepository;
+import com.app.toaster.popup.infrastructure.PopupManagerRepository;
+import com.app.toaster.auth.service.apple.AppleSignInService;
+import com.app.toaster.auth.service.kakao.KakaoSignInService;
+import com.app.toaster.auth.service.kakao.LoginResult;
+import com.app.toaster.toast.service.ToastService;
 
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 
+@Slf4j
 @Service
 @RequiredArgsConstructor
 public class AuthService {
@@ -43,8 +46,10 @@ public class AuthService {
 
 	private final UserRepository userRepository;
 	private final CategoryRepository categoryRepository;
+	private final PopupManagerRepository popupManagerRepository;
 
 	private final SlackApi slackApi;
+	private final DiscordMessageProvider discordMessageProvider;
 
 
 	private final Long TOKEN_EXPIRATION_TIME_ACCESS =  7*24*60 * 60 * 1000L; //7일
@@ -73,7 +78,8 @@ public SignInResponseDto signIn(String socialAccessToken, SignInRequestDto reque
 				.socialType(socialType).build();
 			newUser.updateFcmIsAllowed(true); //신규 유저면 true박고
 			userRepository.save(newUser);
-			slackApi.sendSuccess(Success.LOGIN_SUCCESS);
+
+			discordMessageProvider.sendNotification(new NotificationDto(NotificationType.SIGNUP,null,null));
 		}
 
 		User user = userRepository.findBySocialIdAndSocialType(socialId, socialType)
@@ -149,6 +155,7 @@ public void withdraw(Long userId) {
 		}
 		timerRepository.deleteAllByUser(user);
 		categoryRepository.deleteAllByUser(user);
+		popupManagerRepository.deleteAllByUserId(userId);
 
 		Long res = userRepository.deleteByUserId(userId); //res가 삭제된 컬럼의 개수 즉, 1이 아니면 뭔가 알 수 없는 에러.
 
@@ -163,4 +170,5 @@ public TokenHealthDto checkHealthOfToken(String refreshToken){
 		return TokenHealthDto.of(jwtService.verifyToken(refreshToken));
 	}
 
+
 }

linkmind/src/main/java/com/app/toaster/service/auth/apple/AppleSignInService.java → linkmind/src/main/java/com/app/toaster/auth/service/apple/AppleSignInService.java

@@ -1,4 +1,4 @@
-package com.app.toaster.service.auth.apple;
+package com.app.toaster.auth.service.apple;
 
 import java.security.PublicKey;
 import java.util.Map;
@@ -7,11 +7,10 @@
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestClient;
 
-import com.app.toaster.service.auth.apple.response.ApplePublicKeys;
-import com.app.toaster.service.auth.apple.verify.AppleJwtParser;
-import com.app.toaster.service.auth.apple.verify.PublicKeyGenerator;
-import com.app.toaster.service.auth.kakao.LoginResult;
-import com.mysql.cj.log.Log;
+import com.app.toaster.auth.service.apple.response.ApplePublicKeys;
+import com.app.toaster.auth.service.apple.verify.AppleJwtParser;
+import com.app.toaster.auth.service.apple.verify.PublicKeyGenerator;
+import com.app.toaster.auth.service.kakao.LoginResult;
 
 import io.jsonwebtoken.Claims;
 import lombok.RequiredArgsConstructor;

linkmind/src/main/java/com/app/toaster/service/auth/apple/response/ApplePublicKey.java → linkmind/src/main/java/com/app/toaster/auth/service/apple/response/ApplePublicKey.java

@@ -1,4 +1,4 @@
-package com.app.toaster.service.auth.apple.response;
+package com.app.toaster.auth.service.apple.response;
 
 public record ApplePublicKey(
 	String kty,

linkmind/src/main/java/com/app/toaster/service/auth/apple/response/ApplePublicKeys.java → linkmind/src/main/java/com/app/toaster/auth/service/apple/response/ApplePublicKeys.java

@@ -1,12 +1,10 @@
-package com.app.toaster.service.auth.apple.response;
+package com.app.toaster.auth.service.apple.response;
 
 import java.util.List;
 
 import com.app.toaster.exception.Error;
 import com.app.toaster.exception.model.CustomException;
 
-import lombok.extern.slf4j.Slf4j;
-
 public record ApplePublicKeys(List<ApplePublicKey> keys) {
 
 	public ApplePublicKey getMatchesKey(String alg, String kid) {

linkmind/src/main/java/com/app/toaster/service/auth/apple/verify/AppleJwtParser.java → linkmind/src/main/java/com/app/toaster/auth/service/apple/verify/AppleJwtParser.java

@@ -1,4 +1,4 @@
-package com.app.toaster.service.auth.apple.verify;
+package com.app.toaster.auth.service.apple.verify;
 
 import java.security.PublicKey;
 import java.util.Base64;

linkmind/src/main/java/com/app/toaster/service/auth/apple/verify/EncryptUtils.java → linkmind/src/main/java/com/app/toaster/auth/service/apple/verify/EncryptUtils.java

@@ -1,4 +1,4 @@
-package com.app.toaster.service.auth.apple.verify;
+package com.app.toaster.auth.service.apple.verify;
 
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;

linkmind/src/main/java/com/app/toaster/service/auth/apple/verify/PublicKeyGenerator.java → linkmind/src/main/java/com/app/toaster/auth/service/apple/verify/PublicKeyGenerator.java

@@ -1,4 +1,4 @@
-package com.app.toaster.service.auth.apple.verify;
+package com.app.toaster.auth.service.apple.verify;
 
 import java.math.BigInteger;
 import java.security.KeyFactory;
@@ -13,10 +13,8 @@
 
 import com.app.toaster.exception.Error;
 import com.app.toaster.exception.model.CustomException;
-import com.app.toaster.service.auth.apple.response.ApplePublicKey;
-import com.app.toaster.service.auth.apple.response.ApplePublicKeys;
-
-import lombok.extern.slf4j.Slf4j;
+import com.app.toaster.auth.service.apple.response.ApplePublicKey;
+import com.app.toaster.auth.service.apple.response.ApplePublicKeys;
 
 @Component
 public class PublicKeyGenerator {