Change to read method to handle google sign-in 500 error (#144)

SWM-REPL · Oct 25, 2023 · 3f9f86d · 3f9f86d
2 parents 44649b5 + a8c33fb
commit 3f9f86d
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 9 deletions.
diff --git a/src/main/java/org/swmaestro/repl/gifthub/auth/service/AppleService.java b/src/main/java/org/swmaestro/repl/gifthub/auth/service/AppleService.java
@@ -121,7 +121,7 @@ public OAuth read(OAuthUserInfoDto oAuthUserInfoDto) {
 		OAuth oAuth = oAuthRepository.findByPlatformAndPlatformIdAndDeletedAtIsNull(OAuthPlatform.APPLE, oAuthUserInfoDto.getId())
 				.orElseThrow(() -> new BusinessException("존재하지 않는 OAuth 계정입니다.", StatusEnum.NOT_FOUND));
 
-		if (oAuth.getDeletedAt() != null) {
+		if (oAuth.isDeleted()) {
 			throw new BusinessException("존재하지 않는 OAuth 계정입니다.", StatusEnum.NOT_FOUND);
 		} else {
 			return oAuth;

diff --git a/src/main/java/org/swmaestro/repl/gifthub/auth/service/GoogleService.java b/src/main/java/org/swmaestro/repl/gifthub/auth/service/GoogleService.java
@@ -100,10 +100,10 @@ public OAuth create(User user, OAuthUserInfoDto oAuthUserInfoDto) {
 
 	@Override
 	public OAuth read(OAuthUserInfoDto oAuthUserInfoDto) {
-		OAuth oAuth = oAuthRepository.findByPlatformAndPlatformId(OAuthPlatform.GOOGLE, oAuthUserInfoDto.getId())
+		OAuth oAuth = oAuthRepository.findByPlatformAndPlatformIdAndDeletedAtIsNull(OAuthPlatform.GOOGLE, oAuthUserInfoDto.getId())
 				.orElseThrow(() -> new BusinessException("존재하지 않는 OAuth 계정입니다.", StatusEnum.NOT_FOUND));
 
-		if (oAuth.getDeletedAt() != null) {
+		if (oAuth.isDeleted()) {
 			throw new BusinessException("존재하지 않는 OAuth 계정입니다.", StatusEnum.NOT_FOUND);
 		} else {
 			return oAuth;

diff --git a/src/main/java/org/swmaestro/repl/gifthub/auth/service/NaverService.java b/src/main/java/org/swmaestro/repl/gifthub/auth/service/NaverService.java
@@ -106,7 +106,7 @@ public OAuth read(OAuthUserInfoDto oAuthUserInfoDto) {
 		OAuth oAuth = oAuthRepository.findByPlatformAndPlatformIdAndDeletedAtIsNull(OAuthPlatform.NAVER, oAuthUserInfoDto.getId())
 				.orElseThrow(() -> new BusinessException("존재하지 않는 OAuth 계정입니다.", StatusEnum.NOT_FOUND));
 
-		if (oAuth.getDeletedAt() != null) {
+		if (oAuth.isDeleted()) {
 			throw new BusinessException("존재하지 않는 OAuth 계정입니다.", StatusEnum.NOT_FOUND);
 		} else {
 			return oAuth;

diff --git a/src/main/java/org/swmaestro/repl/gifthub/vouchers/service/VoucherSaveService.java b/src/main/java/org/swmaestro/repl/gifthub/vouchers/service/VoucherSaveService.java
@@ -65,16 +65,12 @@ public void execute(OCRDto ocrDto, String username) throws IOException {
 						throwable -> {
 							System.out.println("등록 실패");
 							throwable.printStackTrace();
-							// notification 저장(알림 실패 저장)
-							notificationService.save(userService.read(username), null,
-									NotificationType.REGISTERED,
-									"기프티콘 등록에 실패했습니다.");
 							//Gpt 에러일 경우
 							if (throwable instanceof GptResponseException) {
 								fcmNotificationService.sendNotification("기프티콘 등록 실패", "자동 등록에 실패했습니다. 수동 등록을 이용해 주세요.", username);
 								notificationService.save(userService.read(username), null,
 										NotificationType.REGISTERED,
-										"Gpt 응답이 올바르지 않습니다.");
+										"자동 등록에 실패했습니다. 수동 등록을 이용해 주세요.");
 							} else {
 								fcmNotificationService.sendNotification("기프티콘 등록 실패", "이미 등록된 기프티콘 입니다.", username);
 								notificationService.save(userService.read(username), null,