Merge pull request #264 from Team-return/feature/(#262)-bug_fix_and_feature

🔗 :: (#262) 미완성 기능 구현 및 버그 수정

Author: cyj513

Projects/Data/Sources/DI/DataSourceAssembly.swift

@@ -73,5 +73,13 @@ public final class DataSourceAssembly: Assembly {
         container.register(RemoteNotificationsDataSource.self) { resolver in
             RemoteNotificationsDataSourceImpl(keychain: self.keychain(resolver))
         }
+
+        container.register(RemoteWinterInternDataSource.self) { resolver in
+            RemoteWinterInternDataSourceImpl(keychain: self.keychain(resolver))
+        }
+
+        container.register(RemoteSystemDataSource.self) { resolver in
+            RemoteSystemDataSourceImpl(keychain: self.keychain(resolver))
+        }
     }
 }

Projects/Data/Sources/DI/RepositoryAssembly.swift

@@ -93,5 +93,17 @@ public final class RepositoryAssembly: Assembly {
                 remoteNotificationsDataSource: resolver.resolve(RemoteNotificationsDataSource.self)!
             )
         }
+
+        container.register(WinterInternRepository.self) { resolver in
+            WinterInternRepositoryImpl(
+                remoteWinterInternDataSource: resolver.resolve(RemoteWinterInternDataSource.self)!
+            )
+        }
+
+        container.register(SystemRepository.self) { resolver in
+            SystemRepositoryImpl(
+                remoteSystemDataSource: resolver.resolve(RemoteSystemDataSource.self)!
+            )
+        }
     }
 }

Projects/Data/Sources/DI/UseCaseAssembly.swift

@@ -34,6 +34,12 @@ public final class UseCaseAssembly: Assembly {
                 usersRepository: resolver.resolve(UsersRepository.self)!
             )
         }
+        container.register(DeleteDeviceTokenUseCase.self) { resolver in
+            DeleteDeviceTokenUseCase(
+                usersRepository: resolver.resolve(UsersRepository.self)!
+            )
+        }
+
 
         // Students
         container.register(ChangePasswordUseCase.self) { reslover in
@@ -243,5 +249,19 @@ public final class UseCaseAssembly: Assembly {
                 notificationsRepository: resolver.resolve(NotificationsRepository.self)!
             )
         }
+
+        // WinterIntern
+        container.register(FetchWinterInternSeasonUseCase.self) { resolver in
+            FetchWinterInternSeasonUseCase(
+                winterInternRepository: resolver.resolve(WinterInternRepository.self)!
+            )
+        }
+
+        // System
+        container.register(FetchServerStatusUseCase.self) { resolver in
+            FetchServerStatusUseCase(
+                systemRepository: resolver.resolve(SystemRepository.self)!
+            )
+        }
     }
 }

Projects/Data/Sources/DTO/Companies/CompanyInfoDetailResponseDTO.swift

@@ -7,9 +7,9 @@ struct CompanyInfoDetailResponseDTO: Decodable {
     let companyProfileURL: String
     let companyIntroduce: String
     let mainZipCode, mainAddress, mainAddressDetail: String
-    let subZipCode, subAddress, subAddressDetail: String?
-    let managerName, managerPhoneNo: String
-    let subManagerName, subManagerPhoneNo, fax: String?
+//    let subZipCode, subAddress, subAddressDetail: String?
+    let managerName: String
+//    let subManagerName, subManagerPhoneNo, fax: String?
     let email, representativeName, representativePhoneNo, foundedAt: String
     let workerNumber: Int
     let take: Double
@@ -26,14 +26,14 @@ struct CompanyInfoDetailResponseDTO: Decodable {
         case mainZipCode = "main_zip_code"
         case mainAddress = "main_address"
         case mainAddressDetail = "main_address_detail"
-        case subZipCode = "sub_zip_code"
-        case subAddress = "sub_address"
-        case subAddressDetail = "sub_address_detail"
+//        case subZipCode = "sub_zip_code"
+//        case subAddress = "sub_address"
+//        case subAddressDetail = "sub_address_detail"
         case managerName = "manager_name"
-        case managerPhoneNo = "manager_phone_no"
-        case subManagerName = "sub_manager_name"
-        case subManagerPhoneNo = "sub_manager_phone_no"
-        case fax, email
+//        case managerPhoneNo = "manager_phone_no"
+//        case subManagerName = "sub_manager_name"
+//        case subManagerPhoneNo = "sub_manager_phone_no"
+        case email
         case representativeName = "representative_name"
         case representativePhoneNo = "representative_phone_no"
         case foundedAt = "founded_at"
@@ -56,14 +56,8 @@ extension CompanyInfoDetailResponseDTO {
             mainZipCode: mainZipCode,
             mainAddress: mainAddress,
             mainAddressDetail: mainAddressDetail,
-            subZipCode: subZipCode ?? "없음",
-            subAddress: subAddress ?? "없음",
-            subAddressDetail: subAddressDetail ?? "없음",
             managerName: managerName,
-            managerPhoneNo: managerPhoneNo,
-            subManagerName: subManagerName ?? "없음",
-            subManagerPhoneNo: subManagerPhoneNo ?? "없음",
-            fax: fax ?? "없음",
+//            managerPhoneNo: managerPhoneNo,
             email: email,
             representativeName: representativeName,
             representativePhoneNo: representativePhoneNo,

Projects/Data/Sources/DataSource/API/SystemAPI.swift

@@ -0,0 +1,47 @@
+import Moya
+import Domain
+import AppNetwork
+
+enum SystemAPI {
+    case fetchServerStatus
+}
+
+extension SystemAPI: JobisAPI {
+    typealias ErrorType = UsersError
+
+    var domain: JobisDomain {
+        .presignedURL
+    }
+
+    var urlPath: String {
+        switch self {
+        case .fetchServerStatus:
+            return ""
+        }
+    }
+
+    var method: Method {
+        switch self {
+        case .fetchServerStatus:
+            return .get
+        }
+    }
+
+    var task: Task {
+        switch self {
+        default:
+            return .requestPlain
+        }
+    }
+
+    var jwtTokenType: JwtTokenType {
+        switch self {
+        default:
+            return .none
+        }
+    }
+
+    var errorMap: [Int: ErrorType]? {
+        return nil
+    }
+}

Projects/Data/Sources/DataSource/API/UsersAPI.swift

@@ -4,6 +4,7 @@ import AppNetwork
 
 enum UsersAPI {
     case signin(SigninRequestQuery)
+    case deleteDeviceToken
 }
 
 extension UsersAPI: JobisAPI {
@@ -17,25 +18,33 @@ extension UsersAPI: JobisAPI {
         switch self {
         case .signin:
             return "/login"
+        case .deleteDeviceToken:
+            return "/device-token"
         }
     }
 
     var method: Method {
         switch self {
         case .signin:
             return .post
+        case .deleteDeviceToken:
+            return .patch
         }
     }
 
     var task: Task {
         switch self {
         case let .signin(req):
             return .requestJSONEncodable(req)
+        default:
+            return .requestPlain
         }
     }
 
     var jwtTokenType: JwtTokenType {
         switch self {
+        case .deleteDeviceToken:
+            return .accessToken
         default:
             return .none
         }
@@ -50,6 +59,8 @@ extension UsersAPI: JobisAPI {
                 404: .notFoundEmail,
                 500: .internalServerError
             ]
+        default:
+            return nil
         }
     }
 }

Projects/Data/Sources/DataSource/API/WinterInternAPI.swift

@@ -0,0 +1,47 @@
+import Moya
+import Domain
+import AppNetwork
+
+enum WinterInternAPI {
+    case fetchWinterInternSeason
+}
+
+extension WinterInternAPI: JobisAPI {
+    typealias ErrorType = JobisError
+
+    var domain: JobisDomain {
+        .winterIntern
+    }
+
+    var urlPath: String {
+        switch self {
+        case .fetchWinterInternSeason:
+            return ""
+        }
+    }
+
+    var method: Moya.Method {
+        switch self {
+        case .fetchWinterInternSeason:
+            return .get
+        }
+    }
+
+    var task: Moya.Task {
+        switch self {
+        default:
+            return .requestPlain
+        }
+    }
+
+    var jwtTokenType: JwtTokenType {
+        .accessToken
+    }
+
+    var errorMap: [Int: ErrorType]? {
+        switch self {
+        case .fetchWinterInternSeason:
+            return [:]
+        }
+    }
+}

Projects/Data/Sources/DataSource/Remote/RemoteSystemDataSource.swift

@@ -0,0 +1,13 @@
+import RxSwift
+import Domain
+
+protocol RemoteSystemDataSource {
+    func fetchServerStatus() -> Completable
+}
+
+final class RemoteSystemDataSourceImpl: RemoteBaseDataSource<SystemAPI>, RemoteSystemDataSource {
+    func fetchServerStatus() -> Completable {
+        request(.fetchServerStatus)
+            .asCompletable()
+    }
+}

Projects/Data/Sources/DataSource/Remote/RemoteUsersDataSource.swift

@@ -3,6 +3,7 @@ import Domain
 
 protocol RemoteUsersDataSource {
     func signin(req: SigninRequestQuery) -> Single<AuthorityType>
+    func deleteDeviceToken() -> Completable
 }
 
 final class RemoteUsersDataSourceImpl: RemoteBaseDataSource<UsersAPI>, RemoteUsersDataSource {
@@ -11,4 +12,9 @@ final class RemoteUsersDataSourceImpl: RemoteBaseDataSource<UsersAPI>, RemoteUse
             .map(AuthTokenResponseDTO.self)
             .map { $0.toDomain() }
     }
+
+    func deleteDeviceToken() -> Completable {
+        request(.deleteDeviceToken)
+            .asCompletable()
+    }
 }

Projects/Data/Sources/DataSource/Remote/RemoteWinterInternDataSource.swift

@@ -0,0 +1,22 @@
+import Foundation
+import RxSwift
+import Domain
+
+protocol RemoteWinterInternDataSource {
+    func fetchWinterInternSeason() -> Single<Bool>
+}
+
+final class RemoteWinterInternDataSourceImpl: RemoteBaseDataSource<WinterInternAPI>, RemoteWinterInternDataSource {
+    func fetchWinterInternSeason() -> Single<Bool> {
+        return request(.fetchWinterInternSeason)
+            .map { response -> Bool in
+                if let data = try? JSONDecoder().decode(Bool.self, from: response.data) {
+                    return data
+                } else {
+                    print("failed to load winterInterSeason")
+                    return false
+                }
+            }
+    }
+
+}