Merge pull request #196 from GSM-MSG/195-delete-CreateClubCode

🔀 :: [#195] 개설신청서 관련 코드 삭제
GSM-MSG · Dec 28, 2023 · 4400fb3 · 4400fb3
2 parents 627c2c0 + bce228c
commit 4400fb3
Show file tree

Hide file tree

Showing 26 changed files with 228 additions and 1,565 deletions.
diff --git a/Service/Sources/DI/UseCaseAssembly.swift b/Service/Sources/DI/UseCaseAssembly.swift
@@ -31,11 +31,6 @@ public final class UseCaseAssembly: Assembly {
                 clubRepository: r.resolve(ClubRepository.self)!
             )
         }
-        container.register(CreateNewClubUseCase.self) { r in
-             CreateNewClubUseCase(
-                clubRepository: r.resolve(ClubRepository.self)!
-            )
-        }
         container.register(DeleteClubUseCase.self) { r in
              DeleteClubUseCase(
                 clubRepository: r.resolve(ClubRepository.self)!

diff --git a/Service/Sources/Data/DataSource/Remote/API/ClubAPI.swift b/Service/Sources/Data/DataSource/Remote/API/ClubAPI.swift
@@ -3,7 +3,6 @@ import Moya
 enum ClubAPI {
     case clubList(type: ClubType)
     case clubDetail(clubID: Int)
-    case createNewClub(req: NewClubRequest)
     case updateClub(clubID: Int, req: UpdateClubRequest)
     case deleteClub(clubID: Int)
     case clubOpen(clubID: Int)
@@ -18,7 +17,7 @@ extension ClubAPI: GCMSAPI {
 
     var urlPath: String {
         switch self {
-        case .clubList, .createNewClub:
+        case .clubList:
             return ""
 
         case let .clubDetail(clubID), let .updateClub(clubID, _), let .deleteClub(clubID):
@@ -40,9 +39,6 @@ extension ClubAPI: GCMSAPI {
         case .clubList, .clubDetail:
             return .get
 
-        case .createNewClub:
-            return .post
-
         case .updateClub, .clubOpen, .clubClose:
             return .patch
 
@@ -61,9 +57,6 @@ extension ClubAPI: GCMSAPI {
         case .clubDetail, .clubOpen, .clubClose, .exitClub, .deleteClub:
             return .requestPlain
 
-        case let .createNewClub(req):
-            return .requestJSONEncodable(req)
-
         case let .updateClub(_, req):
             return .requestJSONEncodable(req)
         }
@@ -93,14 +86,6 @@ extension ClubAPI: GCMSAPI {
                 500: .serverError
             ]
 
-        case .createNewClub:
-            return [
-                400: .invalidInput,
-                401: .unauthorized,
-                409: .alreadyExistClub,
-                500: .serverError
-            ]
-
         case .updateClub:
             return [
                 400: .invalidInput,

diff --git a/Service/Sources/Data/DataSource/Remote/DataSource/ClubRemote.swift b/Service/Sources/Data/DataSource/Remote/DataSource/ClubRemote.swift
@@ -3,7 +3,6 @@ import RxSwift
 protocol ClubRemoteProtocol {
     func fetchClubList(type: ClubType) -> Single<[ClubList]>
     func fetchDetailClub(clubID: Int) -> Single<Club>
-    func createNewClub(req: NewClubRequest) -> Completable
     func updateClub(clubID: Int, req: UpdateClubRequest) -> Completable
     func deleteClub(clubID: Int) -> Completable
     func clubOpen(clubID: Int) -> Completable
@@ -24,11 +23,6 @@ final class ClubRemote: BaseRemote<ClubAPI>, ClubRemoteProtocol {
             .map { $0.toDomain() }
     }
 
-    func createNewClub(req: NewClubRequest) -> Completable {
-        request(.createNewClub(req: req))
-            .asCompletable()
-    }
-
     func updateClub(clubID: Int, req: UpdateClubRequest) -> Completable {
         request(.updateClub(clubID: clubID, req: req))
             .asCompletable()

diff --git a/Service/Sources/Data/Repositories/DefaultClubRepository.swift b/Service/Sources/Data/Repositories/DefaultClubRepository.swift
@@ -24,10 +24,6 @@ final class DefaultClubRepository: ClubRepository {
         clubRemote.fetchDetailClub(clubID: clubID)
     }
 
-    func createNewClub(req: NewClubRequest) -> Completable {
-        clubRemote.createNewClub(req: req)
-    }
-
     func updateClub(clubID: Int, req: UpdateClubRequest) -> Completable {
         clubRemote.updateClub(clubID: clubID, req: req)
     }

diff --git a/Service/Sources/Domain/Repositories/ClubRepository.swift b/Service/Sources/Domain/Repositories/ClubRepository.swift
@@ -3,7 +3,6 @@ import RxSwift
 public protocol ClubRepository {
     func fetchClubList(type: ClubType) -> Observable<[ClubList]>
     func fetchDetailClub(clubID: Int) -> Single<Club>
-    func createNewClub(req: NewClubRequest) -> Completable
     func updateClub(clubID: Int, req: UpdateClubRequest) -> Completable
     func deleteClub(clubID: Int) -> Completable
     func clubOpen(clubID: Int) -> Completable

diff --git a/Service/Sources/Domain/UseCases/Club/CreateNewClubUseCase.swift b/Service/Sources/Domain/UseCases/Club/CreateNewClubUseCase.swift
diff --git a/iOS/Sources/Application/DI/Assembly/ReactorAssembly.swift b/iOS/Sources/Application/DI/Assembly/ReactorAssembly.swift
@@ -39,13 +39,6 @@ final class ReactorAssembly: Assembly {
             )
         }
 
-        container.register(NewClubReactor.self) { r in
-             NewClubReactor(
-                createNewClubUseCase: r.resolve(CreateNewClubUseCase.self)!,
-                uploadImagesUseCase: r.resolve(UploadImagesUseCase.self)!
-            )
-        }
-
         container.register(UpdateClubReactor.self) { r, club in
             UpdateClubReactor(
                 club: club,
@@ -55,14 +48,6 @@ final class ReactorAssembly: Assembly {
             )
         }
 
-        container.register(MemberAppendReactor.self) { r, closure, clubType in
-             MemberAppendReactor(
-                closure: closure,
-                clubType: clubType,
-                searchUserUseCase: r.resolve(SearchUserUseCase.self)!
-            )
-        }
-
         container.register(ClubMemberReactor.self) { r, clubID, isOpened in
             ClubMemberReactor(
                 clubID: clubID,

diff --git a/iOS/Sources/Application/Flow/Flows/Main/MainFlow.swift b/iOS/Sources/Application/Flow/Flows/Main/MainFlow.swift
@@ -40,19 +40,10 @@ final class MainFlow: Flow {
             return navigateToMyPage()
         case let .alert(title, message, style, actions):
             return presentToAlert(title: title, message: message, style: style, actions: actions)
-        case let .memberAppendIsRequired(closure, clubType):
-            return presentToMemberAppend(closure: closure, clubType: clubType)
         case .popToRoot:
             return popToRoot()
         case .dismiss:
             return dismiss()
-        // MARK: NewClub
-        case .firstNewClubIsRequired:
-            return navigateToFirstNewClub()
-        case let .secondNewClubIsRequired(reactor):
-            return navigateToSecondNewClub(reactor: reactor)
-        case let .thirdNewClubIsRequired(reactor):
-            return navigateToThirdNewClub(reactor: reactor)
         // MARK: UpdateClub
         case let .firstUpdateClubIsRequired(club):
             return navigateToFirstUpdateClub(club: club)
@@ -92,32 +83,10 @@ private extension MainFlow {
         self.rootVC.topViewController?.present(alert, animated: true)
         return .none
     }
-    func presentToMemberAppend(closure: @escaping (([User]) -> Void), clubType: ClubType) -> FlowContributors {
-        let reactor = AppDelegate.container.resolve(MemberAppendReactor.self, arguments: closure, clubType)!
-        let vc = MemberAppendVC(reactor: reactor)
-        self.rootVC.topViewController?.presentPanModal(vc)
-        return .one(flowContributor: .contribute(withNextPresentable: vc, withNextStepper: reactor))
-    }
     func dismiss() -> FlowContributors {
         self.rootVC.topViewController?.dismiss(animated: true)
         return .none
     }
-    func navigateToFirstNewClub() -> FlowContributors {
-        let reactor = AppDelegate.container.resolve(NewClubReactor.self)!
-        let vc = FirstNewClubVC(reactor: reactor)
-        self.rootVC.pushViewController(vc, animated: true)
-        return .one(flowContributor: .contribute(withNextPresentable: vc, withNextStepper: reactor))
-    }
-    func navigateToSecondNewClub(reactor: NewClubReactor) -> FlowContributors {
-        let vc = SecondNewClubVC(reactor: reactor)
-        self.rootVC.pushViewController(vc, animated: true)
-        return .one(flowContributor: .contribute(withNextPresentable: vc, withNextStepper: reactor))
-    }
-    func navigateToThirdNewClub(reactor: NewClubReactor) -> FlowContributors {
-        let vc = ThirdNewClubVC(reactor: reactor)
-        self.rootVC.pushViewController(vc, animated: true)
-        return .one(flowContributor: .contribute(withNextPresentable: vc, withNextStepper: reactor))
-    }
     func navigateToFirstUpdateClub(club: Club) -> FlowContributors {
         let reactor = AppDelegate.container.resolve(UpdateClubReactor.self, argument: club)!
         let vc = FirstUpdateClubVC(reactor: reactor)

diff --git a/iOS/Sources/Application/Flow/Step/GCMSStep.swift b/iOS/Sources/Application/Flow/Step/GCMSStep.swift
@@ -18,16 +18,9 @@ enum GCMSStep: Step {
     case clubListIsRequired
     case clubDetailIsRequired(clubID: Int)
 
-    // MARK: NewClub
-    case firstNewClubIsRequired
-    case secondNewClubIsRequired(reactor: NewClubReactor)
-    case thirdNewClubIsRequired(reactor: NewClubReactor)
-
     // MARK: - UpdateClub
     case firstUpdateClubIsRequired(club: Club)
     case secondUpdateClubIsRequired(reactor: UpdateClubReactor)
-
-    case memberAppendIsRequired(closure: (([User]) -> Void), clubType: ClubType)
     case clubStatusIsRequired(clubID: Int, isHead: Bool, isOpened: Bool)
 
     // MARK: Administrator

diff --git a/iOS/Sources/Presentation/Scene/Main/Home/HomeReactor.swift b/iOS/Sources/Presentation/Scene/Main/Home/HomeReactor.swift
@@ -18,7 +18,6 @@ final class HomeReactor: Reactor, Stepper {
         case viewDidLoad
         case viewDidAppear(ClubType)
         case myPageButtonDidTap
-        case newClubButtonDidTap
         case updateLoading(Bool)
         case clubDidTap(Int)
         case refreshTrigger(ClubType)
@@ -67,8 +66,6 @@ extension HomeReactor {
         switch action {
         case .myPageButtonDidTap:
             steps.accept(GCMSStep.myPageIsRequired)
-        case .newClubButtonDidTap:
-            steps.accept(GCMSStep.firstNewClubIsRequired)
         case let .updateLoading(load):
             return .just(.setIsLoading(load))
         case .viewDidLoad:

diff --git a/iOS/Sources/Presentation/Scene/Main/Home/HomeVC.swift b/iOS/Sources/Presentation/Scene/Main/Home/HomeVC.swift
@@ -24,10 +24,6 @@ final class HomeVC: TabmanViewController, View {
                                          style: .plain,
                                          target: nil,
                                          action: nil)
-    private let newClubButton = UIBarButtonItem(image: .init(systemName: "plus.app")?.tintColor(GCMSAsset.Colors.gcmsGray4.color),
-                                              style: .plain,
-                                              target: nil,
-                                              action: nil)
     private lazy var indicator = LottieAnimationView(name: "GCMS-Indicator").then {
         $0.contentMode = .scaleAspectFit
         $0.loopMode = .loop
@@ -112,7 +108,7 @@ private extension HomeVC {
     }
     func configNavigation() {
         self.navigationItem.leftBarButtonItem = UIBarButtonItem.init(customView: titleLabel)
-        self.navigationItem.setRightBarButtonItems([myPageButton, newClubButton], animated: true)
+        self.navigationItem.rightBarButtonItem = myPageButton
         self.navigationItem.configBack()
     }
     func bindAction(reactor: HomeReactor) {
@@ -126,11 +122,6 @@ private extension HomeVC {
             .map { _ in Reactor.Action.myPageButtonDidTap }
             .bind(to: reactor.action)
             .disposed(by: disposeBag)
-
-        newClubButton.rx.tap
-            .map { _ in Reactor.Action.newClubButtonDidTap }
-            .bind(to: reactor.action)
-            .disposed(by: disposeBag)
     }
     func bindState(reactor: HomeReactor) {
         let sharedState = reactor.state.share(replay: 3).observe(on: MainScheduler.asyncInstance)

diff --git a/iOS/Sources/Presentation/Scene/Main/MemberAppend/MemberAppendReactor.swift b/iOS/Sources/Presentation/Scene/Main/MemberAppend/MemberAppendReactor.swift