♻️ :: [#127] SwiftFormat

School-of-Company · Jan 21, 2024 · 63019d9 · 63019d9
1 parent 4f3dd26
commit 63019d9
Show file tree

Hide file tree

Showing 29 changed files with 207 additions and 125 deletions.
diff --git a/App/Sources/Application/DI/User/AppComponent+User.swift b/App/Sources/Application/DI/User/AppComponent+User.swift
@@ -7,19 +7,19 @@ public extension AppComponent {
             RemoteUserDataSourceImpl(keychain: keychain)
         }
     }
-    
+
     var userRepository: any UserRepository {
         shared {
             UserRepositoryImpl(remoteUserDataSource: remoteUserDataSource)
         }
     }
-    
+
     var changePasswordUseCase: any ChangePasswordUseCase {
         shared {
             ChangePasswordUseCaseImpl(userRepository: userRepository)
         }
     }
-    
+
     var queryMyInfoUseCase: any QueryMyInfoUseCase {
         shared {
             QueryMyInfoUseCaseImpl(userRepository: userRepository)

diff --git a/App/Sources/Application/NeedleGenerated.swift b/App/Sources/Application/NeedleGenerated.swift
diff --git a/App/Sources/Feature/ActivityListFeature/ActivityListView.swift b/App/Sources/Feature/ActivityListFeature/ActivityListView.swift
@@ -5,9 +5,9 @@ struct ActivityListView: View {
     @Environment(\.dismiss) var dismiss
     @StateObject var model: ActivityListModel
     @StateObject var viewModel: ActivityListViewModel
-    
+
     private let inputActivityFactory: any InputActivityFactory
-    
+
     init(
         inputActivityFactory: any InputActivityFactory,
         model: ActivityListModel,
@@ -17,7 +17,7 @@ struct ActivityListView: View {
         _model = StateObject(wrappedValue: model)
         _viewModel = StateObject(wrappedValue: viewModel)
     }
-    
+
     var body: some View {
         NavigationView {
             ScrollView {

diff --git a/App/Sources/Feature/InputActivityFeature/Source/InputActivityView.swift b/App/Sources/Feature/InputActivityFeature/Source/InputActivityView.swift
@@ -2,11 +2,11 @@ import SwiftUI
 
 struct InputActivityView: View {
     @StateObject var viewModel: InputActivityViewModel
-    
+
     init(viewModel: InputActivityViewModel) {
         _viewModel = StateObject(wrappedValue: viewModel)
     }
-    
+
     var body: some View {
         ScrollView {
             VStack(spacing: 0) {
@@ -33,9 +33,9 @@ struct InputActivityView: View {
                 }
                 .padding(.top, -40)
                 .frame(minHeight: 40, maxHeight: 120)
-                
+
                 Divider()
-                
+
                 VStack {
                     TextEditor(text: Binding(
                         get: { viewModel.activityText },
@@ -59,18 +59,18 @@ struct InputActivityView: View {
                 }
                 .padding(.top, 16)
                 .frame(height: 460)
-                
+
                 Divider()
-                
+
                 VStack(spacing: 8) {
                     Button {} label: {
                         Spacer()
-                        
+
                         BitgouelAsset.Icons.setting.swiftUIImage
-                        
+
                         Text("활동 세부 설정")
                             .bitgouelFont(.text3, color: .primary(.p5))
-                        
+
                         Spacer()
                     }
                     .padding(.vertical, 12)
@@ -79,7 +79,7 @@ struct InputActivityView: View {
                         RoundedRectangle(cornerRadius: 8)
                             .strokeBorder(Color.bitgouel(.primary(.p5)))
                     }
-                    
+
                     CTAButton(
                         text: "활동 추가",
                         style: .default

diff --git a/App/Sources/Feature/StudentSignUpFeature/StudentSignUpView.swift b/App/Sources/Feature/StudentSignUpFeature/StudentSignUpView.swift
@@ -1,5 +1,5 @@
-import SwiftUI
 import Service
+import SwiftUI
 
 struct StudentSignUpView: View {
     @StateObject var viewModel: StudentSignUpViewModel
@@ -226,7 +226,6 @@ struct StudentSignUpView: View {
             AssociationSelectButton(text: viewModel.selectedAssociation?.associationValue() ?? "소속") {
                 viewModel.isPresentedAssociationSheet = true
             }
-
         }
     }
 
@@ -324,13 +323,13 @@ struct StudentSignUpView: View {
             .padding(.bottom, -20)
         }
     }
-    
+
     @ViewBuilder
     func userRoleTypeView() -> some View {
         ScrollView {
             let data: [UserAuthorityType] = viewModel.selectedAssociation == .school
-            ? [.student, .teacher]
-            : [.companyInstructor, .professor, .bbozzack, .government]
+                ? [.student, .teacher]
+                : [.companyInstructor, .professor, .bbozzack, .government]
             ForEach(data, id: \.self) { userRole in
                 HStack {
                     Text(userRole.display())
@@ -354,7 +353,7 @@ struct StudentSignUpView: View {
             }
         }
     }
-    
+
     @ViewBuilder
     func associationTypeView() -> some View {
         ScrollView {

diff --git a/App/Sources/Feature/StudentSignUpFeature/StudentSignUpViewModel.swift b/App/Sources/Feature/StudentSignUpFeature/StudentSignUpViewModel.swift
@@ -7,7 +7,7 @@ class StudentSignUpViewModel: BaseViewModel {
     @Published var isPresentedUserRoleSheet = false
     @Published var isPresentedSchoolSheet = false
     @Published var isPresentedClubSheet = false
-    
+
     // MARK: variable
     @Published var schoolSearch = ""
     @Published var clubSearch = ""
@@ -29,34 +29,39 @@ class StudentSignUpViewModel: BaseViewModel {
     @Published var studentID: String = ""
     @Published var selectedAssociation: AssociationType?
     @Published var selectedUserRole: UserAuthorityType?
-    
+
     // MARK: computed property
     var clubsForSelectedHighSchool: [String] {
         selectedSchool?.getClubsForSelectedHighSchool() ?? []
     }
-    
+
     // MARK: validation
     var nameIsValid: Bool {
         name.count >= 2
     }
+
     var yearOfAdmissionIsValid: Bool {
         (yearOfAdmission ?? 0) >= 1000
     }
+
     var studentIDIsValid: Bool {
         studentID.count == 4 && grade != nil && classRoom != nil && number != nil
     }
+
     var phoneNumberIsValid: Bool {
         phoneNumber.count == 11
     }
+
     var emailIsValid: Bool {
         let emailRegex = "[A-Z0-9a-z._%+-]+@[A-Za-z0-9.-]+\\.[A-Za-z]{2,6}"
         return NSPredicate(format: "SELF MATCHES %@", emailRegex).evaluate(with: email)
     }
+
     var passwordIsValid: Bool {
         let passwordRegex = "[A-Z0-9a-z@!#$%%^~&*()_+-=.]{8,24}"
         return NSPredicate(format: "SELF MATCHES %@", passwordRegex).evaluate(with: password)
     }
-    
+
     // MARK: usecase
     private let studentSignupUseCase: StudentSignupUseCase
     private let teacherSignupUseCase: TeacherSignupUseCase
@@ -229,7 +234,7 @@ class StudentSignUpViewModel: BaseViewModel {
             return "비밀번호를 다시 입력해 주세요!"
         }
     }
-    
+
     func parseStudentID() {
         if studentID.count == 4 {
             grade = Int(studentID.prefix(1))

diff --git a/App/Sources/Feature/StudentSignUpFeature/View/SchoolListView.swift b/App/Sources/Feature/StudentSignUpFeature/View/SchoolListView.swift
@@ -1,5 +1,5 @@
-import SwiftUI
 import Service
+import SwiftUI
 
 struct SchoolListView: View {
     let searchKeyword: Binding<String>
@@ -18,7 +18,11 @@ struct SchoolListView: View {
             ScrollView {
                 LazyVStack {
                     ForEach(schoolList, id: \.self) { school in
-                        SchoolListRowView(school: school, selectedSchool: selectedSchool, onHighSchoolSelect: onHighSchoolSelect)
+                        SchoolListRowView(
+                            school: school,
+                            selectedSchool: selectedSchool,
+                            onHighSchoolSelect: onHighSchoolSelect
+                        )
                     }
                 }
             }

diff --git a/Service/Sources/Data/DataSource/Post/RemotePostDataSourceImpl.swift b/Service/Sources/Data/DataSource/Post/RemotePostDataSourceImpl.swift
@@ -4,19 +4,19 @@ public final class RemotePostDataSourceImpl: BaseRemoteDataSource<PostAPI>, Remo
     public func writePost(req: InputPostRequestDTO) async throws {
         try await request(.writePost(req: req))
     }
-    
+
     public func queryPostList() async throws -> [PostEntity] {
         try await request(.queryPostList, dto: PostListsResponseDTO.self).toDomain()
     }
-    
+
     public func queryPostDetail(postID: String) async throws -> PostDetailEntity {
         try await request(.queryPostDetail(postID: postID), dto: PostDetailResponseDTO.self).toDomain()
     }
-    
+
     public func updatePost(postID: String, req: InputPostRequestDTO) async throws {
         try await request(.updatePost(postID: postID, req: req))
     }
-    
+
     public func deletePost(postID: String) async throws {
         try await request(.deletePost(postID: postID))
     }

diff --git a/Service/Sources/Data/DataSource/User/RemoteUserDataSourceImpl.swift b/Service/Sources/Data/DataSource/User/RemoteUserDataSourceImpl.swift
@@ -1,11 +1,10 @@
 import Foundation
 
 public final class RemoteUserDataSourceImpl: BaseRemoteDataSource<UserAPI>, RemoteUserDataSource {
-
     public func changePassword(req: ChangePasswordRequestDTO) async throws {
         try await request(.changePassword(req))
     }
-    
+
     public func queryMyInfo() async throws -> MyInfoEntity {
         try await request(.queryMyInfo, dto: QueryMyInfoResponseDTO.self).toDomain()
     }

diff --git a/Service/Sources/Data/Repository/Post/PostRepositoryImpl.swift b/Service/Sources/Data/Repository/Post/PostRepositoryImpl.swift
@@ -2,27 +2,27 @@ import Foundation
 
 public struct PostRepositoryImpl: PostRepository {
     private let remotePostDataSource: RemotePostDataSource
-    
+
     public init(remotePostDataSource: RemotePostDataSource) {
         self.remotePostDataSource = remotePostDataSource
     }
-    
+
     public func writePost(req: InputPostRequestDTO) async throws {
         try await remotePostDataSource.writePost(req: req)
     }
-    
+
     public func queryPostList() async throws -> [PostEntity] {
         try await remotePostDataSource.queryPostList()
     }
-    
+
     public func queryPostDetail(postID: String) async throws -> PostDetailEntity {
         try await remotePostDataSource.queryPostDetail(postID: postID)
     }
-    
+
     public func updatePost(postID: String, req: InputPostRequestDTO) async throws {
         try await remotePostDataSource.updatePost(postID: postID, req: req)
     }
-    
+
     public func deletePost(postID: String) async throws {
         try await remotePostDataSource.deletePost(postID: postID)
     }

diff --git a/Service/Sources/Data/Repository/User/UserRepositoryImpl.swift b/Service/Sources/Data/Repository/User/UserRepositoryImpl.swift
@@ -2,15 +2,15 @@ import Foundation
 
 public struct UserRepositoryImpl: UserRepository {
     private let remoteUserDataSource: RemoteUserDataSource
-    
+
     public init(remoteUserDataSource: RemoteUserDataSource) {
         self.remoteUserDataSource = remoteUserDataSource
     }
-    
+
     public func changePassword(req: ChangePasswordRequestDTO) async throws {
         try await remoteUserDataSource.changePassword(req: req)
     }
-    
+
     public func queryMyInfo() async throws -> MyInfoEntity {
         try await remoteUserDataSource.queryMyInfo()
     }

diff --git a/Service/Sources/Data/UseCase/Post/DeletePostUseCaseImpl.swift b/Service/Sources/Data/UseCase/Post/DeletePostUseCaseImpl.swift
@@ -2,11 +2,11 @@ import Foundation
 
 public struct DeletePostUseCaseImpl: DeletePostUseCase {
     private let postRepository: any PostRepository
-    
+
     public init(postRepository: any PostRepository) {
         self.postRepository = postRepository
     }
-    
+
     public func callAsFunction(postID: String) async throws {
         try await postRepository.deletePost(postID: postID)
     }

diff --git a/Service/Sources/Data/UseCase/Post/QueryPostDetailUseCaseImpl.swift b/Service/Sources/Data/UseCase/Post/QueryPostDetailUseCaseImpl.swift
@@ -2,11 +2,11 @@ import Foundation
 
 public struct QueryPostDetailUseCaseImpl: QueryPostDetailUseCase {
     private let postRepository: any PostRepository
-    
+
     public init(postRepository: any PostRepository) {
         self.postRepository = postRepository
     }
-    
+
     public func callAsFunction(postID: String) async throws -> PostDetailEntity {
         try await postRepository.queryPostDetail(postID: postID)
     }

diff --git a/Service/Sources/Data/UseCase/Post/QueryPostListUseCaseImpl.swift b/Service/Sources/Data/UseCase/Post/QueryPostListUseCaseImpl.swift
@@ -2,11 +2,11 @@ import Foundation
 
 public struct QueryPostListUseCaseImpl: QueryPostListUseCase {
     private let postRepository: any PostRepository
-    
+
     public init(postRepository: any PostRepository) {
         self.postRepository = postRepository
     }
-    
+
     public func callAsFunction() async throws -> [PostEntity] {
         try await postRepository.queryPostList()
     }

diff --git a/Service/Sources/Data/UseCase/Post/UpdatePostUseCaseImpl.swift b/Service/Sources/Data/UseCase/Post/UpdatePostUseCaseImpl.swift
@@ -2,11 +2,11 @@ import Foundation
 
 public struct UpdatePostUseCaseImpl: UpdatePostUseCase {
     private let postRepository: any PostRepository
-    
+
     public init(postRepository: any PostRepository) {
         self.postRepository = postRepository
     }
-    
+
     public func callAsFunction(postID: String, req: InputPostRequestDTO) async throws {
         try await postRepository.updatePost(postID: postID, req: req)
     }

diff --git a/Service/Sources/Data/UseCase/Post/WritePostUseCaseImpl.swift b/Service/Sources/Data/UseCase/Post/WritePostUseCaseImpl.swift
@@ -2,11 +2,11 @@ import Foundation
 
 public struct WritePostUseCaseImpl: WritePostUseCase {
     private let postRepository: any PostRepository
-    
+
     public init(postRepository: any PostRepository) {
         self.postRepository = postRepository
     }
-    
+
     public func callAsFunction(req: InputPostRequestDTO) async throws {
         try await postRepository.writePost(req: req)
     }

diff --git a/Service/Sources/Data/UseCase/User/ChangePasswordUseCaseImpl.swift b/Service/Sources/Data/UseCase/User/ChangePasswordUseCaseImpl.swift
@@ -2,11 +2,11 @@ import Foundation
 
 public struct ChangePasswordUseCaseImpl: ChangePasswordUseCase {
     private let userRepository: any UserRepository
-    
+
     public init(userRepository: any UserRepository) {
         self.userRepository = userRepository
     }
-    
+
     public func callAsFunction(req: ChangePasswordRequestDTO) async throws {
         try await userRepository.changePassword(req: req)
     }