feat/#213 진웅오빠꺼 pull 받음!

OMZigak · Jul 18, 2024 · ace4460 · ace4460
2 parents 1b3a2ee + b66b122
commit ace4460
Show file tree

Hide file tree

Showing 18 changed files with 271 additions and 103 deletions.
diff --git a/KkuMulKum/Application/AppDelegate.swift b/KkuMulKum/Application/AppDelegate.swift
@@ -104,24 +104,26 @@ extension AppDelegate: MessagingDelegate, UNUserNotificationCenterDelegate {
     }
 
     func messaging(_ messaging: Messaging, didReceiveRegistrationToken fcmToken: String?) {
-        print("Firebase registration token: \(String(describing: fcmToken))")
-
-        if let token = fcmToken {
-            UserDefaults.standard.set(token, forKey: "FCMToken")
-        }
-    }
-
-    func application(_ application: UIApplication, didRegisterForRemoteNotificationsWithDeviceToken deviceToken: Data) {
-        Messaging.messaging().apnsToken = deviceToken
-
-        // APNS 토큰이 설정된 후 FCM 토큰 요청
-        Messaging.messaging().token { token, error in
-            if let error = error {
-                print("Error fetching FCM registration token: \(error)")
-            } else if let token = token {
-                print("FCM Token: \(token)")
-                UserDefaults.standard.set(token, forKey: "FCMToken")
-            }
-        }
-    }
+           print("Firebase registration token: \(String(describing: fcmToken))")
+
+           if let token = fcmToken {
+               let keychainAccessible: KeychainAccessible = DefaultKeychainAccessible()
+               _ = keychainAccessible.saveToken("FCMToken", token)
+               NotificationCenter.default.post(name: Notification.Name("FCMTokenReceived"), object: nil)
+           }
+       }
+
+       func application(_ application: UIApplication, didRegisterForRemoteNotificationsWithDeviceToken deviceToken: Data) {
+           Messaging.messaging().apnsToken = deviceToken
+
+           Messaging.messaging().token { [weak self] token, error in
+               if let error = error {
+                   print("Error fetching FCM registration token: \(error)")
+               } else if let token = token {
+                   print("FCM Token: \(token)")
+                   let keychainAccessible: KeychainAccessible = DefaultKeychainAccessible()
+                   _ = keychainAccessible.saveToken("FCMToken", token)
+               }
+           }
+       }
 }
diff --git a/KkuMulKum/Network/DTO/Model/Meetings/MeetingMembersResponseModel.swift b/KkuMulKum/Network/DTO/Model/Meetings/MeetingMembersResponseModel.swift
@@ -15,7 +15,7 @@ struct MeetingMembersModel: ResponseModelType {
 
 struct Member: Codable {
     let memberID: Int
-    let name: String
+    let name: String?
     let profileImageURL: String?
 
     enum CodingKeys: String, CodingKey {

diff --git a/KkuMulKum/Network/DTO/Model/Promises/MeetingPromisesModel.swift b/KkuMulKum/Network/DTO/Model/Promises/MeetingPromisesModel.swift
@@ -13,10 +13,19 @@ struct MeetingPromisesModel: ResponseModelType {
 }
 
 struct MeetingPromise: Codable {
-    let id: Int
+    let promiseID: Int
     let name: String
     let dDay: Int
     let date: String
     let time: String
     let placeName: String
+
+    enum CodingKeys: String, CodingKey {
+        case promiseID = "promiseId"
+        case name
+        case dDay
+        case date
+        case time
+        case placeName
+    }
 }
diff --git a/KkuMulKum/Network/Service/HomeService.swift b/KkuMulKum/Network/Service/HomeService.swift
@@ -15,4 +15,27 @@ final class HomeService {
     init(provider: MoyaProvider<HomeTargetType> = MoyaProvider(plugins: [MoyaLoggingPlugin()])) {
         self.provider = provider
     }
+
+    func request<T: Decodable>(
+        with request: HomeTargetType
+    ) async throws -> ResponseBodyDTO<T>? {
+        return try await withCheckedThrowingContinuation { continuation in
+            provider.request(request) { result in
+                switch result {
+                case .success(let response):
+                    do {
+                        let decodedData = try JSONDecoder().decode(
+                            ResponseBodyDTO<T>.self,
+                            from: response.data
+                        )
+                        continuation.resume(returning: decodedData)
+                    } catch {
+                        continuation.resume(throwing: error)
+                    }
+                case .failure(let error):
+                    continuation.resume(throwing: error)
+                }
+            }
+        }
+    }
 }
diff --git a/KkuMulKum/Network/Service/MeetingService.swift b/KkuMulKum/Network/Service/MeetingService.swift
@@ -15,4 +15,27 @@ final class MeetingService {
     init(provider: MoyaProvider<MeetingTargetType> = MoyaProvider(plugins: [MoyaLoggingPlugin()])) {
         self.provider = provider
     }
+
+    func request<T: Decodable>(
+        with request: MeetingTargetType
+    ) async throws -> ResponseBodyDTO<T>? {
+        return try await withCheckedThrowingContinuation { continuation in
+            provider.request(request) { result in
+                switch result {
+                case .success(let response):
+                    do {
+                        let decodedData = try JSONDecoder().decode(
+                            ResponseBodyDTO<T>.self,
+                            from: response.data
+                        )
+                        continuation.resume(returning: decodedData)
+                    } catch {
+                        continuation.resume(throwing: error)
+                    }
+                case .failure(let error):
+                    continuation.resume(throwing: error)
+                }
+            }
+        }
+    }
 }
diff --git a/KkuMulKum/Network/Service/PromiseService.swift b/KkuMulKum/Network/Service/PromiseService.swift
@@ -12,8 +12,31 @@ import Moya
 final class PromiseService {
     let provider: MoyaProvider<PromiseTargetType>
 
-    init(provider: MoyaProvider<PromiseTargetType> = MoyaProvider(plugins: [MoyaLoggingPlugin()])
-    ) {
+    init(provider: MoyaProvider<PromiseTargetType> = MoyaProvider(plugins: [MoyaLoggingPlugin()])) {
         self.provider = provider
     }
+
+    func request<T: Decodable>(
+        with request: PromiseTargetType
+    ) async throws -> ResponseBodyDTO<T>? {
+        return try await withCheckedThrowingContinuation { continuation in
+            provider.request(request) { result in
+                switch result {
+                case .success(let response):
+                    do {
+                        let decodedData = try JSONDecoder().decode(
+                            ResponseBodyDTO<T>.self,
+                            from: response.data
+                        )
+                        continuation.resume(returning: decodedData)
+                    } catch {
+                        continuation.resume(throwing: error)
+                    }
+                case .failure(let error):
+                    continuation.resume(throwing: error)
+                }
+            }
+        }
+    }
+
 }
diff --git a/KkuMulKum/Network/Service/UtilService.swift b/KkuMulKum/Network/Service/UtilService.swift
@@ -12,8 +12,30 @@ import Moya
 final class UtilService {
     let provider: MoyaProvider<UtilTargetType>
 
-    init(provider: MoyaProvider<UtilTargetType> = MoyaProvider(plugins: [MoyaLoggingPlugin()])
-    ) {
+    init(provider: MoyaProvider<UtilTargetType> = MoyaProvider(plugins: [MoyaLoggingPlugin()])) {
         self.provider = provider
     }
+
+    func request<T: Decodable>(
+        with request: UtilTargetType
+    ) async throws -> ResponseBodyDTO<T>? {
+        return try await withCheckedThrowingContinuation { continuation in
+            provider.request(request) { result in
+                switch result {
+                case .success(let response):
+                    do {
+                        let decodedData = try JSONDecoder().decode(
+                            ResponseBodyDTO<T>.self,
+                            from: response.data
+                        )
+                        continuation.resume(returning: decodedData)
+                    } catch {
+                        continuation.resume(throwing: error)
+                    }
+                case .failure(let error):
+                    continuation.resume(throwing: error)
+                }
+            }
+        }
+    }
 }
diff --git a/KkuMulKum/Network/TargetType/MeetingTargetType.swift b/KkuMulKum/Network/TargetType/MeetingTargetType.swift
@@ -15,6 +15,7 @@ enum MeetingTargetType {
     case fetchMeetingList
     case fetchMeetingInfo(meetingID: Int)
     case fetchMeetingMember(meetingID: Int)
+    case fetchMeetingPromiseList(meetingID: Int)
 }
 
 extension MeetingTargetType: TargetType {
@@ -39,14 +40,16 @@ extension MeetingTargetType: TargetType {
             return "/api/v1/meetings/\(meetingID)"
         case .fetchMeetingMember(meetingID: let meetingID):
             return "/api/v1/meetings/\(meetingID)/members"
+        case .fetchMeetingPromiseList(let meetingID):
+            return "/api/v1/meetings/\(meetingID)/promises"
         }
     }
 
     var method: Moya.Method {
         switch self {
         case .createMeeting, .joinMeeting:
             return .post
-        case .fetchMeetingList, .fetchMeetingInfo, .fetchMeetingMember:
+        case .fetchMeetingList, .fetchMeetingInfo, .fetchMeetingMember, .fetchMeetingPromiseList:
             return .get
         }
     }
@@ -57,7 +60,7 @@ extension MeetingTargetType: TargetType {
             return .requestJSONEncodable(request)
         case .joinMeeting(request: let request):
             return .requestJSONEncodable(request)
-        case .fetchMeetingList, .fetchMeetingInfo, .fetchMeetingMember:
+        case .fetchMeetingList, .fetchMeetingInfo, .fetchMeetingMember, .fetchMeetingPromiseList:
             return .requestPlain
         }
     }

diff --git a/KkuMulKum/Network/TargetType/PromiseTargetType.swift b/KkuMulKum/Network/TargetType/PromiseTargetType.swift
@@ -15,7 +15,7 @@ enum PromiseTargetType {
     case updatePreparationStatus(promiseID: Int)
     case updateDepartureStatus(promiseID: Int)
     case updateArrivalStatus(promiseID: Int)
-    case fetchmeetingPromiseList(meetingID: Int, request: PromiseInfoModel)
+    case fetchMeetingPromiseList(meetingID: Int)
     case addPromise(meetingID: Int, request: AddPromiseRequestModel)
     case fetchPromiseInfo(promiseID: Int)
     case fetchMyReadyStatus(promiseID: Int)
@@ -47,10 +47,10 @@ extension PromiseTargetType: TargetType {
             return "/api/v1/promises/\(promiseID)/departure"
         case .updateArrivalStatus(let promiseID):
             return "/api/v1/promises/\(promiseID)/arrival"
-        case .fetchmeetingPromiseList(let meetingID, _):
-            return "/api/v1/promises/\(meetingID)/promises"
+        case .fetchMeetingPromiseList(let meetingID):
+            return "/api/v1/meetings/\(meetingID)/promises"
         case .addPromise(let meetingID, _):
-            return "/api/v1/promises/\(meetingID)/promises"
+            return "/api/v1/meetings/\(meetingID)/promises"
         case .fetchPromiseInfo(let promiseID):
             return "/api/v1/promises/\(promiseID)"
         case .fetchMyReadyStatus(let promiseID):
@@ -68,7 +68,7 @@ extension PromiseTargetType: TargetType {
 
     var method: Moya.Method {
         switch self {
-        case .fetchTodayNextPromise, .fetchUpcomingPromiseList, .fetchmeetingPromiseList, 
+        case .fetchTodayNextPromise, .fetchUpcomingPromiseList, .fetchMeetingPromiseList, 
                 .fetchPromiseInfo, .fetchMyReadyStatus, .fetchPromiseParticipantList,
                 .fetchTardyInfo:
             return .get
@@ -85,10 +85,8 @@ extension PromiseTargetType: TargetType {
         case .fetchTodayNextPromise, .fetchUpcomingPromiseList, .updatePreparationStatus,
                 .updateDepartureStatus, .updateArrivalStatus, .fetchPromiseInfo,
                 .fetchMyReadyStatus, .fetchPromiseParticipantList, .updateMyPromiseReadyStatus,
-                .fetchTardyInfo, .updatePromiseCompletion:
+                .fetchTardyInfo, .updatePromiseCompletion, .fetchMeetingPromiseList:
             return .requestPlain
-        case .fetchmeetingPromiseList(_, let request):
-            return .requestJSONEncodable(request)
         case .addPromise(_, let request):
             return .requestJSONEncodable(request)
         }

diff --git a/KkuMulKum/Source/AddPromise/Cell/SelectMemberCell.swift b/KkuMulKum/Source/AddPromise/Cell/SelectMemberCell.swift
@@ -63,7 +63,7 @@ extension SelectMemberCell {
     func configure(with member: Member) {
         self.member = member
 
-        nameLabel.setText(member.name, style: .body06, color: .gray6)
+        nameLabel.setText(member.name ?? " ", style: .body06, color: .gray6)
         profileImageView.image = .imgProfile.withRenderingMode(.alwaysOriginal)
         guard let imageURL = URL(string: member.profileImageURL ?? "") else { return }
         profileImageView.kf.setImage(with: imageURL)

diff --git a/KkuMulKum/Source/Core/Auth/AuthInterceptor.swift b/KkuMulKum/Source/Core/Auth/AuthInterceptor.swift
@@ -41,7 +41,7 @@ class AuthInterceptor: RequestInterceptor {
         }
 
         guard let refreshToken = authService.getRefreshToken() else {
-            authService.clearTokens()
+            _ = authService.clearTokens()
             completion(.doNotRetry)
             return
         }
@@ -54,23 +54,23 @@ class AuthInterceptor: RequestInterceptor {
                     if reissueResponse.success, let data = reissueResponse.data {
                         let newAccessToken = data.accessToken
                         let newRefreshToken = data.refreshToken
-                        self?.authService.saveAccessToken(newAccessToken)
-                        self?.authService.saveRefreshToken(newRefreshToken)
+                        _ = self?.authService.saveAccessToken(newAccessToken)
+                        _ = self?.authService.saveRefreshToken(newRefreshToken)
                         print("Token refreshed successfully in interceptor")
                         completion(.retry)
                     } else {
                         print("Token refresh failed in interceptor: \(reissueResponse.error?.message ?? "Unknown error")")
-                        self?.authService.clearTokens()
+                        _ = self?.authService.clearTokens()
                         completion(.doNotRetry)
                     }
                 } catch {
                     print("Token refresh failed in interceptor: \(error)")
-                    self?.authService.clearTokens()
+                    _ = self?.authService.clearTokens()
                     completion(.doNotRetry)
                 }
             case .failure(let error):
                 print("Network error during token refresh in interceptor: \(error)")
-                self?.authService.clearTokens()
+                _ = self?.authService.clearTokens()
                 completion(.doNotRetry)
             }
         }

diff --git a/KkuMulKum/Source/MeetingInfo/Cell/MeetingMemberCell.swift b/KkuMulKum/Source/MeetingInfo/Cell/MeetingMemberCell.swift
@@ -102,7 +102,7 @@ private extension MeetingMemberCell {
         let name = member.name
         let imageURL = member.profileImageURL
 
-        nameLabel.setText(name, style: .caption02, color: .gray6)
+        nameLabel.setText(name ?? " ", style: .caption02, color: .gray6)
         profileImageButton.setImage(
             .imgProfile.withRenderingMode(.alwaysOriginal),
             for: .normal