Merge pull request #240 from GSM-MSG/239-input-dreambook-file-delete

GSM-MSG · Aug 10, 2023 · 63d8ac9 · 63d8ac9
2 parents 6dca869 + 612683d
commit 63d8ac9
Show file tree

Hide file tree

Showing 21 changed files with 1 addition and 166 deletions.
diff --git a/Projects/Domain/FileDomain/Interface/DI/FileDomainBuildable.swift b/Projects/Domain/FileDomain/Interface/DI/FileDomainBuildable.swift
@@ -1,5 +1,4 @@
 public protocol FileDomainBuildable {
-    var dreamBookUploadUseCase: any DreamBookUploadUseCase { get }
     var imageUploadUseCase: any ImageUploadUseCase { get }
     var fileRepository: any FileRepository { get }
 }
diff --git a/Projects/Domain/FileDomain/Interface/DataSource/RemoteFileDataSource.swift b/Projects/Domain/FileDomain/Interface/DataSource/RemoteFileDataSource.swift
@@ -1,6 +1,5 @@
 import Foundation
 
 public protocol RemoteFileDataSource {
-    func dreamBookUpload(file: Data, fileName: String) async throws -> String
     func imageUpload(image: Data, fileName: String) async throws -> String
 }
diff --git a/Projects/Domain/FileDomain/Interface/Repository/FileRepository.swift b/Projects/Domain/FileDomain/Interface/Repository/FileRepository.swift
@@ -1,6 +1,5 @@
 import Foundation
 
 public protocol FileRepository {
-    func dreamBookUpload(file: Data, fileName: String) async throws -> String
     func imageUpload(image: Data, fileName: String) async throws -> String
 }
diff --git a/Projects/Domain/FileDomain/Interface/UseCase/DreamBookUploadUseCase.swift b/Projects/Domain/FileDomain/Interface/UseCase/DreamBookUploadUseCase.swift
diff --git a/Projects/Domain/FileDomain/Sources/DI/FileDomainComponent.swift b/Projects/Domain/FileDomain/Sources/DI/FileDomainComponent.swift
@@ -10,9 +10,6 @@ public final class FileDomainComponent: Component<FileDomainDependency>, FileDom
     public var imageUploadUseCase: any ImageUploadUseCase {
         ImageUploadUseCaseImpl(fileRepository: fileRepository)
     }
-    public var dreamBookUploadUseCase: any DreamBookUploadUseCase {
-        DreamBookUploadUseCaseImpl(fileRepository: fileRepository)
-    }
     public var fileRepository: any FileRepository {
         FileRepositoryImpl(remoteFileDataSource: remoteFileDataSource)
     }

diff --git a/Projects/Domain/FileDomain/Sources/DTO/Response/DreamBookUploadResponseDTO.swift b/Projects/Domain/FileDomain/Sources/DTO/Response/DreamBookUploadResponseDTO.swift
diff --git a/Projects/Domain/FileDomain/Sources/DataSource/RemoteFileDataSourceImpl.swift b/Projects/Domain/FileDomain/Sources/DataSource/RemoteFileDataSourceImpl.swift
@@ -3,14 +3,6 @@ import Foundation
 import BaseDomain
 
 final class RemoteFileDataSourceImpl: BaseRemoteDataSource<FileEndpoint>, RemoteFileDataSource {
-    func dreamBookUpload(file: Data, fileName: String) async throws -> String {
-        try await request(
-            .dreamBookUpload(file: file, fileName: fileName),
-            dto: DreamBookUploadResponseDTO.self
-        )
-        .fileURL
-    }
-
     func imageUpload(image: Data, fileName: String) async throws -> String {
         try await request(
             .imageUpload(image: image, fileName: fileName),

diff --git a/Projects/Domain/FileDomain/Sources/Endpoint/FileEndpoint.swift b/Projects/Domain/FileDomain/Sources/Endpoint/FileEndpoint.swift
@@ -4,7 +4,6 @@ import FileDomainInterface
 import Foundation
 
 enum FileEndpoint {
-    case dreamBookUpload(file: Data, fileName: String)
     case imageUpload(image: Data, fileName: String)
 }
 
@@ -17,21 +16,13 @@ extension FileEndpoint: SMSEndpoint {
 
     var route: Route {
         switch self {
-        case .dreamBookUpload:
-            return .post("")
-
         case .imageUpload:
             return .post("/image")
         }
     }
 
     var task: HTTPTask {
         switch self {
-        case let .dreamBookUpload(file, fileName):
-            return .uploadMultipart([
-                MultiPartFormData(field: "file", data: file, fileName: fileName)
-            ])
-
         case let .imageUpload(image, fileName):
             return .uploadMultipart([
                 MultiPartFormData(field: "file", data: image, fileName: fileName)
@@ -44,7 +35,7 @@ extension FileEndpoint: SMSEndpoint {
 
     var jwtTokenType: JwtTokenType {
         switch self {
-        case .dreamBookUpload, .imageUpload:
+        case .imageUpload:
             return .accessToken
 
         default:
@@ -58,12 +49,6 @@ extension FileEndpoint: SMSEndpoint {
 
     var errorMap: [Int: ErrorType]? {
         switch self {
-        case .dreamBookUpload:
-            return [
-                400: .notHwpFile,
-                500: .internalServerError
-            ]
-
         case .imageUpload:
             return [
                 400: .notImageType,

diff --git a/Projects/Domain/FileDomain/Sources/Repository/FileRepositoryImpl.swift b/Projects/Domain/FileDomain/Sources/Repository/FileRepositoryImpl.swift
@@ -8,10 +8,6 @@ struct FileRepositoryImpl: FileRepository {
         self.remoteFileDataSource = remoteFileDataSource
     }
 
-    func dreamBookUpload(file: Data, fileName: String) async throws -> String {
-        try await remoteFileDataSource.dreamBookUpload(file: file, fileName: fileName)
-    }
-
     func imageUpload(image: Data, fileName: String) async throws -> String {
         try await remoteFileDataSource.imageUpload(image: image, fileName: fileName)
     }

diff --git a/Projects/Domain/FileDomain/Sources/UseCase/DreamBookUploadUseCaseImpl.swift b/Projects/Domain/FileDomain/Sources/UseCase/DreamBookUploadUseCaseImpl.swift
diff --git a/Projects/Domain/StudentDomain/Interface/DTO/Request/StudentRequestDTO.swift b/Projects/Domain/StudentDomain/Interface/DTO/Request/StudentRequestDTO.swift
@@ -3,7 +3,6 @@ import Foundation
 public struct InputStudentInformationRequestDTO: Encodable {
     public let certificate: [String]
     public let contactEmail: String
-    public let dreamBookFileURL: String
     public let formOfEmployment: FormOfEmployment
     public let gsmAuthenticationScore: Int
     public let introduce: String
@@ -21,7 +20,6 @@ public struct InputStudentInformationRequestDTO: Encodable {
     public init(
         certificate: [String],
         contactEmail: String,
-        dreamBookFileURL: String,
         formOfEmployment: FormOfEmployment,
         gsmAuthenticationScore: Int,
         introduce: String,
@@ -38,7 +36,6 @@ public struct InputStudentInformationRequestDTO: Encodable {
     ) {
         self.certificate = certificate
         self.contactEmail = contactEmail
-        self.dreamBookFileURL = dreamBookFileURL
         self.formOfEmployment = formOfEmployment
         self.gsmAuthenticationScore = gsmAuthenticationScore
         self.introduce = introduce
@@ -57,7 +54,6 @@ public struct InputStudentInformationRequestDTO: Encodable {
     enum CodingKeys: String, CodingKey {
         case certificate
         case contactEmail
-        case dreamBookFileURL = "dreamBookFileUrl"
         case formOfEmployment
         case gsmAuthenticationScore
         case introduce

diff --git a/Projects/Domain/StudentDomain/Interface/Entity/StudentDetailEntity.swift b/Projects/Domain/StudentDomain/Interface/Entity/StudentDetailEntity.swift
@@ -50,7 +50,6 @@ extension StudentDetailEntity {
     }
 
     public struct DetailInfoByTeacher: Equatable {
-        public let dreamBookFileURL: String?
         public let portfolioURL: String?
         public let grade: Int
         public let `class`: Int
@@ -66,7 +65,6 @@ extension StudentDetailEntity {
         public let certificate: [String]
 
         public init(
-            dreamBookFileURL: String?,
             portfolioURL: String?,
             grade: Int,
             class: Int,
@@ -81,7 +79,6 @@ extension StudentDetailEntity {
             languageCertificate: [LanguageCertificateEntity],
             certificate: [String]
         ) {
-            self.dreamBookFileURL = dreamBookFileURL
             self.portfolioURL = portfolioURL
             self.grade = grade
             self.class = `class`

diff --git a/...ts/Domain/StudentDomain/Sources/DTO/Response/FetchStudentDetailByTeacherResponseDTO.swift b/...ts/Domain/StudentDomain/Sources/DTO/Response/FetchStudentDetailByTeacherResponseDTO.swift
@@ -4,7 +4,6 @@ import Foundation
 public struct FetchStudentDetailByTeacherResponseDTO: Decodable {
     public let name: String
     public let introduce: String
-    public let dreamBookFileUrl: String?
     public let portfolioUrl: String?
     public let grade: Int
     public let classNum: Int
@@ -54,7 +53,6 @@ public extension FetchStudentDetailByTeacherResponseDTO {
             projects: projects.map { $0.toDomain() },
             prizes: prizes.map { $0.toDomain() },
             detailInfoByTeacher: .init(
-                dreamBookFileURL: dreamBookFileUrl,
                 portfolioURL: portfolioUrl,
                 grade: grade,
                 class: classNum,

diff --git a/Projects/Feature/InputInformationFeature/Sources/DI/InputInformationComponent.swift b/Projects/Feature/InputInformationFeature/Sources/DI/InputInformationComponent.swift
@@ -35,7 +35,6 @@ public final class InputInformationComponent:
         let intent = InputInformationIntent(
             model: model,
             inputInformationDelegate: delegate,
-            dreamBookUploadUseCase: dependency.fileDomainBuildable.dreamBookUploadUseCase,
             imageUploadUseCase: dependency.fileDomainBuildable.imageUploadUseCase,
             inputInformationUseCase: dependency.studentDomainBuildable.inputInformationUseCase
         )

diff --git a/Projects/Feature/InputInformationFeature/Sources/Intent/InputInformationIntent.swift b/Projects/Feature/InputInformationFeature/Sources/Intent/InputInformationIntent.swift
@@ -16,20 +16,17 @@ import DateUtil
 final class InputInformationIntent: InputInformationIntentProtocol {
     private weak var model: (any InputInformationActionProtocol)?
     private weak var inputInformationDelegate: (any InputInformationDelegate)?
-    private let dreamBookUploadUseCase: any DreamBookUploadUseCase
     private let imageUploadUseCase: any ImageUploadUseCase
     private let inputInformationUseCase: any InputInformationUseCase
 
     init(
         model: any InputInformationActionProtocol,
         inputInformationDelegate: any InputInformationDelegate,
-        dreamBookUploadUseCase: any DreamBookUploadUseCase,
         imageUploadUseCase: any ImageUploadUseCase,
         inputInformationUseCase: any InputInformationUseCase
     ) {
         self.model = model
         self.inputInformationDelegate = inputInformationDelegate
-        self.dreamBookUploadUseCase = dreamBookUploadUseCase
         self.imageUploadUseCase = imageUploadUseCase
         self.inputInformationUseCase = inputInformationUseCase
     }
@@ -52,15 +49,10 @@ final class InputInformationIntent: InputInformationIntentProtocol {
                     image: inputProfileInfo.profileImageData,
                     fileName: inputProfileInfo.profileImageFilename
                 )
-                async let dreamBookURL = dreamBookUploadUseCase.execute(
-                    file: inputSchoolLifeInfo.hwpData,
-                    fileName: inputSchoolLifeInfo.hwpFilename
-                )
 
                 let inputInformationRequest = try await InputStudentInformationRequestDTO(
                     certificate: state.certificates,
                     contactEmail: inputProfileInfo.contactEmail,
-                    dreamBookFileURL: dreamBookURL,
                     formOfEmployment: FormOfEmployment(rawValue: inputWorkInfo.formOfEmployment) ?? .fullTime,
                     gsmAuthenticationScore: inputSchoolLifeInfo.gsmAuthenticationScore,
                     introduce: inputProfileInfo.introduce,

diff --git a/Projects/Feature/StudentDetailFeature/Sources/Intent/StudentDetailIntent.swift b/Projects/Feature/StudentDetailFeature/Sources/Intent/StudentDetailIntent.swift
@@ -41,32 +41,9 @@ final class StudentDetailIntent: StudentDetailIntentProtocol {
         }
     }
 
-    func dreamBookDownloadButtonDidTap(dreamBookFileURL: String) {
-        guard let url = URL(string: dreamBookFileURL) else { return }
-        throttler {
-            self.model?.updateIsDownloading(isDownloading: true)
-            Task(priority: .background) {
-                do {
-                    let (dreamBookFileData, _) = try await URLSession.shared.data(from: url)
-                    let hwpDocument = HWPDocument(hwpData: dreamBookFileData)
-                    self.model?.updateHWPDocument(hwpDocument: hwpDocument)
-                    try await Task.sleep(nanoseconds: 1_000_000_000)
-                    self.model?.updateIsDownloading(isDownloading: false)
-                    self.model?.updateIsPresentedDreamBookExporter(isPresented: true)
-                } catch {
-                    self.model?.updateIsDownloading(isDownloading: false)
-                }
-            }
-        }
-    }
-
     deinit {
         print("DEIIN")
     }
-
-    func dreamBookFileExporterDismissed() {
-        model?.updateIsPresentedDreamBookExporter(isPresented: false)
-    }
 }
 
 private extension UserRoleType {

diff --git a/Projects/Feature/StudentDetailFeature/Sources/Intent/StudentDetailIntentProtocol.swift b/Projects/Feature/StudentDetailFeature/Sources/Intent/StudentDetailIntentProtocol.swift
@@ -2,6 +2,4 @@ import Foundation
 
 protocol StudentDetailIntentProtocol {
     func onAppear()
-    func dreamBookDownloadButtonDidTap(dreamBookFileURL: String)
-    func dreamBookFileExporterDismissed()
 }
diff --git a/Projects/Feature/StudentDetailFeature/Sources/Model/HWPDocument.swift b/Projects/Feature/StudentDetailFeature/Sources/Model/HWPDocument.swift
diff --git a/Projects/Feature/StudentDetailFeature/Sources/Model/StudentDetailModel.swift b/Projects/Feature/StudentDetailFeature/Sources/Model/StudentDetailModel.swift
@@ -26,13 +26,6 @@ final class StudentDetailModel: ObservableObject, StudentDetailStateProtocol {
     @Published var _studentDetailEntity: StudentDetailEntity?
     @Published var isLoading: Bool = false
     @Published var isDownloading: Bool = false
-    @Published var isPresentedDreamBookExporter: Bool = false
-    @Published var hwpDocument: HWPDocument?
-    var hwpFilename: String {
-        guard let studentDetailEntity, let info = studentDetailEntity.detailInfoByTeacher else { return "" }
-        let number = info.number >= 10 ? "\(info.number)" : "0\(info.number)"
-        return "\(info.grade)\(info.class)\(number)\(studentDetailEntity.name)-드림북.hwp"
-    }
 }
 // swiftlint: enable identifier_name
 
@@ -52,12 +45,4 @@ extension StudentDetailModel: StudentDetailActionProtocol {
     func updateIsDownloading(isDownloading: Bool) {
         self.isDownloading = isDownloading
     }
-
-    func updateIsPresentedDreamBookExporter(isPresented: Bool) {
-        self.isPresentedDreamBookExporter = isPresented
-    }
-
-    func updateHWPDocument(hwpDocument: HWPDocument) {
-        self.hwpDocument = hwpDocument
-    }
 }
diff --git a/Projects/Feature/StudentDetailFeature/Sources/Model/StudentDetailModelProtocol.swift b/Projects/Feature/StudentDetailFeature/Sources/Model/StudentDetailModelProtocol.swift
@@ -7,16 +7,11 @@ protocol StudentDetailStateProtocol {
     var studentDetailEntity: StudentDetailEntity? { get }
     var isLoading: Bool { get }
     var isDownloading: Bool { get }
-    var isPresentedDreamBookExporter: Bool { get }
-    var hwpDocument: HWPDocument? { get }
-    var hwpFilename: String { get }
 }
 
 protocol StudentDetailActionProtocol: AnyObject {
     func updateUserRole(role: UserRoleType)
     func updateStudentDetailEntity(entity: StudentDetailEntity)
     func updateIsLoading(isLoading: Bool)
     func updateIsDownloading(isDownloading: Bool)
-    func updateIsPresentedDreamBookExporter(isPresented: Bool)
-    func updateHWPDocument(hwpDocument: HWPDocument)
 }
diff --git a/Projects/Feature/StudentDetailFeature/Sources/Scene/StudentDetailView.swift b/Projects/Feature/StudentDetailFeature/Sources/Scene/StudentDetailView.swift
@@ -104,17 +104,6 @@ struct StudentDetailView: View {
                 .frame(width: 24, height: 24)
         }
         .navigationBarHidden(true)
-        .fileExporter(
-            isPresented: Binding(
-                get: { state.isPresentedDreamBookExporter },
-                set: { _ in intent.dreamBookFileExporterDismissed() }
-            ),
-            document: state.hwpDocument,
-            contentType: UTType(filenameExtension: "hwp") ?? .pdf,
-            defaultFilename: state.hwpFilename
-        ) { result in
-            print(result)
-        }
     }
 
     // swiftlint: disable function_body_length
@@ -130,13 +119,6 @@ struct StudentDetailView: View {
 
                     Spacer()
 
-                    SMSIcon(.book)
-                        .buttonWrapper {
-                            guard
-                                let dreamBookURLString = studentDetail?.detailInfoByTeacher?.dreamBookFileURL
-                            else { return }
-                            intent.dreamBookDownloadButtonDidTap(dreamBookFileURL: dreamBookURLString)
-                        }
                 }
             } else {
                 SMSText(studentDetail?.major ?? "전공", font: .body1)