[DEPLOY] : 3.0.0

MLS/.swiftlint.yml

@@ -7,8 +7,8 @@ line_length:
   error: 300
 
 function_body_length:
-    warning: 80
-    error: 120
+    warning: 100
+    error: 150
 
 disabled_rules:
   - force_cast

MLS/Data/Data/Network/DTO/AlarmDTO/AlarmResponseDTO.swift

@@ -35,7 +35,7 @@ public struct AlarmResponseDTO: Decodable {
         public let type: String
         public let title: String
         public let link: String
-        public let date: [Int]
+        public let date: String
     }
 
     public struct AllContent: Decodable {

MLS/Data/Data/Network/DTO/BookmarkDTO/SetBookmarkDTO.swift

@@ -0,0 +1,11 @@
+import DomainInterface
+
+public struct SetBookmarkDTO: Decodable {
+    public let bookmarkId: Int
+    public let bookmarkType: String
+    public let resourceId: Int
+
+    public func toDomain() -> Int {
+        return self.bookmarkId
+    }
+}

MLS/Data/Data/Network/DTO/DictionaryDetailDTO/Item/DictionaryDetailItemResponseDTO.swift

@@ -1,7 +1,7 @@
 import DomainInterface
 
 public struct DictionaryDetailItemResponseDTO: Decodable {
-    public let itemId: Int?
+    public let itemId: Int
     public let nameKr: String?
     public let nameEn: String?
     public let descriptionText: String?

MLS/Data/Data/Network/DTO/DictionaryDetailDTO/Map/DictionaryDetailMapResponseDTO.swift

@@ -1,7 +1,7 @@
 import DomainInterface
 
 public struct DictionaryDetailMapResponseDTO: Decodable {
-    public let mapId: Int?
+    public let mapId: Int
     public let nameKr: String?
     public let nameEn: String?
     public let regionName: String?

MLS/Data/Data/Network/DTO/DictionaryDetailDTO/Quest/DictionaryDetailQuestResponseDTO.swift

@@ -1,7 +1,7 @@
 import DomainInterface
 
 public struct DictionaryDetailQuestResponseDTO: Decodable {
-    public let questId: Int?
+    public let questId: Int
     public let titlePrefix: String?
     public let nameKr: String?
     public let nameEn: String?

MLS/Data/Data/Network/DTO/EmptyResponseDTO.swift

@@ -0,0 +1,5 @@
+public struct EmptyResponseDTO: Decodable {
+    func toBookmarkDomain() -> Int? {
+        return nil
+    }
+}

MLS/Data/Data/Network/Endpoints/AuthEndPoint.swift

@@ -61,12 +61,11 @@ public enum AuthEndPoint {
         )
     }
 
-    public static func fcmToken(credential: String, body: Encodable) -> ResponsableEndPoint<MemberDTO> {
+    public static func fcmToken(body: Encodable) -> ResponsableEndPoint<MemberDTO> {
         .init(
             baseURL: base,
             path: "/api/v1/auth/member/fcm-token",
             method: .PUT,
-            headers: ["Authorization": "Bearer \(credential)"],
             body: body
         )
     }

MLS/Data/Data/Network/Endpoints/BookmarkEndPoint.swift

@@ -3,7 +3,7 @@ import DomainInterface
 public enum BookmarkEndPoint {
     static let base = "https://api.mapleland.kro.kr"
 
-    public static func setBookmark(body: Encodable) -> ResponsableEndPoint<[BookmarkDTO]> {
+    public static func setBookmark(body: Encodable) -> ResponsableEndPoint<SetBookmarkDTO> {
         .init(
             baseURL: base,
             path: "/api/v1/bookmarks",
@@ -12,7 +12,7 @@ public enum BookmarkEndPoint {
         )
     }
 
-    public static func deleteBookmark(bookmarkId: Int) -> ResponsableEndPoint<[BookmarkDTO]> {
+    public static func deleteBookmark(bookmarkId: Int) -> ResponsableEndPoint<EmptyResponseDTO> {
         .init(
             baseURL: base,
             path: "/api/v1/bookmarks/\(bookmarkId)",

MLS/Data/Data/Network/Endpoints/CollectionEndPoint.swift

@@ -24,24 +24,6 @@ public enum CollectionEndPoint {
         )
     }
 
-    public static func addBookmarksToCollection(id: Int, body: Encodable) -> EndPoint {
-        .init(
-            baseURL: base,
-            path: "/api/v1/collections/\(id)/bookmarks",
-            method: .POST,
-            body: body
-        )
-    }
-
-    public static func addCollectionsToBookmark(id: Int, body: Encodable) -> EndPoint {
-        .init(
-            baseURL: base,
-            path: "/api/v1/bookmarks/\(id)/collections",
-            method: .POST,
-            body: body
-        )
-    }
-
     public static func setCollectionName(id: Int, body: Encodable) -> EndPoint {
         .init(
             baseURL: base,

MLS/Data/Data/Providers/Network/NetworkProviderImpl.swift

@@ -32,7 +32,15 @@ public final class NetworkProviderImpl: NetworkProvider {
                         do {
                             let decoded = try JSONDecoder().decode(APIDefaultResponseDTO<T.Response>.self, from: data)
                             print("🎯 requestData: 디코딩 성공 - \(decoded)")
-                            observer.onNext(decoded.data!)
+                            if let decodedData = decoded.data {
+                                observer.onNext(decodedData)
+                            } else {
+                                if T.Response.self == EmptyResponseDTO.self {
+                                    observer.onNext(EmptyResponseDTO() as! T.Response)
+                                } else {
+                                    observer.onError(NetworkError.invalidResponse)
+                                }
+                            }
                             observer.onCompleted()
                         } catch {
                             print("❌ requestData: 디코딩 실패 - \(error)")
@@ -115,6 +123,7 @@ private extension NetworkProviderImpl {
                     completion(.success(data))
                 case .failure(let error):
                     completion(.failure(error))
+                    print("API 통신에러 \(error)")
                 }
             }
             task.resume()

MLS/Data/Data/Repository/AlarmAPIRepositoryImpl.swift

@@ -13,32 +13,32 @@ public class AlarmAPIRepositoryImpl: AlarmAPIRepository {
         self.tokenInterceptor = interceptor
     }
 
-    public func fetchPatchNotes(cursor: [Int]?, pageSize: Int) -> Observable<PagedEntity<AlarmResponse>> {
-        let endpoint = AlarmEndPoint.fetchPatchNotes(query: AlarmQuery(cursor: cursor, pageSize: 999/*pageSize*/))
+    public func fetchPatchNotes(cursor: String?, pageSize: Int) -> Observable<PagedEntity<AlarmResponse>> {
+        let endpoint = AlarmEndPoint.fetchPatchNotes(query: AlarmQuery(cursor: cursor, pageSize: pageSize))
         return provider.requestData(endPoint: endpoint, interceptor: tokenInterceptor)
             .map { $0.toAlarmDomain() }
     }
 
-    public func fetchNotices(cursor: [Int]?, pageSize: Int) -> Observable<PagedEntity<AlarmResponse>> {
-        let endpoint = AlarmEndPoint.fetchNotices(query: AlarmQuery(cursor: cursor, pageSize: 999/*pageSize*/))
+    public func fetchNotices(cursor: String?, pageSize: Int) -> Observable<PagedEntity<AlarmResponse>> {
+        let endpoint = AlarmEndPoint.fetchNotices(query: AlarmQuery(cursor: cursor, pageSize: pageSize))
         return provider.requestData(endPoint: endpoint, interceptor: tokenInterceptor)
             .map { $0.toAlarmDomain() }
     }
 
-    public func fetchOutdatedEvents(cursor: [Int]?, pageSize: Int) -> Observable<PagedEntity<AlarmResponse>> {
-        let endpoint = AlarmEndPoint.fetchOutdatedEvents(query: AlarmQuery(cursor: cursor, pageSize: 999/*pageSize*/))
+    public func fetchOutdatedEvents(cursor: String?, pageSize: Int) -> Observable<PagedEntity<AlarmResponse>> {
+        let endpoint = AlarmEndPoint.fetchOutdatedEvents(query: AlarmQuery(cursor: cursor, pageSize: pageSize))
         return provider.requestData(endPoint: endpoint, interceptor: tokenInterceptor)
             .map { $0.toAlarmDomain() }
     }
 
-    public func fetchOngoingEvents(cursor: [Int]?, pageSize: Int) -> Observable<PagedEntity<AlarmResponse>> {
-        let endpoint = AlarmEndPoint.fetchOngoingEvents(query: AlarmQuery(cursor: cursor, pageSize: 999/*pageSize*/))
+    public func fetchOngoingEvents(cursor: String?, pageSize: Int) -> Observable<PagedEntity<AlarmResponse>> {
+        let endpoint = AlarmEndPoint.fetchOngoingEvents(query: AlarmQuery(cursor: cursor, pageSize: pageSize))
         return provider.requestData(endPoint: endpoint, interceptor: tokenInterceptor)
             .map { $0.toAlarmDomain() }
     }
 
-    public func fetchAll(cursor: [Int]?, pageSize: Int) -> Observable<PagedEntity<AllAlarmResponse>> {
-        let endpoint = AlarmEndPoint.fetchAll(query: AlarmQuery(cursor: cursor, pageSize: 999/*pageSize*/))
+    public func fetchAll(cursor: String?, pageSize: Int) -> Observable<PagedEntity<AllAlarmResponse>> {
+        let endpoint = AlarmEndPoint.fetchAll(query: AlarmQuery(cursor: cursor, pageSize: pageSize))
         return provider.requestData(endPoint: endpoint, interceptor: tokenInterceptor)
             .map { $0.toAllAlarmDomain() }
     }
@@ -52,7 +52,7 @@ public class AlarmAPIRepositoryImpl: AlarmAPIRepository {
 
 private extension AlarmAPIRepositoryImpl {
     struct AlarmQuery: Encodable {
-        let cursor: [Int]?
+        let cursor: String?
         let pageSize: Int
     }
 

MLS/Data/Data/Repository/AuthAPIRepositoryImpl.swift

@@ -78,12 +78,12 @@ public class AuthAPIRepositoryImpl: AuthAPIRepository {
 
     public func reissueToken(refreshToken: String) -> Observable<LoginResponse> {
         let endPoint = AuthEndPoint.reIssueToken(refreshToken: refreshToken)
-        return provider.requestData(endPoint: endPoint, interceptor: authInterceptor).map { $0.toLoginDomain() }
+        return provider.requestData(endPoint: endPoint, interceptor: nil).map { $0.toLoginDomain() }
     }
 
-    public func fcmToken(credential: String, fcmToken: String?) -> Completable {
-        let endPoint = AuthEndPoint.fcmToken(credential: credential, body: FCMTokenBody(fcmToken: fcmToken))
-        return provider.requestData(endPoint: endPoint, interceptor: tokenInterceptor)
+    public func fcmToken(fcmToken: String?) -> Completable {
+        let endPoint = AuthEndPoint.fcmToken(body: FCMTokenBody(fcmToken: fcmToken))
+        return provider.requestData(endPoint: endPoint, interceptor: authInterceptor)
     }
 
     public func fetchJobList() -> Observable<JobListResponse> {

MLS/Data/Data/Repository/BookmarkRepositoryImpl.swift

@@ -13,14 +13,16 @@ public class BookmarkRepositoryImpl: BookmarkRepository {
         self.tokenInterceptor = interceptor
     }
 
-    public func setBookmark(bookmarkId: Int, type: DictionaryItemType) -> Completable {
+    public func setBookmark(bookmarkId: Int, type: DictionaryItemType) -> Observable<Int> {
         let endPoint = BookmarkEndPoint.setBookmark(body: SetBookmarkQuery(bookmarkType: type.rawValue, resourceId: bookmarkId))
         return provider.requestData(endPoint: endPoint, interceptor: tokenInterceptor)
+            .map { $0.toDomain() }
     }
 
-    public func deleteBookmark(bookmarkId: Int) -> Completable {
+    public func deleteBookmark(bookmarkId: Int) -> Observable<Int?> {
         let endPoint = BookmarkEndPoint.deleteBookmark(bookmarkId: bookmarkId)
         return provider.requestData(endPoint: endPoint, interceptor: tokenInterceptor)
+            .map { $0.toBookmarkDomain() }
     }
 
     public func fetchBookmark(sort: String?) -> Observable<[BookmarkResponse]> {

MLS/Data/Data/Repository/CollectionAPIRepositoryImpl.swift

@@ -31,29 +31,7 @@ public class CollectionAPIRepositoryImpl: CollectionAPIRepository {
             .map { $0.toDomain() }
     }
 
-//    public func addBookmarksToCollection(collectionId: Int, bookmarkIds: [Int]) -> Completable {
-//        let endPoint = CollectionEndPoint.addBookmarksToCollection(id: collectionId, body: AddBookmarkRequestBody(bookmarkIds: bookmarkIds))
-//        return provider.requestData(endPoint: endPoint, interceptor: tokenInterceptor)
-//            .catch { error in
-//                if let netErr = error as? NetworkError {
-//                    switch netErr {
-//                    case let .statusError(code, body):
-//                        return .error(DomainHTTPError.httpStatus(code: code, message: body))
-//                    default:
-//                        return .error(DomainHTTPError.unknown)
-//                    }
-//                } else {
-//                    return .error(DomainHTTPError.unknown)
-//                }
-//            }
-//    }
-//
-//    public func addCollectionsToBookmark(bookmarkId: Int, collectionIds: [Int]) -> Completable {
-//        let endPoint = CollectionEndPoint.addCollectionsToBookmark(id: bookmarkId, body: AddCollectionRequestBody(collectionIds: collectionIds))
-//        return provider.requestData(endPoint: endPoint, interceptor: tokenInterceptor)
-//    }
-
-    public func setCollectionName(collectionId: Int, name: String) -> Completable {
+    public func updateCollectionName(collectionId: Int, name: String) -> Completable {
         let endPoint = CollectionEndPoint.setCollectionName(id: collectionId, body: SetCollectionRequestBody(name: name))
         return provider.requestData(endPoint: endPoint, interceptor: tokenInterceptor)
     }

MLS/Data/Data/Repository/UserDefaultsRepositoryImpl.swift

@@ -1,6 +1,7 @@
-import DomainInterface
 import Foundation
 
+import DomainInterface
+
 import RxSwift
 
 public final class UserDefaultsRepositoryImpl: UserDefaultsRepository {

MLS/Data/DataMock/Repository/AuthAPIRepositoryMock.swift

@@ -36,7 +36,7 @@ public class AuthAPIRepositoryMock: AuthAPIRepository {
         return Observable.just(.init(accessToken: "testToken", refreshToken: "testToken"))
     }
 
-    public func fcmToken(credential: String, fcmToken: String?) -> Completable {
+    public func fcmToken(fcmToken: String?) -> Completable {
         return .empty()
     }
 

MLS/Domain/Domain/Interceptor/AuthInterceptor.swift

@@ -14,6 +14,9 @@ public final class AuthInterceptor: Interceptor {
     public func adapt(_ request: URLRequest) -> URLRequest {
         var request = request
         if case .success(let token) = tokenRepository.fetchToken(type: .accessToken) {
+            #if DEBUG
+            print("accessToken: \(token)")
+            #endif
             request.setValue("Bearer \(token)", forHTTPHeaderField: "Authorization")
         }
         return request
@@ -33,7 +36,7 @@ public final class AuthInterceptor: Interceptor {
                 let repo = authRepository()
                 repo.reissueToken(refreshToken: refreshToken)
                     .subscribe(onNext: { _ in
-                        print("✅ reissue 완료 (저장은 UseCase 쪽에서 처리)")
+                        print("✅ reissue 완료")
                     }, onError: { error in
                         print("❌ reissue 실패: \(error)")
                     })

MLS/Domain/Domain/UseCaseImpl/Alarm/FetchAllAlarmUseCaseImpl.swift

@@ -11,7 +11,7 @@ public class FetchAllAlarmUseCaseImpl: FetchAllAlarmUseCase {
         self.repository = repository
     }
 
-    public func execute(cursor: [Int]?, pageSize: Int) -> Observable<PagedEntity<AllAlarmResponse>> {
+    public func execute(cursor: String?, pageSize: Int) -> Observable<PagedEntity<AllAlarmResponse>> {
         return repository.fetchAll(cursor: cursor, pageSize: pageSize)
     }
 }

MLS/Domain/Domain/UseCaseImpl/Alarm/FetchNoticesUseCaseImpl.swift

@@ -11,7 +11,7 @@ public class FetchNoticesUseCaseImpl: FetchNoticesUseCase {
         self.repository = repository
     }
 
-    public func execute(cursor: [Int]?, pageSize: Int) -> Observable<PagedEntity<AlarmResponse>> {
+    public func execute(cursor: String?, pageSize: Int) -> Observable<PagedEntity<AlarmResponse>> {
         return repository.fetchNotices(cursor: cursor, pageSize: pageSize)
     }
 }

MLS/Domain/Domain/UseCaseImpl/Alarm/FetchOngoingEventsUseCaseImpl.swift

@@ -11,7 +11,7 @@ public class FetchOngoingEventsUseCaseImpl: FetchOngoingEventsUseCase {
         self.repository = repository
     }
 
-    public func execute(cursor: [Int]?, pageSize: Int) -> Observable<PagedEntity<AlarmResponse>> {
+    public func execute(cursor: String?, pageSize: Int) -> Observable<PagedEntity<AlarmResponse>> {
         return repository.fetchOngoingEvents(cursor: cursor, pageSize: pageSize)
     }
 }

MLS/Domain/Domain/UseCaseImpl/Alarm/FetchOutdatedEventsUseCaseImpl.swift

@@ -11,7 +11,7 @@ public class FetchOutdatedEventsUseCaseImpl: FetchOutdatedEventsUseCase {
         self.repository = repository
     }
 
-    public func execute(cursor: [Int]?, pageSize: Int) -> Observable<PagedEntity<AlarmResponse>> {
+    public func execute(cursor: String?, pageSize: Int) -> Observable<PagedEntity<AlarmResponse>> {
         return repository.fetchOutdatedEvents(cursor: cursor, pageSize: pageSize)
     }
 }

MLS/Domain/Domain/UseCaseImpl/Alarm/FetchPatchNotesUseCaseImpl.swift

@@ -11,7 +11,7 @@ public class FetchPatchNotesUseCaseImpl: FetchPatchNotesUseCase {
         self.repository = repository
     }
 
-    public func execute(cursor: [Int]?, pageSize: Int) -> Observable<PagedEntity<AlarmResponse>> {
+    public func execute(cursor: String?, pageSize: Int) -> Observable<PagedEntity<AlarmResponse>> {
         return repository.fetchPatchNotes(cursor: cursor, pageSize: pageSize)
     }
 }

MLS/Domain/Domain/UseCaseImpl/AuthAPI/LoginWithAppleUseCaseImpl.swift

@@ -23,14 +23,25 @@ public class LoginWithAppleUseCaseImpl: LoginWithAppleUseCase {
                 let saveRefresh = self.tokenRepository.saveToken(type: .refreshToken, value: response.refreshToken)
                 let savePlatform = self.userDefaultsRepository.savePlatform(platform: .apple)
 
-                switch (saveAccess, saveRefresh) {
-                case (.success, .success):
-                    return savePlatform.andThen(Observable.just(response))
-                default:
-                    return Observable.error(
-                        TokenRepositoryError.dataConversionError(message: "Failed to save tokens")
-                    )
+                guard case (.success, .success) = (saveAccess, saveRefresh) else {
+                    return Observable.error(TokenRepositoryError.dataConversionError(message: "Failed to save tokens"))
                 }
+
+                var fcmToken: String?
+                if case .success(let token) = self.tokenRepository.fetchToken(type: .fcmToken) {
+                    fcmToken = token
+                }
+
+                let fcmUpdate = if let fcmToken {
+                    self.authRepository.fcmToken(fcmToken: fcmToken)
+                        .catch { error in
+                            print("FCM token update failed: \(error)")
+                            return .empty()
+                        }
+                } else {
+                    Completable.empty()
+                }
+                return fcmUpdate.andThen(savePlatform).andThen(Observable.just(response))
             }
             .catch { error in
                 Observable.error(error)