Merge pull request #223 from boostcampwm2023/iOS/chore#222

chore: 변경된 서버 API 필드명으로 회원가입 여부 DTO 변경, 코드 리뷰 반영
boostcampwm2023 · Dec 6, 2023 · d702bc6 · d702bc6
2 parents 1b51be2 + d7bdb5e
commit d702bc6
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 17 deletions.
diff --git a/iOS/Layover/Layover/Network/DTOs/CheckSignUpDTO.swift b/iOS/Layover/Layover/Network/DTOs/CheckSignUpDTO.swift
@@ -9,5 +9,5 @@
 import Foundation
 
 struct CheckSignUpDTO: Decodable {
-    let isValid: Bool
+    let isAlreadyExist: Bool
 }
diff --git a/iOS/Layover/Layover/Network/Mock/MockData/CheckSignUp.json b/iOS/Layover/Layover/Network/Mock/MockData/CheckSignUp.json
@@ -3,6 +3,6 @@
     "message": "성공",
     "statusCode": 200,
     "data": {
-        "isValid": true
+        "isAlreadyExist": true
     }
 }
diff --git a/iOS/Layover/Layover/Network/Mock/MockData/LoginData.json b/iOS/Layover/Layover/Network/Mock/MockData/LoginData.json
@@ -1,9 +1,9 @@
 {
-  "customCode": "SUCCESS",
-  "message": "성공",
-  "statusCode": 200,
-  "data": {
-    "accessToken": "mockAccessToken",
-    "refreshToken": "mockRefreshToken"
-  }
+    "customCode": "SUCCESS",
+    "message": "성공",
+    "statusCode": 200,
+    "data": {
+        "accessToken": "mockAccessToken",
+        "refreshToken": "mockRefreshToken"
+    }
 }
diff --git a/iOS/Layover/Layover/Scenes/Login/LoginInteractor.swift b/iOS/Layover/Layover/Scenes/Login/LoginInteractor.swift
@@ -43,7 +43,7 @@ extension LoginInteractor: LoginBusinessLogic {
             guard let token = await worker?.fetchKakaoLoginToken() else { return }
             kakaoLoginToken = token
             if await worker?.isRegisteredKakao(with: token) == true,
-                await worker?.loginKakao(with: token) == true {
+               await worker?.loginKakao(with: token) == true {
                 await MainActor.run {
                     presenter?.presentPerformLogin()
                 }
@@ -77,10 +77,10 @@ extension LoginInteractor: ASAuthorizationControllerDelegate {
             }
             appleLoginToken = identityToken
             Task {
-                async let isRegistered: Bool = worker?.isRegisteredApple(with: identityToken) ?? false
-                async let loginResult: Bool = worker?.loginApple(with: identityToken) ?? false
+                let isRegistered = await worker?.isRegisteredApple(with: identityToken)
+                let loginResult = await worker?.loginApple(with: identityToken)
 
-                if await !isRegistered, await loginResult {
+                if isRegistered == true, loginResult == true {
                     await MainActor.run {
                         presenter?.presentPerformLogin()
                     }

diff --git a/iOS/Layover/Layover/Scenes/Login/LoginWorker.swift b/iOS/Layover/Layover/Scenes/Login/LoginWorker.swift
@@ -73,7 +73,7 @@ extension LoginWorker: LoginWorkerProtocol {
         do {
             let endPoint = loginEndPointFactory.makeCheckKakaoIsSignedUpEndPoint(with: socialToken)
             let result = try await provider.request(with: endPoint, authenticationIfNeeded: false)
-            return result.data?.isValid
+            return result.data?.isAlreadyExist
         } catch {
             os_log(.error, log: .data, "%@", error.localizedDescription)
             return nil
@@ -101,7 +101,7 @@ extension LoginWorker: LoginWorkerProtocol {
         do {
             let endPoint = loginEndPointFactory.makeCheckAppleIsSignedUpEndPoint(with: identityToken)
             let result = try await provider.request(with: endPoint, authenticationIfNeeded: false)
-            return result.data?.isValid
+            return result.data?.isAlreadyExist
         } catch {
             os_log(.error, log: .data, "%@", error.localizedDescription)
             return nil

diff --git a/iOS/Layover/Layover/Workers/Mocks/MockLoginWorker.swift b/iOS/Layover/Layover/Workers/Mocks/MockLoginWorker.swift
@@ -49,7 +49,7 @@ final class MockLoginWorker: LoginWorkerProtocol {
                                                               method: .POST,
                                                               bodyParameters: bodyParameters)
             let response = try await provider.request(with: endPoint, authenticationIfNeeded: false, retryCount: 0)
-            return response.data?.isValid
+            return response.data?.isAlreadyExist
         } catch {
             os_log(.error, log: .data, "%@", error.localizedDescription)
             return nil
@@ -107,7 +107,7 @@ final class MockLoginWorker: LoginWorkerProtocol {
                                                               method: .POST,
                                                               bodyParameters: bodyParameters)
             let response = try await provider.request(with: endPoint, authenticationIfNeeded: false, retryCount: 0)
-            return response.data?.isValid
+            return response.data?.isAlreadyExist
         } catch {
             os_log(.error, log: .data, "%@", error.localizedDescription)
             return nil