Merge pull request #177 from LifePoop/176-sign_up_optional

회원가입 처리 수정

Projects/Core/CoreEntity/Sources/AgreementCondition.swift

@@ -8,7 +8,7 @@
 
 import Foundation
 
-public struct AgreementCondition {
+public struct AgreementCondition: CustomStringConvertible {
 
     public enum DescriptionTextSize {
         case large
@@ -34,6 +34,10 @@ public struct AgreementCondition {
     public let containsDetailView: Bool
     public let selectionType: SelectionType
 
+    public var description: String {
+        descriptionText
+    }
+
     public init(
         descriptionText: String,
         descriptionTextSize: DescriptionTextSize,

Projects/Core/CoreEntity/Sources/SignupInput.swift

@@ -8,19 +8,28 @@
 
 import Foundation
 
-public struct SignupInput {
+public struct SignupInput: CustomStringConvertible {
 
     public let nickname: String
-    public let birthDate: String
-    public let gender: GenderType
+    public let birthDate: String?
+    public let gender: GenderType?
     public let conditions: Set<AgreementCondition>
     public let oAuthAccessToken: String
     public let provider: LoginType
 
+    public var description: String {
+        """
+        nickname: \(nickname)
+        gender: \(gender?.description ?? "nil")
+        conditions: \(conditions)
+        loginType: \(provider.description)
+        """
+    }
+
     public init(
         nickname: String,
-        birthDate: String,
-        gender: GenderType,
+        birthDate: String?,
+        gender: GenderType?,
         conditions: Set<AgreementCondition>,
         oAuthAccessToken: String,
         provider: LoginType

Projects/DesignSystem/Sources/Component/ConditionalTextField/ConditionalTextField.swift

@@ -20,6 +20,16 @@ final public class ConditionalTextField: UIControl {
         return label
     }()
 
+    private let essentialMark: UILabel = {
+        let label = UILabel()
+        label.font = UIFont.systemFont(ofSize: 20, weight: .bold)
+        label.textColor = ColorAsset.primary.color
+        label.text = "*"
+        label.sizeToFit()
+        label.isHidden = true
+        return label
+    }()
+
     private lazy var textField: UITextField = {
         let textField = UITextField()
         textField.addTarget(self, action: #selector(textFieldDidChange), for: .editingChanged)
@@ -105,6 +115,12 @@ final public class ConditionalTextField: UIControl {
         }
     }
 
+    public var markAsEssential: Bool = false {
+        didSet {
+            essentialMark.isHidden = !markAsEssential
+        }
+    }
+
     public override var intrinsicContentSize: CGSize {
         let sumOfSubViewsHeight = self.subviews.reduce(0) { $0 + $1.bounds.height }
         let sumOfMargins: CGFloat = 42
@@ -140,6 +156,7 @@ final public class ConditionalTextField: UIControl {
     private func configureUI() {
 
         addSubview(titleLabel)
+        addSubview(essentialMark)
         addSubview(textField)
         addSubview(separatorView)
         addSubview(subLabel)
@@ -149,6 +166,11 @@ final public class ConditionalTextField: UIControl {
             make.leading.equalToSuperview()
         }
 
+        essentialMark.snp.makeConstraints { make in
+            make.top.equalToSuperview()
+            make.leading.equalTo(titleLabel.snp.trailing)
+        }
+
         textField.snp.makeConstraints { make in
             make.top.equalTo(titleLabel.snp.bottom).offset(16)
             make.leading.trailing.equalToSuperview()

Projects/Features/FeatureLogin/FeatureLoginPresentation/Sources/SignupScene/ConditionSelectionCell/ConditionSelectionView.swift

@@ -38,6 +38,16 @@ final class ConditionSelectionView: UIControl {
         return label
     }()
 
+    private let essentialMark: UILabel = {
+        let label = UILabel()
+        label.font = UIFont.systemFont(ofSize: 20, weight: .bold)
+        label.textColor = ColorAsset.primary.color
+        label.text = "*"
+        label.sizeToFit()
+        label.isHidden = true
+        return label
+    }()
+
     var isChecked: Bool = false {
         didSet {
             let image = isChecked ? selectedCheckBoxImage : deselectedCheckBoxImage
@@ -50,6 +60,12 @@ final class ConditionSelectionView: UIControl {
             descriptionLabel.text = descriptionText
         }
     }
+
+    public var markAsEssential: Bool = false {
+        didSet {
+            essentialMark.isHidden = !markAsEssential
+        }
+    }
 
     override var intrinsicContentSize: CGSize {
         let targetHeight = max(descriptionLabel.bounds.height, checkBoxImageView.bounds.height)
@@ -80,6 +96,7 @@ final class ConditionSelectionView: UIControl {
 
         addSubview(checkBoxImageView)
         addSubview(descriptionLabel)
+        addSubview(essentialMark)
 
         checkBoxImageView.snp.makeConstraints { make in
             make.leading.equalToSuperview()
@@ -90,6 +107,11 @@ final class ConditionSelectionView: UIControl {
             make.leading.equalTo(checkBoxImageView.snp.trailing).offset(16)
             make.centerY.equalToSuperview()
         }
+
+        essentialMark.snp.makeConstraints { make in
+            make.top.equalTo(descriptionLabel.snp.top)
+            make.leading.equalTo(descriptionLabel.snp.trailing)
+        }
     }
 
     func configure(with condition: AgreementCondition) {

Projects/Features/FeatureLogin/FeatureLoginPresentation/Sources/SignupScene/SignupViewController.swift

@@ -33,6 +33,7 @@ public final class SignupViewController: LifePoopViewController, ViewType {
         let textField = ConditionalTextField()
         textField.title = LocalizableString.pleaseSetNickname
         textField.placeholder = LocalizableString.nicknamePlaceholder
+        textField.markAsEssential = true
         return textField
     }()
 
@@ -73,7 +74,11 @@ public final class SignupViewController: LifePoopViewController, ViewType {
         return stackView
     }()
 
-    private let selectAllConditionView: ConditionSelectionView = ConditionSelectionView()
+    private let selectAllConditionView: ConditionSelectionView = {
+        let view = ConditionSelectionView()
+        view.markAsEssential = true
+        return view
+    }()
 
     private let conditionSelectionCollectionViewDelegate = ConditionSelectionCollectionViewDelegate()
     private lazy var conditionSelectionCollectionView: UICollectionView = {
@@ -229,6 +234,17 @@ public final class SignupViewController: LifePoopViewController, ViewType {
                 self.selectAllConditionView.configure(with: entity)
             })
             .disposed(by: disposeBag)
+
+        output.showError
+            .observe(on: MainScheduler.asyncInstance)
+            .withUnretained(self)
+            .bind(onNext: { `self`, error in
+                self.showSystemAlert(
+                    title: "Signup Error",
+                    message: error.localizedDescription
+                )
+            })
+            .disposed(by: disposeBag)
     }
 
     public override func configureUI() {

Projects/Features/FeatureLogin/FeatureLoginPresentation/Sources/SignupScene/SignupViewModel.swift

@@ -58,10 +58,13 @@ public final class SignupViewModel: ViewModelType {
         let showDetailView = PublishRelay<DocumentType>()
         let selectAllConditions = PublishRelay<Bool>()
         let activateNextButton = BehaviorRelay<Bool>(value: false)
+        let showError = PublishRelay<Error>()
     }
 
     public struct State {
         let selectedConditions = BehaviorRelay<Set<AgreementCondition>>(value: [])
+        let gender = BehaviorRelay<GenderType?>(value: nil)
+        let birthDate = BehaviorRelay<String?>(value: nil)
     }
 
     public let input = Input()
@@ -125,14 +128,17 @@ public final class SignupViewModel: ViewModelType {
             .bind(to: output.nicknameTextFieldStatus)
             .disposed(by: disposeBag)
 
-        let birthdayInputStatus = input.didEnterBirthDate
+        let birthDateInput = input.didEnterBirthDate.share()
+
+        birthDateInput
+            .bind(to: state.birthDate)
+            .disposed(by: disposeBag)
+
+        birthDateInput
             .withUnretained(self)
             .flatMap { `self`, input in
                 self.signupUseCase.isBirthdayInputValid(input)
             }
-            .share()
-
-        birthdayInputStatus
             .map { $0.status }
             .bind(to: output.birthdayTextFieldStatus)
             .disposed(by: disposeBag)
@@ -150,10 +156,17 @@ public final class SignupViewModel: ViewModelType {
             })
             .disposed(by: disposeBag)
 
-        input.didTapGenderButton
+        let genderInput = input.didTapGenderButton
             .map { GenderType.allCases[$0] }
+            .share()
+
+        genderInput
             .bind(to: output.selectGender)
             .disposed(by: disposeBag)
+
+        genderInput
+            .bind(to: state.gender)
+            .disposed(by: disposeBag)
 
         input.didTapLeftBarbutton
             .bind(onNext: { _ in
@@ -164,32 +177,32 @@ public final class SignupViewModel: ViewModelType {
         let signupInput = Observable
             .combineLatest(
                 input.didEnterNickname,
-                input.didEnterBirthDate,
-                output.selectGender,
+                state.birthDate,
+                state.gender,
                 state.selectedConditions
             )
-            .map {(nickname: $0, birthDate: $1, gender: $2, conditions: $3)}
+            .map { (nickname: $0, birthDate: $1, gender: $2, conditions: $3) }
             .share()
 
         signupInput
             .withUnretained(self)
             .flatMap { `self`, signupInfo in
                 Observable.combineLatest(
                     self.signupUseCase.isNicknameInputValid(signupInfo.nickname).map { $0.isValid },
-                    self.signupUseCase.isBirthdayInputValid(signupInfo.birthDate).map { $0.isValid },
                     self.signupUseCase.isAllEsssentialConditionsSelected(signupInfo.conditions)
                 )
             }
-            .map { $0 && $1 && $2 }
+            .map { $0 && $1 }
             .bind(to: output.activateNextButton)
             .disposed(by: disposeBag)
 
-        input.didTapNextButton
+        let requestSignup = input.didTapNextButton
             .withLatestFrom(signupInput)
             .compactMap { [weak self] nickname, birthDate, gender, conditions -> SignupInput? in
                 guard let oAuthAccessToekn = self?.authInfo.accessToken,
-                      let provider = self?.authInfo.loginType,
-                      let birthDate = self?.signupUseCase.createFormattedDateString(with: birthDate) else { return nil }
+                      let provider = self?.authInfo.loginType else { return nil }
+
+                let birthDate = self?.signupUseCase.createFormattedDateString(with: birthDate)
 
                 return SignupInput(
                     nickname: nickname,
@@ -201,14 +214,23 @@ public final class SignupViewModel: ViewModelType {
                 )
             }
             .withUnretained(self)
-            .flatMapLatest { `self`, signupInput in
+            .flatMapLatestMaterialized { `self`, signupInput in
                 self.signupUseCase.requestSignup(signupInput)
             }
+            .share()
+
+        requestSignup
+            .compactMap { $0.element }
             .bind(onNext: { isSuccess in
                 guard isSuccess else { return }
                 coordinator.coordinate(by: .finishLoginFlow)
             })
             .disposed(by: disposeBag)
+
+        requestSignup
+            .compactMap { $0.error }
+            .bind(to: output.showError)
+            .disposed(by: disposeBag)
     }
 
     private func bindCellViewModelToParent(

Projects/Features/FeatureLogin/FeatureLoginRepository/Sources/DefaultSignupRepository.swift

@@ -22,15 +22,25 @@ public final class DefaultSignupRepository: NSObject, SignupRepository {
     public override init() { }
 
     public func requestSignup(with signupInput: SignupInput) -> Single<UserAuthInfoEntity> {
-        urlSessionEndpointService
+
+        var requestBody: [String: String] = [
+            "nickname": signupInput.nickname,
+            "oAuthAccessToken": signupInput.oAuthAccessToken
+        ]
+
+        if let birthDate = signupInput.birthDate,
+           birthDate.count > 0 {
+            requestBody["birth"] = birthDate
+        }
+
+        if let gender = signupInput.gender {
+            requestBody["sex"] = gender.description
+        }
+
+        return urlSessionEndpointService
             .fetchNetworkResult(
                 endpoint: LifePoopLocalTarget.signup(provider: signupInput.provider.description),
-                with: [
-                    "nickname": signupInput.nickname,
-                    "birth": signupInput.birthDate,
-                    "sex": signupInput.gender.description,
-                    "oAuthAccessToken": signupInput.oAuthAccessToken
-                ]
+                with: requestBody
             )
             .map { networkResult -> UserAuthInfoEntity in
                 let statusCode = networkResult.statusCode
@@ -61,7 +71,11 @@ public final class DefaultSignupRepository: NSObject, SignupRepository {
             .logErrorIfDetected(category: .network, type: .error)
     }
 
-    private func createUserAuthInfo(accessToken: String?, refreshToken: String?, loginType: LoginType?) throws -> UserAuthInfoEntity {
+    private func createUserAuthInfo(
+        accessToken: String?,
+        refreshToken: String?,
+        loginType: LoginType?
+    ) throws -> UserAuthInfoEntity {
         guard let accessToken = accessToken,
               let refreshToken = refreshToken,
               let loginType = loginType else {

Projects/Features/FeatureLogin/FeatureLoginUseCase/Sources/DefaultSignupUseCase.swift

@@ -32,18 +32,13 @@ public final class DefaultSignupUseCase: SignupUseCase {
 
     /** 사용자 입력 회원가입 정보로 서버에 새로운 회원정보 추가 요청 **/
     public func requestSignup(_ signupInfo: SignupInput) -> Observable<Bool> {
-        
+
         Logger.log(
-            message: """
-            회원 가입 요청
-            nickname: \(signupInfo.nickname)
-            gender: \(signupInfo.gender.description)
-            loginType: \(signupInfo.provider.description)
-            """,
+            message: "회원가입요청:\n\(signupInfo)",
             category: .authentication,
             type: .debug
         )
-        
+
         return signupRepository.requestSignup(with: signupInfo)
             .asObservable()
             .withUnretained(self)
@@ -57,7 +52,6 @@ public final class DefaultSignupUseCase: SignupUseCase {
                         )
                     })
             }
-            .catchAndReturn(false)
     }
 
     public func fetchSelectableConditions() -> Observable<[AgreementCondition]> {
@@ -116,7 +110,8 @@ public final class DefaultSignupUseCase: SignupUseCase {
     }
 
     // TODO: 추후에 Utils에 구현된 부분으로 대체 가능한 지 확인 후 제거
-    public func createFormattedDateString(with dateString: String) -> String? {
+    public func createFormattedDateString(with dateString: String?) -> String? {
+        guard let dateString = dateString else { return nil }
 
         let inputDateFormatter = DateFormatter()
         inputDateFormatter.dateFormat = "yyMMdd"