내부 테스트 피드백 수정

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

@@ -5,7 +5,7 @@ public struct DictionaryDetailItemResponseDTO: Decodable {
     public let nameKr: String?
     public let nameEn: String?
     public let descriptionText: String?
-    public let imgUrl: String?
+    public let itemImageUrl: String?
     public let npcPrice: Int?
     public let itemType: String?
     public let categoryHierachy: CategoryHierachy?
@@ -21,7 +21,7 @@ public struct DictionaryDetailItemResponseDTO: Decodable {
             nameKr: nameKr,
             nameEn: nameEn,
             descriptionText: descriptionText,
-            imgUrl: imgUrl,
+            imgUrl: itemImageUrl,
             npcPrice: npcPrice,
             itemType: itemType,
             categoryHierachy: categoryHierachy,

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) -> EndPoint {
+    public static func setBookmark(body: Encodable) -> ResponsableEndPoint<[BookmarkDTO]> {
         .init(
             baseURL: base,
             path: "/api/v1/bookmarks",
@@ -12,7 +12,7 @@ public enum BookmarkEndPoint {
         )
     }
 
-    public static func deleteBookmark(bookmarkId: Int) -> EndPoint {
+    public static func deleteBookmark(bookmarkId: Int) -> ResponsableEndPoint<[BookmarkDTO]> {
         .init(
             baseURL: base,
             path: "/api/v1/bookmarks/\(bookmarkId)",

MLS/Data/Data/Network/Endpoints/DictionaryDetailEndPoint.swift

@@ -12,8 +12,8 @@ public enum DictionaryDetailEndPoint {
     }
 
     // 몬스터 디테일 드롭아이템
-    public static func fetchMonsterDetailDropItem(id: Int, sort: [String]?) -> ResponsableEndPoint<[DictionaryDetailMonsterDropItemResponseDTO]> {
-        return .init(baseURL: base, path: "/api/v1/monsters/\(id)/items", method: .GET, query: ["sort": sort?.joined(separator: ",")])
+    public static func fetchMonsterDetailDropItem(id: Int, query: Encodable) -> ResponsableEndPoint<[DictionaryDetailMonsterDropItemResponseDTO]> {
+        return .init(baseURL: base, path: "/api/v1/monsters/\(id)/items", method: .GET, query: query)
     }
 
     // 몬스터 디테일 출현맵
@@ -26,8 +26,8 @@ public enum DictionaryDetailEndPoint {
         return .init(baseURL: base, path: "/api/v1/npcs/\(id)", method: .GET)
     }
     // Npc 디테일 퀘스트
-    public static func fetchNpcDetailQuest(id: Int, sort: [String]?) -> ResponsableEndPoint<[DictionaryDetailNpcQuestResponseDTO]> {
-        return .init(baseURL: base, path: "/api/v1/npcs/\(id)/quests", method: .GET, query: ["sort": sort?.joined(separator: ",")])
+    public static func fetchNpcDetailQuest(id: Int, query: Encodable) -> ResponsableEndPoint<[DictionaryDetailNpcQuestResponseDTO]> {
+        return .init(baseURL: base, path: "/api/v1/npcs/\(id)/quests", method: .GET, query: query)
     }
     // NPC 디테일 맵
     public static func fetchNpcDetailMap(id: Int) -> ResponsableEndPoint<[DictionaryDetailMonsterMapResponseDTO]> {
@@ -38,8 +38,8 @@ public enum DictionaryDetailEndPoint {
         return .init(baseURL: base, path: "/api/v1/items/\(id)", method: .GET)
     }
     // Item 디테일 드롭몬스터 상세정보
-    public static func fetchItemDetailDropMonster(id: Int, sort: [String]?) -> ResponsableEndPoint<[DictionaryDetailItemDropMonsterResponseDTO]> {
-        return .init(baseURL: base, path: "/api/v1/items/\(id)/monsters", method: .GET, query: ["sort": sort?.joined(separator: ",")])
+    public static func fetchItemDetailDropMonster(id: Int, query: Encodable) -> ResponsableEndPoint<[DictionaryDetailItemDropMonsterResponseDTO]> {
+        return .init(baseURL: base, path: "/api/v1/items/\(id)/monsters", method: .GET, query: query)
     }
 
     // Quest 디테일 상세정보
@@ -58,8 +58,8 @@ public enum DictionaryDetailEndPoint {
     }
 
     // Map 디테일 출현 몬스터
-    public static func fetchMapDetailSpawnMonster(id: Int) -> ResponsableEndPoint<[DictionaryDetailMapSpawnMonsterResponseDTO]> {
-        return .init(baseURL: base, path: "/api/v1/maps/\(id)/monsters", method: .GET)
+    public static func fetchMapDetailSpawnMonster(id: Int, query: Encodable) -> ResponsableEndPoint<[DictionaryDetailMapSpawnMonsterResponseDTO]> {
+        return .init(baseURL: base, path: "/api/v1/maps/\(id)/monsters", method: .GET, query: query)
     }
 
     // Map 디테일 출현 npc

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

@@ -129,28 +129,39 @@ private extension NetworkProviderImpl {
     ///   - response: 상태코드를 포함한 통신 응답
     ///   - error: 통신간에 발생한 에러
     /// - Returns: 유효성검사 결과에 따른 데이터와 에러
-    func checkValidation(data: Data?, response: URLResponse?, error: Error?, interceptor: Interceptor?) -> Result<Data?, NetworkError> {
-        if let interceptor = interceptor {
-            if interceptor.retry(data: data, response: response, error: error) {
-                return .failure(.retry)
-            }
-        }
+    func checkValidation(
+        data: Data?,
+        response: URLResponse?,
+        error: Error?,
+        interceptor: Interceptor?
+    ) -> Result<Data?, NetworkError> {
+
+        // 1️⃣ 네트워크 레벨 에러 먼저 체크
         if let error {
             if let urlError = error as? URLError, urlError.code == .unsupportedURL {
-                return .failure(NetworkError.urlRequest(error))
+                return .failure(.urlRequest(error))
             }
-            return .failure(NetworkError.network(error))
+            return .failure(.network(error))
         }
 
+        // 2️⃣ HTTP 응답 객체 확인
         guard let httpResponse = response as? HTTPURLResponse else {
-            return .failure(NetworkError.httpError)
+            return .failure(.httpError)
         }
 
+        // 3️⃣ 상태 코드 기반 검사
         guard (200 ... 299).contains(httpResponse.statusCode) else {
+            // ❗️여기서만 인터셉터 개입
+            if let interceptor = interceptor,
+               interceptor.retry(data: data, response: response, error: error) {
+                return .failure(.retry)
+            }
+
             let errorMessage = data.flatMap { String(data: $0, encoding: .utf8) } ?? "Unknown"
-            return .failure(NetworkError.statusError(httpResponse.statusCode, errorMessage))
+            return .failure(.statusError(httpResponse.statusCode, errorMessage))
         }
 
+        // ✅ 성공 응답
         return .success(data)
     }
 }

MLS/Data/Data/Repository/AlarmAPIRepositoryImpl.swift

@@ -14,31 +14,31 @@ public class AlarmAPIRepositoryImpl: AlarmAPIRepository {
     }
 
     public func fetchPatchNotes(cursor: [Int]?, pageSize: Int) -> Observable<PagedEntity<AlarmResponse>> {
-        let endpoint = AlarmEndPoint.fetchPatchNotes(query: AlarmQuery(cursor: cursor, pageSize: pageSize))
+        let endpoint = AlarmEndPoint.fetchPatchNotes(query: AlarmQuery(cursor: cursor, pageSize: 999/*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: pageSize))
+        let endpoint = AlarmEndPoint.fetchNotices(query: AlarmQuery(cursor: cursor, pageSize: 999/*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: pageSize))
+        let endpoint = AlarmEndPoint.fetchOutdatedEvents(query: AlarmQuery(cursor: cursor, pageSize: 999/*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: pageSize))
+        let endpoint = AlarmEndPoint.fetchOngoingEvents(query: AlarmQuery(cursor: cursor, pageSize: 999/*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: pageSize))
+        let endpoint = AlarmEndPoint.fetchAll(query: AlarmQuery(cursor: cursor, pageSize: 999/*pageSize*/))
         return provider.requestData(endPoint: endpoint, interceptor: tokenInterceptor)
             .map { $0.toAllAlarmDomain() }
     }

MLS/Data/Data/Repository/AuthAPIRepositoryImpl.swift

@@ -7,10 +7,12 @@ import RxSwift
 public class AuthAPIRepositoryImpl: AuthAPIRepository {
     private let provider: NetworkProvider
     private let tokenInterceptor: Interceptor
+    private let authInterceptor: Interceptor
 
-    public init(provider: NetworkProvider, interceptor: Interceptor) {
+    public init(provider: NetworkProvider, tokenInterceptor: Interceptor, authInterceptor: Interceptor) {
         self.provider = provider
-        self.tokenInterceptor = interceptor
+        self.tokenInterceptor = tokenInterceptor
+        self.authInterceptor = authInterceptor
     }
 
     public func fetchProfile() -> Observable<MyPageResponse?> {
@@ -21,7 +23,7 @@ public class AuthAPIRepositoryImpl: AuthAPIRepository {
 
     public func loginWithKakao(credential: Credential) -> Observable<LoginResponse> {
         let endpoint = AuthEndPoint.loginWithKakao(credential: credential)
-        return provider.requestData(endPoint: endpoint, interceptor: nil)
+        return provider.requestData(endPoint: endpoint, interceptor: authInterceptor)
             .map { $0.toLoginDomain() }
             .catch { error in
                 if case NetworkError.statusError(let code, _) = error, code == 404 {
@@ -34,7 +36,7 @@ public class AuthAPIRepositoryImpl: AuthAPIRepository {
 
     public func loginWithApple(credential: Credential) -> Observable<LoginResponse> {
         let endpoint = AuthEndPoint.loginWithApple(credential: credential)
-        return provider.requestData(endPoint: endpoint, interceptor: nil)
+        return provider.requestData(endPoint: endpoint, interceptor: authInterceptor)
             .map { $0.toLoginDomain() }
             .catch { error in
                 if case NetworkError.statusError(let code, _) = error, code == 404 {
@@ -76,7 +78,7 @@ public class AuthAPIRepositoryImpl: AuthAPIRepository {
 
     public func reissueToken(refreshToken: String) -> Observable<LoginResponse> {
         let endPoint = AuthEndPoint.reIssueToken(refreshToken: refreshToken)
-        return provider.requestData(endPoint: endPoint, interceptor: tokenInterceptor).map { $0.toLoginDomain() }
+        return provider.requestData(endPoint: endPoint, interceptor: authInterceptor).map { $0.toLoginDomain() }
     }
 
     public func fcmToken(credential: String, fcmToken: String?) -> Completable {

MLS/Data/Data/Repository/DictionaryDetailAPIRepositoryImpl.swift

@@ -18,8 +18,8 @@ public final class DictionaryDetailAPIRepositoryImpl: DictionaryDetailAPIReposit
         return provider.requestData(endPoint: endPoint, interceptor: tokenInterceptor).map { $0.toDomain() }
     }
 
-    public func fetchMonsterDetailDropItem(id: Int, sort: [String]?) -> Observable<[DictionaryDetailMonsterDropItemResponse]> {
-        let endPoint = DictionaryDetailEndPoint.fetchMonsterDetailDropItem(id: id, sort: sort)
+    public func fetchMonsterDetailDropItem(id: Int, sort: String?) -> Observable<[DictionaryDetailMonsterDropItemResponse]> {
+        let endPoint = DictionaryDetailEndPoint.fetchMonsterDetailDropItem(id: id, query: SortQuery(sort: sort))
         return provider.requestData(endPoint: endPoint, interceptor: tokenInterceptor).map {$0.map {$0.toDomain()}}
     }
 
@@ -33,8 +33,8 @@ public final class DictionaryDetailAPIRepositoryImpl: DictionaryDetailAPIReposit
         return provider.requestData(endPoint: endPoint, interceptor: tokenInterceptor).map { $0.toDomain() }
     }
 
-    public func fetchNpcDetailQuest(id: Int, sort: [String]?) -> Observable<[DictionaryDetailNpcQuestResponse]> {
-        let endPoint = DictionaryDetailEndPoint.fetchNpcDetailQuest(id: id, sort: sort)
+    public func fetchNpcDetailQuest(id: Int, sort: String?) -> Observable<[DictionaryDetailNpcQuestResponse]> {
+        let endPoint = DictionaryDetailEndPoint.fetchNpcDetailQuest(id: id, query: SortQuery(sort: sort))
         return provider.requestData(endPoint: endPoint, interceptor: tokenInterceptor).map { $0.map {$0.toDomain()} }
 
     }
@@ -49,8 +49,8 @@ public final class DictionaryDetailAPIRepositoryImpl: DictionaryDetailAPIReposit
         return provider.requestData(endPoint: endPoint, interceptor: tokenInterceptor).map { $0.toDomain() }
     }
 
-    public func fetchItemDetailDropMonster(id: Int, sort: [String]?) -> Observable<[DictionaryDetailItemDropMonsterResponse]> {
-        let endPoint = DictionaryDetailEndPoint.fetchItemDetailDropMonster(id: id, sort: sort)
+    public func fetchItemDetailDropMonster(id: Int, sort: String?) -> Observable<[DictionaryDetailItemDropMonsterResponse]> {
+        let endPoint = DictionaryDetailEndPoint.fetchItemDetailDropMonster(id: id, query: SortQuery(sort: sort))
         return provider.requestData(endPoint: endPoint, interceptor: tokenInterceptor).map { $0.map {$0.toDomain() } }
     }
 
@@ -69,8 +69,8 @@ public final class DictionaryDetailAPIRepositoryImpl: DictionaryDetailAPIReposit
         return provider.requestData(endPoint: endPoint, interceptor: tokenInterceptor).map { $0.toDomain() }
     }
 
-    public func fetchMapDetailSpawnMonster(id: Int) -> Observable<[DictionaryDetailMapSpawnMonsterResponse]> {
-        let endPoint = DictionaryDetailEndPoint.fetchMapDetailSpawnMonster(id: id)
+    public func fetchMapDetailSpawnMonster(id: Int, sort: String?) -> Observable<[DictionaryDetailMapSpawnMonsterResponse]> {
+        let endPoint = DictionaryDetailEndPoint.fetchMapDetailSpawnMonster(id: id, query: SortQuery(sort: sort))
         return provider.requestData(endPoint: endPoint, interceptor: tokenInterceptor).map { $0.map {$0.toDomain()} }
     }
 
@@ -79,3 +79,7 @@ public final class DictionaryDetailAPIRepositoryImpl: DictionaryDetailAPIReposit
         return provider.requestData(endPoint: endPoint, interceptor: tokenInterceptor).map {$0.map {$0.toDomain()}}
     }
 }
+
+struct SortQuery: Encodable {
+    let sort: String?
+}

MLS/Data/Data/Repository/UserDefaultsRepositoryImpl.swift

@@ -6,6 +6,8 @@ import RxSwift
 public final class UserDefaultsRepositoryImpl: UserDefaultsRepository {
     private let recentSearchkey = "recentSearch"
     private let platformKey = "platformKey"
+    private let bookmarkkey = "bookmark"
+    private let dictionaryDetailkey = "dictionaryDetailkey"
 
     public init() {}
 
@@ -67,4 +69,38 @@ public final class UserDefaultsRepositoryImpl: UserDefaultsRepository {
             return Disposables.create()
         }
     }
+
+    public func fetchBookmark() -> Observable<Bool> {
+        return Observable.create { observer in
+            let hasVisited = UserDefaults.standard.bool(forKey: self.bookmarkkey)
+            observer.onNext(hasVisited)
+            observer.onCompleted()
+            return Disposables.create()
+        }
+    }
+
+    public func saveBookmark() -> Completable {
+        return Completable.create { completable in
+            UserDefaults.standard.set(true, forKey: self.bookmarkkey)
+            completable(.completed)
+            return Disposables.create()
+        }
+    }
+
+    public func fetchDictionaryDetail() -> Observable<Bool> {
+        return Observable.create { observer in
+            let hasVisited = UserDefaults.standard.bool(forKey: self.dictionaryDetailkey)
+            observer.onNext(hasVisited)
+            observer.onCompleted()
+            return Disposables.create()
+        }
+    }
+
+    public func saveDictionaryDetail() -> Completable {
+        return Completable.create { completable in
+            UserDefaults.standard.set(true, forKey: self.dictionaryDetailkey)
+            completable(.completed)
+            return Disposables.create()
+        }
+    }
 }

MLS/Domain/Domain/Interceptor/AuthInterceptor.swift

@@ -0,0 +1,46 @@
+import Foundation
+
+import DomainInterface
+
+public final class AuthInterceptor: Interceptor {
+    private let tokenRepository: TokenRepository
+    private let authRepository: () -> AuthAPIRepository
+
+    public init(tokenRepository: TokenRepository, authRepository: @escaping () -> AuthAPIRepository) {
+        self.tokenRepository = tokenRepository
+        self.authRepository = authRepository
+    }
+
+    public func adapt(_ request: URLRequest) -> URLRequest {
+        var request = request
+        if case .success(let token) = tokenRepository.fetchToken(type: .accessToken) {
+            request.setValue("Bearer \(token)", forHTTPHeaderField: "Authorization")
+        }
+        return request
+    }
+
+    public func retry(data: Data?, response: URLResponse?, error: Error?) -> Bool {
+        guard let httpResponse = response as? HTTPURLResponse,
+              let url = httpResponse.url else { return false }
+
+        if url.path.contains("/auth/reissue") {
+            print("⚠️ reissue 요청에서는 retry 하지 않음")
+            return false
+        }
+
+        if httpResponse.statusCode == 401 {
+            if case .success(let refreshToken) = tokenRepository.fetchToken(type: .refreshToken) {
+                let repo = authRepository()
+                repo.reissueToken(refreshToken: refreshToken)
+                    .subscribe(onNext: { _ in
+                        print("✅ reissue 완료 (저장은 UseCase 쪽에서 처리)")
+                    }, onError: { error in
+                        print("❌ reissue 실패: \(error)")
+                    })
+                    .dispose()
+                return true
+            }
+        }
+        return false
+    }
+}

MLS/Domain/Domain/Interceptor/TokenInterceptor.swift

@@ -6,6 +6,7 @@ import RxSwift
 
 public class TokenInterceptor: Interceptor {
     private let fetchTokenUseCase: FetchTokenFromLocalUseCase
+
     public init(fetchTokenUseCase: FetchTokenFromLocalUseCase) {
         self.fetchTokenUseCase = fetchTokenUseCase
     }

MLS/Domain/Domain/UseCaseImpl/AuthAPI/CheckLoginUseCaseImpl.swift

@@ -1,8 +1,9 @@
 import DomainInterface
 
+import RxRelay
 import RxSwift
 
-public class CheckLoginUseCaseImpl: CheckLoginUseCase {
+public final class CheckLoginUseCaseImpl: CheckLoginUseCase {
     private let authRepository: AuthAPIRepository
     private let tokenRepository: TokenRepository
 
@@ -14,6 +15,8 @@ public class CheckLoginUseCaseImpl: CheckLoginUseCase {
     public func execute() -> Observable<Bool> {
         switch tokenRepository.fetchToken(type: .refreshToken) {
         case .success(let token):
+            guard !token.isEmpty else { return .just(false) }
+
             return authRepository.reissueToken(refreshToken: token)
                 .map { [weak self] response in
                     guard let self else { return false }
@@ -35,8 +38,7 @@ public class CheckLoginUseCaseImpl: CheckLoginUseCase {
                     return .just(false)
                 }
 
-        case .failure(let error):
-            print("refreshToken 불러오기 실패:", error.localizedDescription)
+        case .failure:
             return .just(false)
         }
     }