✨ [FEAT] 회원가입 UI + API 수정 (+ 로그인 UI)

NadoSunbae-iOS/NadoSunbae-iOS/Global/UIComponent/Xib/HalfModalVC.swift

@@ -15,10 +15,10 @@ enum ModalType {
     case search
 }
 
-class HalfModalVC: UIViewController {
+class HalfModalVC: BaseVC {
 
     // MARK: Components
-    private let titleLabel = UILabel().then {
+    let titleLabel = UILabel().then {
         $0.font = .PretendardM(size: 16)
         $0.textColor = .black
         $0.text = "학과선택"
@@ -32,19 +32,19 @@ class HalfModalVC: UIViewController {
         $0.backgroundColor = .mainDefault
     }
 
-    private let majorTV = UITableView()
+    let majorTV = UITableView()
 
-    private let completeBtn = NadoSunbaeBtn().then {
+    let completeBtn = NadoSunbaeBtn().then {
         $0.isActivated = false
         $0.setTitle("선택 완료", for: .normal)
     }
 
-    private let searchTextField = NadoTextField().then {
+    let searchTextField = NadoTextField().then {
         $0.setSearchStyle()
     }
 
     // MARK: Properties
-    private var majorList: [MajorInfoModel] = []
+    var majorList: [MajorInfoModel] = []
     var selectMajorDelegate: SendUpdateModalDelegate?
     var selectFilterDelegate: SendUpdateStatusDelegate?
     var vcType: ModalType = .basic
@@ -64,7 +64,7 @@ class HalfModalVC: UIViewController {
 
 // MARK: - UI
 extension HalfModalVC {
-    private func configureUI(type: ModalType) {
+    func configureUI(type: ModalType) {
         view.backgroundColor = .white
         view.addSubviews([titleLabel, cancelBtn, lineView, majorTV, completeBtn, searchTextField])
 

NadoSunbae-iOS/NadoSunbae-iOS/Network/APIManagers/SignAPI.swift

@@ -8,11 +8,11 @@
 import Foundation
 import Moya
 
-class SignAPI {
+class SignAPI: BaseAPI {
     static let shared = SignAPI()
     private var provider = MoyaProvider<SignService>()
 
-    private init() {}
+    override private init() {}
 }
 
 // MARK: - API
@@ -42,7 +42,8 @@ extension SignAPI {
                 let statusCode = response.statusCode
                 let data = response.data
 
-                completion(self.signUpJudgeData(status: statusCode, data: data))
+                let networkResult = self.judgeStatus(by: statusCode, data, SignUpDataModel.self)
+                completion(networkResult)
 
             case .failure(let err):
                 print(err.localizedDescription)
@@ -58,7 +59,8 @@ extension SignAPI {
                 let statusCode = response.statusCode
                 let data = response.data
 
-                completion(self.checkNickNameDuplicateJudgeData(status: statusCode, data: data))
+                let networkResult = self.judgeStatus(by: statusCode, data, String.self)
+                completion(networkResult)
 
             case .failure(let err):
                 print(err.localizedDescription)
@@ -74,7 +76,8 @@ extension SignAPI {
                 let statusCode = response.statusCode
                 let data = response.data
 
-                completion(self.checkEmailDuplicateJudgeData(status: statusCode, data: data))
+                let networkResult = self.judgeStatus(by: statusCode, data, String.self)
+                completion(networkResult)
 
             case .failure(let err):
                 print(err.localizedDescription)
@@ -90,7 +93,8 @@ extension SignAPI {
                 let statusCode = response.statusCode
                 let data = response.data
 
-                completion(self.signOutJudgeData(status: statusCode, data: data))
+                let networkResult = self.judgeStatus(by: statusCode, data, SignOutResponseModel.self)
+                completion(networkResult)
 
             case .failure(let err):
                 print(err.localizedDescription)
@@ -106,23 +110,25 @@ extension SignAPI {
                 let statusCode = response.statusCode
                 let data = response.data
 
-                completion(self.withDrawJudgeData(status: statusCode, data: data))
+                let networkResult = self.judgeStatus(by: statusCode, data, WithDrawResponseModel.self)
+                completion(networkResult)
 
             case .failure(let err):
                 print(err.localizedDescription)
             }
         }
     }
 
-    /// [POST] 로그인 요청
+    /// [POST] 회원가입 이메일 재전송 요청
     func resendSignUpMail(email: String, PW: String, completion: @escaping (NetworkResult<Any>) -> (Void)) {
         provider.request(.resendSignUpMail(email: email, PW: PW)) { result in
             switch result {
             case .success(let response):
                 let statusCode = response.statusCode
                 let data = response.data
 
-                completion(self.resendSignUpMailJudgeData(status: statusCode, data: data))
+                let networkResult = self.judgeStatus(by: statusCode, data, ResendSignUpMailResponseModel.self)
+                completion(networkResult)
 
             case .failure(let err):
                 print(err.localizedDescription)
@@ -138,7 +144,25 @@ extension SignAPI {
                 let statusCode = response.statusCode
                 let data = response.data
 
-                completion(self.updateTokenJudgeData(status: statusCode, data: data))
+                let networkResult = self.judgeStatus(by: statusCode, data, SignInDataModel.self)
+                completion(networkResult)
+
+            case .failure(let err):
+                print(err.localizedDescription)
+            }
+        }
+    }
+
+    /// [GET] 학교 이메일 도메인 조회
+    func getUnivEmailDomain(univID: Int, completion: @escaping (NetworkResult<Any>) -> (Void)) {
+        provider.request(.getUnivEmailDomain(univID: univID)) { result in
+            switch result {
+            case .success(let response):
+                let statusCode = response.statusCode
+                let data = response.data
+
+                let networkResult = self.judgeStatus(by: statusCode, data, UnivEmailDomainDataModel.self)
+                completion(networkResult)
 
             case .failure(let err):
                 print(err.localizedDescription)
@@ -168,126 +192,4 @@ extension SignAPI {
             return .networkFail
         }
     }
-
-    private func signUpJudgeData(status: Int, data: Data) -> NetworkResult<Any> {
-        let decoder = JSONDecoder()
-
-        guard let decodedData = try? decoder.decode(GenericResponse<SignUpDataModel>.self, from: data) else { return .pathErr }
-
-        switch status {
-        case 200...204:
-            return .success(decodedData.data ?? "None-Data")
-        case 400...409:
-            return .requestErr(decodedData.message)
-        case 500:
-            return .serverErr
-        default:
-            return .networkFail
-        }
-    }
-
-    private func checkNickNameDuplicateJudgeData(status: Int, data: Data) -> NetworkResult<Any> {
-        let decoder = JSONDecoder()
-
-        guard let decodedData = try? decoder.decode(GenericResponse<String>.self, from: data) else { return .pathErr }
-
-        switch status {
-        case 200...204:
-            return .success(decodedData.data ?? "None-Data")
-        case 400...408:
-            return .requestErr(decodedData.message)
-        case 409:
-            return .requestErr(false)
-        case 500:
-            return .serverErr
-        default:
-            return .networkFail
-        }
-    }
-
-    private func checkEmailDuplicateJudgeData(status: Int, data: Data) -> NetworkResult<Any> {
-        let decoder = JSONDecoder()
-
-        guard let decodedData = try? decoder.decode(GenericResponse<String>.self, from: data) else { return .pathErr }
-
-        switch status {
-        case 200...204:
-            return .success(decodedData.data ?? "None-Data")
-        case 400...408:
-            return .requestErr(decodedData.message)
-        case 409:
-            return .requestErr(false)
-        case 500:
-            return .serverErr
-        default:
-            return .networkFail
-        }
-    }
-
-    private func signOutJudgeData(status: Int, data: Data) -> NetworkResult<Any> {
-        let decoder = JSONDecoder()
-
-        guard let decodedData = try? decoder.decode(SignOutResponseModel.self, from: data) else { return .pathErr }
-
-        switch status {
-        case 200...204:
-            return .success(decodedData.message)
-        case 401:
-            return .requestErr(false)
-        case 400, 402...409:
-            return .requestErr(decodedData.message)
-        case 500:
-            return .serverErr
-        default:
-            return .networkFail
-        }
-    }
-
-    private func withDrawJudgeData(status: Int, data: Data) -> NetworkResult<Any> {
-        let decoder = JSONDecoder()
-
-        guard let decodedData = try? decoder.decode(GenericResponse<WithDrawResponseModel>.self, from: data) else { return .pathErr }
-        switch status {
-        case 200...204:
-            return .success(decodedData.message)
-        case 400...409:
-            return .requestErr(decodedData.message)
-        case 500:
-            return .serverErr
-        default:
-            return .networkFail
-        }
-    }
-
-    private func resendSignUpMailJudgeData(status: Int, data: Data) -> NetworkResult<Any> {
-        let decoder = JSONDecoder()
-
-        guard let decodedData = try? decoder.decode(GenericResponse<ResendSignUpMailResponseModel>.self, from: data) else { return .pathErr }
-        switch status {
-        case 200...204:
-            return .success(decodedData.message)
-        case 400...409:
-            return .requestErr(decodedData.message)
-        case 500:
-            return .serverErr
-        default:
-            return .networkFail
-        }
-    }
-
-    private func updateTokenJudgeData(status: Int, data: Data) -> NetworkResult<Any> {
-        let decoder = JSONDecoder()
-
-        guard let decodedData = try? decoder.decode(GenericResponse<SignInDataModel>.self, from: data) else { return .pathErr }
-        switch status {
-        case 200...204:
-            return .success(decodedData.data ?? "None-Data")
-        case 400...409:
-            return .requestErr(decodedData.message)
-        case 500:
-            return .serverErr
-        default:
-            return .networkFail
-        }
-    }
 }

NadoSunbae-iOS/NadoSunbae-iOS/Network/APIModels/Models/Sign/UnivEmailDomainDataModel.swift

@@ -0,0 +1,12 @@
+//
+//  UnivEmailDomainDataModel.swift
+//  NadoSunbae
+//
+//  Created by madilyn on 2022/09/13.
+//
+
+import Foundation
+
+struct UnivEmailDomainDataModel: Codable {
+    let email: String
+}

NadoSunbae-iOS/NadoSunbae-iOS/Network/MoyaTarget/SignService.swift

@@ -17,6 +17,7 @@ enum SignService {
     case requestWithDraw(PW: String)
     case resendSignUpMail(email: String, PW: String)
     case updateToken(refreshToken: String)
+    case getUnivEmailDomain(univID: Int)
 }
 
 extension SignService: TargetType {
@@ -42,13 +43,17 @@ extension SignService: TargetType {
             return "/auth/certification/email"
         case .updateToken:
             return "/auth/renewal/token"
+        case .getUnivEmailDomain(let univID):
+            return "auth/university/\(univID)"
         }
     }
 
     var method: Moya.Method {
         switch self {
         case .requestSignIn, .requestSignUp, .checkNickNameDuplicate, .checkEmailDuplicate, .requestSignOut, .resendSignUpMail, .requestWithDraw, .updateToken:
             return .post
+        case .getUnivEmailDomain:
+            return .get
         }
     }
 
@@ -71,7 +76,7 @@ extension SignService: TargetType {
             return .requestParameters(parameters: ["nickname": nickName], encoding: JSONEncoding.default)
         case .checkEmailDuplicate(let email):
             return .requestParameters(parameters: ["email": email], encoding: JSONEncoding.default)
-        case .requestSignOut, .updateToken:
+        case .requestSignOut, .updateToken, .getUnivEmailDomain:
             return .requestPlain
         case .requestWithDraw(let PW):
             return .requestParameters(parameters: ["password": PW], encoding: JSONEncoding.default)

NadoSunbae-iOS/NadoSunbae-iOS/Screen/Mypage/ProfileSetting/VC/EditProfileVC.swift

@@ -94,19 +94,20 @@ class EditProfileVC: BaseVC {
     }
 
     @IBAction func tapSelectMajorORStartBtn(_ sender: UIButton) {
-        guard let slideVC = UIStoryboard.init(name: SelectMajorModalVC.className, bundle: nil).instantiateViewController(withIdentifier: SelectMajorModalVC.className) as? SelectMajorModalVC else { return }
-
-        /// 제2전공 진입시기 선택 버튼을 탭했는데, 제2전공이 선택되어있지 않을 경우
-        if !(sender.tag == 3 && secondMajorTextField.text == "미진입") {
-            slideVC.enterdBtnTag = sender.tag
-            self.enterBtnTag = sender.tag
-
-            slideVC.modalPresentationStyle = .custom
-            slideVC.transitioningDelegate = self
-            slideVC.selectMajorDelegate = self
-
-            self.present(slideVC, animated: true, completion: nil)
-        }
+        // TODO: SignUpModalVC로 변경
+//        guard let slideVC = UIStoryboard.init(name: SelectMajorModalVC.className, bundle: nil).instantiateViewController(withIdentifier: SelectMajorModalVC.className) as? SelectMajorModalVC else { return }
+//
+//        /// 제2전공 진입시기 선택 버튼을 탭했는데, 제2전공이 선택되어있지 않을 경우
+//        if !(sender.tag == 3 && secondMajorTextField.text == "미진입") {
+//            slideVC.enterdBtnTag = sender.tag
+//            self.enterBtnTag = sender.tag
+//
+//            slideVC.modalPresentationStyle = .custom
+//            slideVC.transitioningDelegate = self
+//            slideVC.selectMajorDelegate = self
+//
+//            self.present(slideVC, animated: true, completion: nil)
+//        }
     }
 
     // MARK: Custom Methods