From 94ed7e3c1f5c804fc1153e81c89b69b1806fcf34 Mon Sep 17 00:00:00 2001 From: junseokNoh Date: Fri, 16 Jul 2021 04:33:42 +0900 Subject: [PATCH 1/2] refactoring code --- KNU_CSE/KNU_CSE/SignIn/SignInView.swift | 1 - KNU_CSE/KNU_CSE/SignUp/SignUpView.swift | 2 -- .../Web Service/GetEventListApiRequest.swift | 14 +------------- 3 files changed, 1 insertion(+), 16 deletions(-) diff --git a/KNU_CSE/KNU_CSE/SignIn/SignInView.swift b/KNU_CSE/KNU_CSE/SignIn/SignInView.swift index 3466e0a..b5a81d1 100644 --- a/KNU_CSE/KNU_CSE/SignIn/SignInView.swift +++ b/KNU_CSE/KNU_CSE/SignIn/SignInView.swift @@ -149,7 +149,6 @@ class ViewController: UIViewController { let title_height = 200 let height = 40 let top_padding = 20 - let title_To_textField_margin = 3 let left_margin = 30 let right_margin = -30 diff --git a/KNU_CSE/KNU_CSE/SignUp/SignUpView.swift b/KNU_CSE/KNU_CSE/SignUp/SignUpView.swift index 1c5d4e9..216b7b7 100644 --- a/KNU_CSE/KNU_CSE/SignUp/SignUpView.swift +++ b/KNU_CSE/KNU_CSE/SignUp/SignUpView.swift @@ -499,8 +499,6 @@ class SignUpView: UIViewController { make.top.equalTo(majorCom.snp.bottom).offset(top_padding) make.height.equalTo(height) } - - } } diff --git a/KNU_CSE/KNU_CSE/Web Service/GetEventListApiRequest.swift b/KNU_CSE/KNU_CSE/Web Service/GetEventListApiRequest.swift index 1cf0bd6..8b13789 100644 --- a/KNU_CSE/KNU_CSE/Web Service/GetEventListApiRequest.swift +++ b/KNU_CSE/KNU_CSE/Web Service/GetEventListApiRequest.swift @@ -1,13 +1 @@ -// -// 1.swift -// MVVM_Practice -// -// Created by junseok on 2021/07/09. -// -// -//class GetEventListApiRequest: BaseApiRequest { -// var enviroment: Environment -// -// var requestBodyObject: BaseObject? -// var requestMethod: RequestHttpMethod? -//} + From ec6ec4168c23f00fe3b246f31a14d838de2bb037 Mon Sep 17 00:00:00 2001 From: junseokNoh Date: Fri, 16 Jul 2021 15:18:43 +0900 Subject: [PATCH 2/2] Edit Reqeust format --- KNU_CSE/KNU_CSE.xcodeproj/project.pbxproj | 20 +++++++++------- ...ignUpUiLabel.swift => SignUpUILabel.swift} | 0 KNU_CSE/KNU_CSE/SignIn/SignInModel.swift | 23 +++++++++++++++++++ KNU_CSE/KNU_CSE/SignIn/SignInView.swift | 3 +-- KNU_CSE/KNU_CSE/SignIn/SignInViewModel.swift | 8 +++++-- KNU_CSE/KNU_CSE/SignUp/SignUpViewModel.swift | 2 +- .../{SingUpRequest.swift => Request.swift} | 4 ++-- 7 files changed, 45 insertions(+), 15 deletions(-) rename KNU_CSE/KNU_CSE/Custom/{SignUpUiLabel.swift => SignUpUILabel.swift} (100%) create mode 100644 KNU_CSE/KNU_CSE/SignIn/SignInModel.swift rename KNU_CSE/KNU_CSE/Web Service/{SingUpRequest.swift => Request.swift} (90%) diff --git a/KNU_CSE/KNU_CSE.xcodeproj/project.pbxproj b/KNU_CSE/KNU_CSE.xcodeproj/project.pbxproj index 79862f3..cfe6160 100644 --- a/KNU_CSE/KNU_CSE.xcodeproj/project.pbxproj +++ b/KNU_CSE/KNU_CSE.xcodeproj/project.pbxproj @@ -15,7 +15,7 @@ 68F1A5C426A0088D007B4B86 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 68F1A5C226A0088D007B4B86 /* LaunchScreen.storyboard */; }; 68F1A5CF26A0088D007B4B86 /* KNU_CSETests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 68F1A5CE26A0088D007B4B86 /* KNU_CSETests.swift */; }; 68F1A5DA26A0088D007B4B86 /* KNU_CSEUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 68F1A5D926A0088D007B4B86 /* KNU_CSEUITests.swift */; }; - 68F1A5EC26A008FF007B4B86 /* SingUpRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 68F1A5E826A008FF007B4B86 /* SingUpRequest.swift */; }; + 68F1A5EC26A008FF007B4B86 /* Request.swift in Sources */ = {isa = PBXBuildFile; fileRef = 68F1A5E826A008FF007B4B86 /* Request.swift */; }; 68F1A5ED26A008FF007B4B86 /* GetEventListApiRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 68F1A5E926A008FF007B4B86 /* GetEventListApiRequest.swift */; }; 68F1A5EE26A008FF007B4B86 /* BaseObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = 68F1A5EA26A008FF007B4B86 /* BaseObject.swift */; }; 68F1A5EF26A008FF007B4B86 /* BaseApiRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 68F1A5EB26A008FF007B4B86 /* BaseApiRequest.swift */; }; @@ -24,9 +24,10 @@ 68F1A5F826A0090B007B4B86 /* SignUpViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 68F1A5F326A0090B007B4B86 /* SignUpViewModel.swift */; }; 68F1A5F926A0090B007B4B86 /* BindingTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 68F1A5F526A0090B007B4B86 /* BindingTextField.swift */; }; 68F1A5FC26A01080007B4B86 /* SignInViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 68F1A5FB26A01080007B4B86 /* SignInViewModel.swift */; }; - 68F1A5FE26A07147007B4B86 /* SignUpUiLabel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 68F1A5FD26A07147007B4B86 /* SignUpUiLabel.swift */; }; + 68F1A5FE26A07147007B4B86 /* SignUpUILabel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 68F1A5FD26A07147007B4B86 /* SignUpUILabel.swift */; }; 68F1A60026A07FE7007B4B86 /* CheckBox.swift in Sources */ = {isa = PBXBuildFile; fileRef = 68F1A5FF26A07FE7007B4B86 /* CheckBox.swift */; }; 68F1A60326A0A73B007B4B86 /* Color.swift in Sources */ = {isa = PBXBuildFile; fileRef = 68F1A60226A0A73B007B4B86 /* Color.swift */; }; + 68F1A60526A1598A007B4B86 /* SignInModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 68F1A60426A1598A007B4B86 /* SignInModel.swift */; }; 9AACC46FE6327A8A8FEE1371 /* Pods_KNU_CSE.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0AEB9BE74D13DB6D6DE35FAE /* Pods_KNU_CSE.framework */; }; AE59CA79AE6C9CF423411766 /* Pods_KNU_CSE_KNU_CSEUITests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C3849D4B5E75A8D54F61D53 /* Pods_KNU_CSE_KNU_CSEUITests.framework */; }; B614ABCE044BEAE18AECD334 /* Pods_KNU_CSETests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7F57A9F2B8C44351C36B27DE /* Pods_KNU_CSETests.framework */; }; @@ -67,7 +68,7 @@ 68F1A5D526A0088D007B4B86 /* KNU_CSEUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = KNU_CSEUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 68F1A5D926A0088D007B4B86 /* KNU_CSEUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KNU_CSEUITests.swift; sourceTree = ""; }; 68F1A5DB26A0088D007B4B86 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 68F1A5E826A008FF007B4B86 /* SingUpRequest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SingUpRequest.swift; sourceTree = ""; }; + 68F1A5E826A008FF007B4B86 /* Request.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Request.swift; sourceTree = ""; }; 68F1A5E926A008FF007B4B86 /* GetEventListApiRequest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GetEventListApiRequest.swift; sourceTree = ""; }; 68F1A5EA26A008FF007B4B86 /* BaseObject.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BaseObject.swift; sourceTree = ""; }; 68F1A5EB26A008FF007B4B86 /* BaseApiRequest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BaseApiRequest.swift; sourceTree = ""; }; @@ -76,9 +77,10 @@ 68F1A5F326A0090B007B4B86 /* SignUpViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SignUpViewModel.swift; sourceTree = ""; }; 68F1A5F526A0090B007B4B86 /* BindingTextField.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BindingTextField.swift; sourceTree = ""; }; 68F1A5FB26A01080007B4B86 /* SignInViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignInViewModel.swift; sourceTree = ""; }; - 68F1A5FD26A07147007B4B86 /* SignUpUiLabel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignUpUiLabel.swift; sourceTree = ""; }; + 68F1A5FD26A07147007B4B86 /* SignUpUILabel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignUpUILabel.swift; sourceTree = ""; }; 68F1A5FF26A07FE7007B4B86 /* CheckBox.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CheckBox.swift; sourceTree = ""; }; 68F1A60226A0A73B007B4B86 /* Color.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Color.swift; sourceTree = ""; }; + 68F1A60426A1598A007B4B86 /* SignInModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignInModel.swift; sourceTree = ""; }; 7F57A9F2B8C44351C36B27DE /* Pods_KNU_CSETests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_KNU_CSETests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 8A621397DE389C29CC60A0AD /* Pods-KNU_CSE.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-KNU_CSE.debug.xcconfig"; path = "Target Support Files/Pods-KNU_CSE/Pods-KNU_CSE.debug.xcconfig"; sourceTree = ""; }; 949F8006B59C6CB5B5F67EA7 /* Pods-KNU_CSETests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-KNU_CSETests.debug.xcconfig"; path = "Target Support Files/Pods-KNU_CSETests/Pods-KNU_CSETests.debug.xcconfig"; sourceTree = ""; }; @@ -176,7 +178,7 @@ 68F1A5E726A008FF007B4B86 /* Web Service */ = { isa = PBXGroup; children = ( - 68F1A5E826A008FF007B4B86 /* SingUpRequest.swift */, + 68F1A5E826A008FF007B4B86 /* Request.swift */, 68F1A5E926A008FF007B4B86 /* GetEventListApiRequest.swift */, 68F1A5EA26A008FF007B4B86 /* BaseObject.swift */, 68F1A5EB26A008FF007B4B86 /* BaseApiRequest.swift */, @@ -198,7 +200,7 @@ isa = PBXGroup; children = ( 68F1A5F526A0090B007B4B86 /* BindingTextField.swift */, - 68F1A5FD26A07147007B4B86 /* SignUpUiLabel.swift */, + 68F1A5FD26A07147007B4B86 /* SignUpUILabel.swift */, 68F1A5FF26A07FE7007B4B86 /* CheckBox.swift */, ); path = Custom; @@ -207,6 +209,7 @@ 68F1A5FA26A01028007B4B86 /* SignIn */ = { isa = PBXGroup; children = ( + 68F1A60426A1598A007B4B86 /* SignInModel.swift */, 68F1A5BB26A0088B007B4B86 /* SignInView.swift */, 68F1A5FB26A01080007B4B86 /* SignInViewModel.swift */, ); @@ -487,6 +490,7 @@ 68F1A5B826A0088B007B4B86 /* AppDelegate.swift in Sources */, 68F1A5ED26A008FF007B4B86 /* GetEventListApiRequest.swift in Sources */, 68F1A5F826A0090B007B4B86 /* SignUpViewModel.swift in Sources */, + 68F1A60526A1598A007B4B86 /* SignInModel.swift in Sources */, 68F1A5EF26A008FF007B4B86 /* BaseApiRequest.swift in Sources */, 68F1A5BA26A0088B007B4B86 /* SceneDelegate.swift in Sources */, 68F1A5F626A0090B007B4B86 /* SignUpModel.swift in Sources */, @@ -494,9 +498,9 @@ 68F1A5FC26A01080007B4B86 /* SignInViewModel.swift in Sources */, 68F1A5F926A0090B007B4B86 /* BindingTextField.swift in Sources */, 68F1A60026A07FE7007B4B86 /* CheckBox.swift in Sources */, - 68F1A5EC26A008FF007B4B86 /* SingUpRequest.swift in Sources */, + 68F1A5EC26A008FF007B4B86 /* Request.swift in Sources */, 68F1A5EE26A008FF007B4B86 /* BaseObject.swift in Sources */, - 68F1A5FE26A07147007B4B86 /* SignUpUiLabel.swift in Sources */, + 68F1A5FE26A07147007B4B86 /* SignUpUILabel.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/KNU_CSE/KNU_CSE/Custom/SignUpUiLabel.swift b/KNU_CSE/KNU_CSE/Custom/SignUpUILabel.swift similarity index 100% rename from KNU_CSE/KNU_CSE/Custom/SignUpUiLabel.swift rename to KNU_CSE/KNU_CSE/Custom/SignUpUILabel.swift diff --git a/KNU_CSE/KNU_CSE/SignIn/SignInModel.swift b/KNU_CSE/KNU_CSE/SignIn/SignInModel.swift new file mode 100644 index 0000000..7fae60a --- /dev/null +++ b/KNU_CSE/KNU_CSE/SignIn/SignInModel.swift @@ -0,0 +1,23 @@ +// +// File.swift +// KNU_CSE +// +// Created by junseok on 2021/07/16. +// + +import Foundation + +class SignInModel : BaseObject{ + var email : String + var password : String + + init(email:String, password:String) { + self.email = email + self.password = password + super.init() + } + + required init(from decoder: Decoder) throws { + fatalError("init(from:) has not been implemented") + } +} diff --git a/KNU_CSE/KNU_CSE/SignIn/SignInView.swift b/KNU_CSE/KNU_CSE/SignIn/SignInView.swift index b5a81d1..32c4876 100644 --- a/KNU_CSE/KNU_CSE/SignIn/SignInView.swift +++ b/KNU_CSE/KNU_CSE/SignIn/SignInView.swift @@ -11,7 +11,7 @@ import M13Checkbox class ViewController: UIViewController { - var signInViewModel : SignUpViewModel = SignUpViewModel(listener: nil) + var signInViewModel : SignInViewModel = SignInViewModel(listener: nil) var accountUI : UIView! { didSet{ @@ -54,7 +54,6 @@ class ViewController: UIViewController { if response.result == 1 { let alert = UIAlertController(title: "회원가입성공", message: "확인 버튼을 누르면 로그인 페이지로 이동합니다.", preferredStyle: .alert) let actionDefault = UIAlertAction(title: "확인", style: .default){ (action) in - } alert.addAction(actionDefault) self.present(alert, animated: true, completion: nil) diff --git a/KNU_CSE/KNU_CSE/SignIn/SignInViewModel.swift b/KNU_CSE/KNU_CSE/SignIn/SignInViewModel.swift index bfeb948..eaee46a 100644 --- a/KNU_CSE/KNU_CSE/SignIn/SignInViewModel.swift +++ b/KNU_CSE/KNU_CSE/SignIn/SignInViewModel.swift @@ -12,8 +12,7 @@ import UIKit class SignInViewModel { typealias Listener = (Account) -> Void var listener: Listener? - var account: Account = Account(email: "", password: "", password2: "", username: "", nickname: "", student_id: "", gender: "", major: "") - + var account: SignInModel = SignInModel(email: "", password: "") init(listener : Listener?){ self.listener = listener @@ -22,5 +21,10 @@ class SignInViewModel { func bind(listener: Listener?) { self.listener = listener } + + public func getEvent(successHandler: @escaping (Response) -> (), failHandler: @escaping (Error) -> ()) { + let signUpRequest = Request(requestBodyObject: self.account, requestMethod: .Post, enviroment: .SignIn) + signUpRequest.sendRequest(request: signUpRequest, type: Response.self, successHandler: successHandler, failHandler: failHandler) + } } diff --git a/KNU_CSE/KNU_CSE/SignUp/SignUpViewModel.swift b/KNU_CSE/KNU_CSE/SignUp/SignUpViewModel.swift index 6c4ca40..b55b497 100644 --- a/KNU_CSE/KNU_CSE/SignUp/SignUpViewModel.swift +++ b/KNU_CSE/KNU_CSE/SignUp/SignUpViewModel.swift @@ -23,7 +23,7 @@ class SignUpViewModel { } public func getEvent(successHandler: @escaping (Response) -> (), failHandler: @escaping (Error) -> ()) { - let signUpRequest = SignUpRequest(requestBodyObject: self.account, requestMethod: .Post, enviroment: .SignUp) + let signUpRequest = Request(requestBodyObject: self.account, requestMethod: .Post, enviroment: .SignUp) signUpRequest.sendRequest(request: signUpRequest, type: Response.self, successHandler: successHandler, failHandler: failHandler) } diff --git a/KNU_CSE/KNU_CSE/Web Service/SingUpRequest.swift b/KNU_CSE/KNU_CSE/Web Service/Request.swift similarity index 90% rename from KNU_CSE/KNU_CSE/Web Service/SingUpRequest.swift rename to KNU_CSE/KNU_CSE/Web Service/Request.swift index 406661c..ab9cd6f 100644 --- a/KNU_CSE/KNU_CSE/Web Service/SingUpRequest.swift +++ b/KNU_CSE/KNU_CSE/Web Service/Request.swift @@ -6,12 +6,12 @@ // import Alamofire -struct SignUpRequest: BaseApiRequest { +struct Request: BaseApiRequest { var requestBodyObject: BaseObject? var requestMethod: RequestHttpMethod? = RequestHttpMethod.Post var enviroment: Environment? - mutating func setBodyObject(bodyObject: Account) { + mutating func setBodyObject(bodyObject: BaseObject?) { self.requestBodyObject = bodyObject }