hotfix: Xquare DSM 외부 login API 예외 처리

DSM-Repo · Aug 19, 2024 · f55ae6c · f55ae6c
1 parent 8ea3ec1
commit f55ae6c
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 5 deletions.
diff --git a/src/main/java/com/example/whopper/domain/auth/application/impl/StudentLoginService.java b/src/main/java/com/example/whopper/domain/auth/application/impl/StudentLoginService.java
@@ -15,6 +15,7 @@
 import com.example.whopper.global.security.jwt.JwtTokenProvider;
 import com.example.whopper.infra.feign.XquareClient;
 import com.example.whopper.infra.feign.dto.response.XquareUserResponse;
+import com.example.whopper.infra.feign.exception.XquareException;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
@@ -34,9 +35,9 @@ public class StudentLoginService implements StudentLoginUseCase {
 
     @Transactional
     public TokenResponse studentLogin(LoginRequest request) {
-        return studentMongoRepository.existsByAccountId(request.accountId()) ?
-                loginExistingStudent(request) :
-                registerAndLoginNewStudent(request);
+        return studentMongoRepository.existsByAccountId(request.accountId())
+                ? loginExistingStudent(request)
+                : registerAndLoginNewStudent(request);
     }
 
     private TokenResponse loginExistingStudent(LoginRequest request) {
@@ -51,7 +52,14 @@ private TokenResponse loginExistingStudent(LoginRequest request) {
     }
 
     private TokenResponse registerAndLoginNewStudent(LoginRequest request) {
-        XquareUserResponse xquareUserResponse = xquareClient.xquareUser(request);
+        XquareUserResponse xquareUserResponse;
+
+        try {
+            xquareUserResponse = xquareClient.xquareUser(request);
+        } catch (Exception e) {
+            throw XquareException.EXCEPTION;
+        }
+
         if(!xquareUserResponse.getUserRole().equals("STU")) throw InvalidUserException.EXCEPTION;
         StudentEntity newStudent = createAndSaveNewStudent(xquareUserResponse);
 

diff --git a/src/main/java/com/example/whopper/domain/auth/application/impl/TeacherLoginService.java b/src/main/java/com/example/whopper/domain/auth/application/impl/TeacherLoginService.java
@@ -12,6 +12,7 @@
 import com.example.whopper.global.security.jwt.JwtTokenProvider;
 import com.example.whopper.infra.feign.XquareClient;
 import com.example.whopper.infra.feign.dto.response.XquareUserResponse;
+import com.example.whopper.infra.feign.exception.XquareException;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
@@ -43,7 +44,14 @@ private TokenResponse loginExistingTeacher(LoginRequest request) {
     }
 
     private TokenResponse registerAndLoginNewTeacher(LoginRequest request) {
-        XquareUserResponse xquareUserResponse = xquareClient.xquareUser(request);
+        XquareUserResponse xquareUserResponse;
+
+        try {
+            xquareUserResponse = xquareClient.xquareUser(request);
+        } catch (Exception e) {
+            throw XquareException.EXCEPTION;
+        }
+
         if(!xquareUserResponse.getUserRole().equals("SCH")) throw InvalidUserException.EXCEPTION;
         TeacherEntity newTeacher = createAndSaveNewTeacher(xquareUserResponse);
 

diff --git a/src/main/java/com/example/whopper/domain/auth/dto/request/LoginRequest.java b/src/main/java/com/example/whopper/domain/auth/dto/request/LoginRequest.java
@@ -4,4 +4,7 @@ public record LoginRequest(
         String accountId,
         String password
 ) {
+    public LoginRequest {
+        accountId = accountId.toLowerCase();
+    }
 }
diff --git a/src/main/java/com/example/whopper/global/error/exception/ErrorCode.java b/src/main/java/com/example/whopper/global/error/exception/ErrorCode.java
@@ -9,6 +9,9 @@
 @JsonFormat(shape = JsonFormat.Shape.OBJECT)
 public enum ErrorCode {
 
+    // xquare
+    XQUARE(503, "DSM-login 서비스에서 에러가 발생했습니다."),
+
     FORBIDDEN(403, "접근 권한이 없는 유저입니다."),
 
     // auth

diff --git a/src/main/java/com/example/whopper/infra/feign/exception/XquareException.java b/src/main/java/com/example/whopper/infra/feign/exception/XquareException.java
@@ -0,0 +1,13 @@
+package com.example.whopper.infra.feign.exception;
+
+import com.example.whopper.global.error.exception.ErrorCode;
+import com.example.whopper.global.error.exception.WhopperException;
+
+public class XquareException extends WhopperException {
+    public static final WhopperException EXCEPTION = new XquareException();
+
+    private XquareException() {
+        super(ErrorCode.XQUARE);
+    }
+
+}