🔀 :: [#354] 강의 삭제 기능 추가

App/Sources/Application/DI/Lecture/AppComponent+Lecture.swift

@@ -85,4 +85,10 @@ public extension AppComponent {
             ModifyApplicantWhetherUseCaseImpl(lectureRepository: lectureRepository)
         }
     }
+
+    var deleteLectureUseCase: any DeleteLectureUseCase {
+        shared {
+            DeleteLectureUseCaseImpl(lectureRepository: lectureRepository)
+        }
+    }
 }

App/Sources/Application/NeedleGenerated.swift

@@ -78,6 +78,9 @@ private func factory050817f1b6d356b83467f47b58f8f304c97af4d5(_ component: Needle
     return ClubListDependency90c6e61626f7c53ad50fProvider(appComponent: parent1(component) as! AppComponent)
 }
 private class LectureListDetailDependency2a815f1240973966e6a6Provider: LectureListDetailDependency {
+    var deleteLectureUseCase: any DeleteLectureUseCase {
+        return appComponent.deleteLectureUseCase
+    }
     var fetchLectureDetailUseCase: any FetchLectureDetailUseCase {
         return appComponent.fetchLectureDetailUseCase
     }

App/Sources/Feature/ClubDetailFaeture/Source/ClubDetailView.swift

@@ -21,11 +21,6 @@ struct ClubDetailView: View {
                     .progressViewStyle(.circular)
             } else {
                 VStack(alignment: .leading, spacing: 4) {
-                    BitgouelText(
-                        text: viewModel.clubName,
-                        font: .title2
-                    )
-
                     HStack {
                         BitgouelText(
                             text: "소속 학교",
@@ -35,7 +30,7 @@ struct ClubDetailView: View {
                         Spacer()
 
                         BitgouelText(
-                            text: viewModel.highSchoolName,
+                            text: viewModel.schoolName,
                             font: .text3
                         )
                     }
@@ -92,6 +87,7 @@ struct ClubDetailView: View {
                 }
             }
         }
+        .navigationTitle(viewModel.clubName)
         .if(viewModel.authority != .admin) {
             $0.navigationBarBackButtonHidden()
         }

App/Sources/Feature/ClubDetailFaeture/Source/ClubDetailViewModel.swift

@@ -10,7 +10,7 @@ final class ClubDetailViewModel: BaseViewModel {
     // MARK: ClubInfo
     var clubID: Int = 0
     @Published var clubName: String = ""
-    @Published var highSchoolName: String = ""
+    @Published var schoolName: String = ""
     @Published var students: [ClubDetailEntity.MemberInfoEntity] = []
     @Published var teacher: ClubDetailEntity.TeacherInfoEntity?
 
@@ -41,17 +41,15 @@ final class ClubDetailViewModel: BaseViewModel {
 
         Task {
             do {
+                let response = try await fetchMyInfoUseCase()
                 let clubDetail = try await fetchClubDetail(authority: authority)
+
                 updateClubDetail(clubInfo: clubDetail)
-
-                let response = try await fetchMyInfoUseCase()
                 userID = response.userID
 
                 isLoading = false
             } catch {
-                errorMessage = error.clubDomainErrorMessage()
-
-                isErrorOccurred = true
+                print(String(describing: error))
             }
         }
     }
@@ -69,7 +67,7 @@ final class ClubDetailViewModel: BaseViewModel {
     func updateClubDetail(clubInfo: ClubDetailEntity) {
         self.clubID = clubInfo.clubID
         self.clubName = clubInfo.clubName
-        self.highSchoolName = clubInfo.highSchoolName
+        self.schoolName = clubInfo.schoolName
         self.students = clubInfo.students
         self.teacher = clubInfo.teacher
     }

App/Sources/Feature/LectureListDetailFeature/LectureListDetailView.swift

@@ -1,6 +1,7 @@
 import SwiftUI
 
 struct LectureListDetailView: View {
+    @Environment(\.dismiss) var dismiss
     @StateObject var viewModel: LectureListDetailViewModel
 
     private let lectureApplicantListFactory: any LectureApplicantListFactory
@@ -173,6 +174,20 @@ struct LectureListDetailView: View {
         .onAppear {
             viewModel.onAppear()
         }
+        .toolbar {
+            ToolbarItemGroup(placement: .navigationBarTrailing) {
+                switch viewModel.userAuthority {
+                case .admin,
+                     .professor,
+                     .government,
+                     .companyInstructor:
+                    changeLectureStatusButton()
+
+                default:
+                    EmptyView()
+                }
+            }
+        }
         .navigate(
             to: lectureApplicantListFactory.makeView(lectureID: viewModel.lectureID).eraseToAnyView(),
             when: Binding(
@@ -182,6 +197,26 @@ struct LectureListDetailView: View {
                 }
             )
         )
+        .confirmationDialog("", isPresented: $viewModel.isPresentedLectureActionSheet) {
+            Button("강의 수정") { 
+                #warning("강의 수정 기능 추가")
+            }
+            Button("강의 삭제", role: .destructive) {
+                viewModel.deleteLecture {
+                    dismiss()
+                }
+            }
+            Button("취소", role: .cancel) {}
+        }
+    }
+
+    @ViewBuilder
+    func changeLectureStatusButton() -> some View {
+        Button {
+            viewModel.updateIsPresentedLectureActionSheet(isPresented: true)
+        } label: {
+            BitgouelAsset.Icons.verticalEllipsisFill.swiftUIImage
+        }
     }
 
     @ViewBuilder

App/Sources/Feature/LectureListDetailFeature/LectureListDetailViewModel.swift

@@ -8,31 +8,39 @@ final class LectureListDetailViewModel: BaseViewModel {
     @Published var isCancel: Bool = false
     @Published var isPresentedLectureApplicantListView: Bool = false
     @Published var userAuthority: UserAuthorityType = .user
+    @Published var isPresentedLectureActionSheet: Bool = false
 
     let lectureID: String
     private let fetchLectureDetailUseCase: any FetchLectureDetailUseCase
     private let applyLectureUseCase: any ApplyLectureUseCase
     private let cancelLectureUseCase: any CancelLectureUseCase
     private let loadUserAuthorityUseCase: any LoadUserAuthorityUseCase
+    private let deleteLectureUseCase: any DeleteLectureUseCase
 
     init(
         lectureID: String,
         fetchLectureDetailUseCase: any FetchLectureDetailUseCase,
         applyLectureUseCase: any ApplyLectureUseCase,
         cancelLectureUseCase: any CancelLectureUseCase,
-        loadUserAuthorityUseCase: any LoadUserAuthorityUseCase
+        loadUserAuthorityUseCase: any LoadUserAuthorityUseCase,
+        deleteLectureUseCase: any DeleteLectureUseCase
     ) {
         self.lectureID = lectureID
         self.fetchLectureDetailUseCase = fetchLectureDetailUseCase
         self.applyLectureUseCase = applyLectureUseCase
         self.cancelLectureUseCase = cancelLectureUseCase
         self.loadUserAuthorityUseCase = loadUserAuthorityUseCase
+        self.deleteLectureUseCase = deleteLectureUseCase
     }
 
     func updateIsPresentedLectureApplicantView(isPresented: Bool) {
         isPresentedLectureApplicantListView = isPresented
     }
 
+    func updateIsPresentedLectureActionSheet(isPresented: Bool) {
+        isPresentedLectureActionSheet = isPresented
+    }
+
     @MainActor
     func onAppear() {
         isLoading = true
@@ -77,4 +85,18 @@ final class LectureListDetailViewModel: BaseViewModel {
             }
         }
     }
+
+    func deleteLecture(_ success: @escaping () -> Void) {
+        Task {
+            do {
+                try await deleteLectureUseCase(lectureID: lectureID)
+
+                success()
+            } catch {
+                errorMessage = error.lectureDomainErrorMessage()
+
+                isErrorOccurred = true
+            }
+        }
+    }
 }

App/Sources/Feature/LectureListDetailFeature/Source/LectureListDetailComponent.swift

@@ -8,6 +8,7 @@ public protocol LectureListDetailDependency: Dependency {
     var cancelLectureUseCase: any CancelLectureUseCase { get }
     var loadUserAuthorityUseCase: any LoadUserAuthorityUseCase { get }
     var lectureApplicantListFactory: any LectureApplicantListFactory { get }
+    var deleteLectureUseCase: any DeleteLectureUseCase { get }
 }
 
 public final class LectureListDetailComponent: Component<LectureListDetailDependency>, LectureListDetailFactory {
@@ -19,7 +20,8 @@ public final class LectureListDetailComponent: Component<LectureListDetailDepend
                 fetchLectureDetailUseCase: dependency.fetchLectureDetailUseCase,
                 applyLectureUseCase: dependency.applyLectureUseCase,
                 cancelLectureUseCase: dependency.cancelLectureUseCase,
-                loadUserAuthorityUseCase: dependency.loadUserAuthorityUseCase
+                loadUserAuthorityUseCase: dependency.loadUserAuthorityUseCase,
+                deleteLectureUseCase: dependency.deleteLectureUseCase
             ),
             lectureApplicantListFactory: dependency.lectureApplicantListFactory
         )

App/Sources/Feature/SignUpFeature/SignUpView.swift

@@ -97,10 +97,14 @@ struct SignUpView: View {
                             inputGovernmentInfoSection()
                         }
 
-                        ConditionView(viewModel.selectedSchool != nil) {
+                        ConditionView(viewModel.selectedClub != nil) {
                             inputNameSection()
                         }
 
+                        ConditionView(viewModel.selectedSchool != nil) {
+                            inputClubSection()
+                        }
+
                     default:
                         EmptyView()
                     }

App/Sources/Feature/SignUpFeature/SignUpViewModel.swift

@@ -122,47 +122,33 @@ final class SignUpViewModel: BaseViewModel {
         if selectedSchool == nil {
             return "학교 선택"
         }
+        if selectedClub == nil {
+            return "동아리 선택"
+        }
+        if !nameIsValid {
+            return "이름 입력"
+        }
 
         switch selectedUserRole {
         case .student:
-            if selectedClub == nil {
-                return "동아리 선택"
-            } else if !nameIsValid {
-                return "이름 입력"
-            } else if !yearOfAdmissionIsValid {
+            if !yearOfAdmissionIsValid {
                 return "입학년도 입력"
             } else if !studentIDIsValid {
                 return "학번 입력"
             }
-        case .teacher, .bbozzack:
-            if selectedClub == nil {
-                return "동아리 선택"
-            } else if !nameIsValid {
-                return "이름 입력"
-            }
 
         case .companyInstructor:
-            if selectedClub == nil {
-                return "동아리 선택"
-            } else if !nameIsValid {
-                return "이름 입력"
-            } else if selectedCompany.isEmpty {
+            if selectedCompany.isEmpty {
                 return "기업 입력"
             }
 
         case .professor:
-            if selectedClub == nil {
-                return "동아리 선택"
-            } else if !nameIsValid {
-                return "이름 입력"
-            } else if selectedUniversity.isEmpty {
+            if selectedUniversity.isEmpty {
                 return "대학 입력"
             }
 
         case .government:
-            if !nameIsValid {
-                return "이름 입력"
-            } else if selectedGovernment.isEmpty {
+            if selectedGovernment.isEmpty {
                 return "기관 입력"
             } else if sectors.isEmpty {
                 return "업종 입력"
@@ -353,8 +339,7 @@ final class SignUpViewModel: BaseViewModel {
     func signup(_ success: @escaping () -> Void) {
         guard let selectedSchool else { return }
         guard let selectedClub else { return }
-        guard checkphoneNumber(phoneNumber: phoneNumber)
-        else { return updateIsPhoneNumberErrorOccurred(isErrorOccurred: true) }
+        guard checkphoneNumber(phoneNumber: phoneNumber) else { return updateIsPhoneNumberErrorOccurred(isErrorOccurred: true) }
         guard checkEmail(email: email) else { return updateIsEmailErrorOccurred(isErrorOccurred: true) }
         guard checkPassword(password: password) else { return updateIsPasswordErrorOccurred(isErrorOccurred: true) }
         guard checkedPassword() else { return updateIsCheckPasswordErrorOccurred(isErrorOccurred: true) }

Service/Project.swift

@@ -2,6 +2,18 @@ import ProjectDescription
 import ProjectDescriptionHelpers
 import EnvironmentPlugin
 
+let configurations: [Configuration] = generateEnvironment == .ci ?
+[
+  .debug(name: .dev),
+  .debug(name: .stage),
+  .release(name: .prod)
+] :
+[
+  .debug(name: .dev, xcconfig: .relativeToXCConfig(type: .dev, name: "Service")),
+  .debug(name: .stage, xcconfig: .relativeToXCConfig(type: .stage, name: "Service")),
+  .release(name: .prod, xcconfig: .relativeToXCConfig(type: .prod, name: "Service"))
+]
+
 let project = Project.dynamicFramwork(
     name: "Service",
     platform: .iOS,
@@ -11,5 +23,6 @@ let project = Project.dynamicFramwork(
         ]
     ),
     deploymentTarget: env.deploymentTarget,
-    scripts: [.needle]
+    configurations: configurations,
+    scripts: [.needle, .swiftLint]
 )

Service/Sources/Data/DataSource/Lecture/RemoteLectureDataSourceImpl.swift

@@ -50,4 +50,8 @@ public final class RemoteLectureDataSourceImpl: BaseRemoteDataSource<LectureAPI>
     public func modifyApplicantWhether(lectureID: String, studentID: String, isComplete: Bool) async throws {
         try await request(.modifyApplicantWhether(lectureID: lectureID, studentID: studentID, isComplete: isComplete))
     }
+
+    public func deleteLecture(lectureID: String) async throws {
+        try await request(.deleteLecture(lectureID: lectureID))
+    }
 }

Service/Sources/Data/Repository/Lecture/LectureRepositoryImpl.swift

@@ -58,4 +58,8 @@ public struct LectureRepositoryImpl: LectureRepository {
             isComplete: isComplete
         )
     }
+
+    public func deleteLecture(lectureID: String) async throws {
+        try await remoteLectureDataSource.deleteLecture(lectureID: lectureID)
+    }
 }

Service/Sources/Data/UseCase/Lecture/DeleteLectureUseCaseImpl.swift

@@ -0,0 +1,13 @@
+import Foundation
+
+public struct DeleteLectureUseCaseImpl: DeleteLectureUseCase {
+    private let lectureRepository: any LectureRepository
+
+    public init(lectureRepository: any LectureRepository) {
+        self.lectureRepository = lectureRepository
+    }
+
+    public func callAsFunction(lectureID: String) async throws {
+        try await lectureRepository.deleteLecture(lectureID: lectureID)
+    }
+}