🐛 :: [#372] 충돌 해결

School-of-Company · Jul 19, 2024 · 830bd8f · 830bd8f
2 parents d81d473 + b0c46dd
commit 830bd8f
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 33 deletions.
diff --git a/App/Sources/Application/DI/University/AppComponent+University.swift b/App/Sources/Application/DI/University/AppComponent+University.swift
@@ -7,46 +7,46 @@ public extension AppComponent {
             RemoteUniversityDataSourceImpl(keychain: keychain)
         }
     }
-    
+
     var universityRepository: any UniversityRepository {
         shared {
             UniversityRepositoryImpl(remoteUniversityDataSource: remoteUniversityDataSource)
         }
     }
-    
+
     var fetchUniversityListUseCase: any FetchUniversityListUseCase {
         shared {
             FetchUniversityListUseCaseImpl(universityRepository: universityRepository)
         }
     }
-    
+
     var createdUniversityUseCase: any CreatedUniversityUseCase {
         shared {
             CreatedUniversityUseCaseImpl(universityRepository: universityRepository)
         }
     }
-    
+
     var modifyUniversityUseCase: any ModifyUniversityUseCase {
         shared {
             ModifyUniversityUseCaseImpl(universityRepository: universityRepository)
         }
     }
-    
+
     var deleteUniversityUseCase: any DeleteUniversityUseCase {
         shared {
             DeleteUniversityUseCaseImpl(universityRepository: universityRepository)
         }
     }
-    
+
     var createdDepartmentUseCase: any CreatedDepartmentUseCase {
         shared {
             CreatedDepartmentUseCaseImpl(universityRepository: universityRepository)
         }
     }
-    
+
     var deleteDepartmentUseCase: any DeleteDepartmentUseCase {
         shared {
-            DeleteDepartmentUseCaseImpl(universityRepository: universityRepository )
+            DeleteDepartmentUseCaseImpl(universityRepository: universityRepository)
         }
     }
 }
diff --git a/App/Sources/Feature/ClubDetailFaeture/Source/ClubDetailViewModel.swift b/App/Sources/Feature/ClubDetailFaeture/Source/ClubDetailViewModel.swift
@@ -65,11 +65,11 @@ final class ClubDetailViewModel: BaseViewModel {
     }
 
     func updateClubDetail(clubInfo: ClubDetailEntity) {
-        self.clubID = clubInfo.clubID
-        self.clubName = clubInfo.clubName
-        self.schoolName = clubInfo.schoolName
-        self.students = clubInfo.students
-        self.teacher = clubInfo.teacher
+        clubID = clubInfo.clubID
+        clubName = clubInfo.clubName
+        schoolName = clubInfo.schoolName
+        students = clubInfo.students
+        teacher = clubInfo.teacher
     }
 
     func updateIsPresentedStudentInfoView(isPresented: Bool) {

diff --git a/App/Sources/Feature/ClubListFeature/Source/ClubListView.swift b/App/Sources/Feature/ClubListFeature/Source/ClubListView.swift
@@ -24,7 +24,7 @@ struct ClubListView: View {
                         ForEach(viewModel.schoolList, id: \.schoolName) { school in
                             SchoolClubsView(
                                 schoolName: school.schoolName,
-                                clubList: school.clubs
+                                clubList: school.clubs.map { .init(clubID: $0.clubID, clubName: $0.clubName) }
                             ) { clubID in
                                 viewModel.updateClubID(clubID: clubID)
                                 viewModel.updateIsPresentedClubDetailView(isPresented: true)

diff --git a/App/Sources/Feature/ClubListFeature/Source/Component/SchoolListPopup.swift b/App/Sources/Feature/ClubListFeature/Source/Component/SchoolListPopup.swift
@@ -54,7 +54,7 @@ struct SchoolListPopup: View {
     @ViewBuilder
     func schoolListRow(
         school: HighSchoolType,
-        selectedSchool: HighSchoolType?,
+        selectedSchool _: HighSchoolType?,
         onSchoolSelect: @escaping (HighSchoolType) -> Void
     ) -> some View {
         VStack(alignment: .leading) {

diff --git a/App/Sources/Feature/ClubListFeature/Source/Model/ClubListModel.swift b/App/Sources/Feature/ClubListFeature/Source/Model/ClubListModel.swift
@@ -0,0 +1,6 @@
+import Foundation
+
+public struct ClubListModel: Equatable {
+    let clubID: Int
+    let clubName: String
+}
diff --git a/App/Sources/Feature/UniversityListFeature/Source/UniversityListView.swift b/App/Sources/Feature/UniversityListFeature/Source/UniversityListView.swift
@@ -7,7 +7,7 @@ struct UniversityListView: View {
     init(viewModel: UniversityListViewModel) {
         _viewModel = StateObject(wrappedValue: viewModel)
     }
-    
+
     var body: some View {
         VStack {
             Text("UniversityListView")
@@ -26,13 +26,13 @@ struct UniversityListView: View {
         }
         .bitgouelBottomSheet(isShowing: $viewModel.isShowingAdminPageBottomSheet) {
             AdminPageListBottomSheet(
-                selectedPage: viewModel.selectedPage) { page in
-                    viewModel.updateSelectedPage(page: page)
-                    adminPageState.adminPageFlow = page
-                } cancel: { cancel in
-                    viewModel.updateIsShowingAdminPageBottomSheet(isShowing: cancel)
-                }
-
+                selectedPage: viewModel.selectedPage
+            ) { page in
+                viewModel.updateSelectedPage(page: page)
+                adminPageState.adminPageFlow = page
+            } cancel: { cancel in
+                viewModel.updateIsShowingAdminPageBottomSheet(isShowing: cancel)
+            }
         }
     }
 }
diff --git a/App/Sources/Feature/WithdrawUserListFeature/Source/WithdrawUserListView.swift b/App/Sources/Feature/WithdrawUserListFeature/Source/WithdrawUserListView.swift
@@ -120,9 +120,10 @@ struct WithdrawUserListView: View {
         }
         .overlay(alignment: .bottom) {
             DeactivateButton(
-                text: "선택한 사용자 계정 탈퇴") {
-                    viewModel.updateIsShowingWithdrawAlert(isShowing: true)
-                }
+                text: "선택한 사용자 계정 탈퇴"
+            ) {
+                viewModel.updateIsShowingWithdrawAlert(isShowing: true)
+            }
         }
         .bitgouelAlert(
             title: "선택한 사용자의 탈퇴를 \n승인 하시겠습니까?",
@@ -159,13 +160,13 @@ struct WithdrawUserListView: View {
         }
         .bitgouelBottomSheet(isShowing: $viewModel.isShowingAdminPageBottomSheet) {
             AdminPageListBottomSheet(
-                selectedPage: viewModel.selectedPage) { page in
-                    viewModel.updateSelectedPage(page: page)
-                    adminPageState.adminPageFlow = page
-                } cancel: { cancel in
-                    viewModel.updateIsShowingAdminPageBottomSheet(isShowing: cancel)
-                }
-
+                selectedPage: viewModel.selectedPage
+            ) { page in
+                viewModel.updateSelectedPage(page: page)
+                adminPageState.adminPageFlow = page
+            } cancel: { cancel in
+                viewModel.updateIsShowingAdminPageBottomSheet(isShowing: cancel)
+            }
         }
     }
 }