[REFACTOR] 검색 화면 모듈화

Poppool/.swiftlint.yml

@@ -10,6 +10,7 @@ disabled_rules:
     - identifier_name
     - cyclomatic_complexity
     - redundant_optional_initialization
+    - function_parameter_count
 
 # 기본(default) 룰이 아닌 룰들을 활성화
 opt_in_rules:

Poppool/CoreLayer/Infrastructure/Infrastructure.xcodeproj/project.pbxproj

@@ -46,7 +46,6 @@
 			files = (
 				4EBC91D32DB8039800495C3B /* OSLog.framework in Frameworks */,
 				0522C1D72DB67B4F00B141FF /* RxSwift in Frameworks */,
-				05EC93DE2DB6612100771CB3 /* RxGesture in Frameworks */,
 				05EC93D92DB6605100771CB3 /* RxCocoa in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -112,7 +111,6 @@
 			name = Infrastructure;
 			packageProductDependencies = (
 				05EC93D82DB6605100771CB3 /* RxCocoa */,
-				05EC93DD2DB6612100771CB3 /* RxGesture */,
 				0522C1D62DB67B4F00B141FF /* RxSwift */,
 			);
 			productName = Infrastructure;
@@ -436,11 +434,6 @@
 			package = 05C1D82E2DB53CE300508FFD /* XCRemoteSwiftPackageReference "RxSwift" */;
 			productName = RxCocoa;
 		};
-		05EC93DD2DB6612100771CB3 /* RxGesture */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = 05EC93DC2DB6612100771CB3 /* XCRemoteSwiftPackageReference "RxGesture" */;
-			productName = RxGesture;
-		};
 /* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = 058CC90F2DB5383C0084221A /* Project object */;

Poppool/CoreLayer/Infrastructure/Infrastructure/Service/UserDefaultService.swift

@@ -66,3 +66,63 @@ public final class UserDefaultService {
         UserDefaults.standard.removeObject(forKey: key)
     }
 }
+
+// MARK: - Key base
+extension UserDefaultService {
+    public enum Key: String {
+        case searchKeyword = "searchList"
+    }
+
+    /// Userdefault 데이터 저장 메서드
+    /// - Parameters:
+    ///   - key: 저장하는 데이터의 키 값 i.e) 유저 id 등
+    ///   - value: 저장하는 데이터 값 i.e) access token 등
+    ///   - to: 로컬 데이터베이스 타입 - DatabaseType
+    /// - Returns: 별도 안내 없음
+    public func save(keyType: Key, value: String) {
+        UserDefaults.standard.set(value, forKey: keyType.rawValue)
+    }
+
+    /// Userdefault 데이터 저장 메서드
+    /// - Parameters:
+    ///   - key: 저장하는 데이터의 키 값 i.e) 유저 id 등
+    ///   - value: 저장하는 데이터 값 i.e) access token 등
+    ///   - to: 로컬 데이터베이스 타입 - DatabaseType
+    /// - Returns: 별도 안내 없음
+    public func save(keyType: Key, value: [String]) {
+        UserDefaults.standard.set(value, forKey: keyType.rawValue)
+    }
+
+    /// Userdefault 데이터 발견 메서드
+    /// - Parameters:
+    ///   - key: 찾는 데이터의 키 값 i.e) 유저 id 등
+    ///   - from: 로컬 데이터베이스 타입 - DatabaseType
+    /// - Returns: 찾은 데이터 - String 타입
+    public func fetch(keyType: Key) -> String? {
+        if let token = UserDefaults.standard.string(forKey: keyType.rawValue) {
+            return token
+        }
+        return nil
+    }
+
+    /// Userdefault 데이터 발견 메서드
+    /// - Parameters:
+    ///   - key: 찾는 데이터의 키 값 i.e) 유저 id 등
+    ///   - from: 로컬 데이터베이스 타입 - DatabaseType
+    /// - Returns: 찾은 데이터 - String 타입
+    public func fetchArray(keyType: Key) -> [String]? {
+        if let token = UserDefaults.standard.array(forKey: keyType.rawValue) as? [String] {
+            return token
+        }
+        return nil
+    }
+
+    /// Userdefault 데이터 삭제 메서드
+    /// - Parameters:
+    ///   - key: 삭제하는 데이터의 키 값 i.e) 유저 id 등
+    ///   - from: 로컬 데이터베이스 타입 - DatabaseType
+    /// - Returns: 별도 안내 없음
+    public func delete(keyType: Key) {
+        UserDefaults.standard.removeObject(forKey: keyType.rawValue)
+    }
+}

Poppool/DataLayer/Data/Data.xcodeproj/project.pbxproj

@@ -31,6 +31,8 @@
 				Network/API/AuthAPI/AuthAPIEndPoint.swift,
 				Network/API/AuthAPI/ResponseDTO/LoginResponseDTO.swift,
 				Network/API/AuthAPI/ResponseDTO/PostTokenReissueResponseDTO.swift,
+				Network/API/CategoryAPI/CategoryAPIEndpoint.swift,
+				Network/API/CategoryAPI/ResponseDTO/GetCategoryListResponseDTO.swift,
 				Network/API/CommentAPI/CommentAPIEndPoint.swift,
 				Network/API/CommentAPI/RequestDTO/DeleteCommentRequestDTO.swift,
 				Network/API/CommentAPI/RequestDTO/PostCommentRequestDTO.swift,
@@ -57,9 +59,11 @@
 				Network/API/PreSignedAPI/RequestDTO/PresignedURLRequestDTO.swift,
 				Network/API/PreSignedAPI/ResponseDTO/PreSignedURLDTO.swift,
 				Network/API/PreSignedAPI/ResponseDTO/PreSignedURLResponseDTO.swift,
+				Network/API/SearchAPI/RequestDTO/GetSearchPopupStoreRequestDTO.swift,
+				Network/API/SearchAPI/ResponseDTO/GetSearchPopupStoreResponseDTO.swift,
+				Network/API/SearchAPI/SearchAPIEndPoint.swift,
 				Network/API/SignUpAPI/RequestDTO/CheckNickNameRequestDTO.swift,
 				Network/API/SignUpAPI/RequestDTO/SignUpRequestDTO.swift,
-				Network/API/SignUpAPI/ResponseDTO/GetCategoryListResponseDTO.swift,
 				Network/API/SignUpAPI/SignUpAPIEndpoint.swift,
 				Network/API/UserAPI/RequesetDTO/CommentLikeRequestDTO.swift,
 				Network/API/UserAPI/RequesetDTO/GetMyCommentRequestDTO.swift,
@@ -96,13 +100,15 @@
 				RepositoryImpl/AdminRepositoryImpl.swift,
 				RepositoryImpl/AppleLoginRepositoryImpl.swift,
 				RepositoryImpl/AuthAPIRepositoryImpl.swift,
+				RepositoryImpl/CategoryRepositoryImpl.swift,
 				RepositoryImpl/CommentAPIRepositoryImpl.swift,
 				RepositoryImpl/HomeAPIRepositoryImpl.swift,
 				RepositoryImpl/KakaoLoginRepositoryImpl.swift,
 				RepositoryImpl/MapDirectionRepositoryImpl.swift,
 				RepositoryImpl/MapRepositoryImpl.swift,
 				RepositoryImpl/PopUpAPIRepositoryImpl.swift,
 				RepositoryImpl/PreSignedRepositoryImpl.swift,
+				RepositoryImpl/Search/SearchAPIRepositoryImpl.swift,
 				RepositoryImpl/SignUpRepositoryImpl.swift,
 				RepositoryImpl/UserAPIRepositoryImpl.swift,
 			);

Poppool/DataLayer/Data/Data/Network/API/CategoryAPI/CategoryAPIEndpoint.swift

@@ -0,0 +1,16 @@
+import Foundation
+
+import Infrastructure
+
+struct CategoryAPIEndpoint {
+
+    /// 관심사 목록을 가져옵니다.
+    /// - Returns: Endpoint<GetInterestListResponseDTO>
+    static func getCategoryList() -> Endpoint<GetCategoryListResponseDTO> {
+        return Endpoint(
+            baseURL: Secrets.popPoolBaseURL,
+            path: "/categories",
+            method: .get
+        )
+    }
+}

Poppool/DataLayer/Data/Data/Network/API/SignUpAPI/ResponseDTO/GetCategoryListResponseDTO.swift → Poppool/DataLayer/Data/Data/Network/API/CategoryAPI/ResponseDTO/GetCategoryListResponseDTO.swift

@@ -9,12 +9,12 @@ struct GetCategoryListResponseDTO: Codable {
 
 // MARK: - InterestResponse
 struct CategoryResponseDTO: Codable {
-    let categoryId: Int64
+    let categoryId: Int32
     let categoryName: String
 }
 
 extension CategoryResponseDTO {
     func toDomain() -> CategoryResponse {
-        return CategoryResponse(categoryId: categoryId, category: categoryName)
+        return CategoryResponse(categoryId: Int(categoryId), category: categoryName)
     }
 }

Poppool/DataLayer/Data/Data/Network/API/SearchAPI/RequestDTO/GetSearchPopupStoreRequestDTO.swift

@@ -0,0 +1,5 @@
+import Foundation
+
+struct GetSearchPopupStoreRequestDTO: Encodable {
+    let query: String
+}

Poppool/DataLayer/Data/Data/Network/API/SearchAPI/ResponseDTO/GetSearchPopupStoreResponseDTO.swift

@@ -0,0 +1,17 @@
+import Foundation
+
+import DomainInterface
+
+struct GetSearchPopupStoreResponseDTO: Decodable {
+    var popUpStoreList: [PopUpStoreResponseDTO]
+    var loginYn: Bool
+}
+
+extension GetSearchPopupStoreResponseDTO {
+    func toDomain() -> KeywordBasePopupStoreListResponse {
+        return KeywordBasePopupStoreListResponse(
+            popupStoreList: popUpStoreList.map { $0.toDomain() },
+            loginYn: loginYn
+        )
+    }
+}

Poppool/DataLayer/Data/Data/Network/API/SearchAPI/SearchAPIEndPoint.swift

@@ -0,0 +1,17 @@
+import Foundation
+
+import Infrastructure
+
+import RxSwift
+
+struct SearchAPIEndPoint {
+
+    static func getSearchPopUpList(request: GetSearchPopupStoreRequestDTO) -> Endpoint<GetSearchPopupStoreResponseDTO> {
+        return Endpoint(
+            baseURL: Secrets.popPoolBaseURL,
+            path: "/search/popup-stores",
+            method: .get,
+            queryParameters: request
+        )
+    }
+}

Poppool/DataLayer/Data/Data/Network/API/SignUpAPI/RequestDTO/SignUpRequestDTO.swift

@@ -13,6 +13,6 @@ struct SignUpRequestDTO: Encodable {
     var age: Int32
     var socialEmail: String
     var socialType: String
-    var interestCategories: [Int64]
+    var interestCategories: [Int]
     var appleAuthorizationCode: String?
 }

Poppool/DataLayer/Data/Data/RepositoryImpl/AdminRepositoryImpl.swift

@@ -44,7 +44,7 @@ public final class AdminRepositoryImpl: AdminRepository {
            AdminStoreDetail(
                id: dto.id,
                name: dto.name,
-               categoryId: dto.categoryId,
+               categoryId: Int(dto.categoryId),
                categoryName: dto.categoryName,
                description: dto.desc,
                address: dto.address,
@@ -77,7 +77,7 @@ public final class AdminRepositoryImpl: AdminRepository {
     public func createStore(params: CreateStoreParams) -> Completable {
         let dto = CreatePopUpStoreRequestDTO(
             name: params.name,
-            categoryId: params.categoryId,
+            categoryId: Int64(params.categoryId),
             desc: params.desc,
             address: params.address,
             startDate: params.startDate,
@@ -99,7 +99,7 @@ public final class AdminRepositoryImpl: AdminRepository {
             popUpStore: UpdatePopUpStoreRequestDTO.PopUpStore(
                 id: params.id,
                 name: params.name,
-                categoryId: params.categoryId,
+                categoryId: Int64(params.categoryId),
                 desc: params.desc,
                 address: params.address,
                 startDate: params.startDate,

Poppool/DataLayer/Data/Data/RepositoryImpl/CategoryRepositoryImpl.swift

@@ -0,0 +1,21 @@
+import Foundation
+
+import DomainInterface
+
+import RxSwift
+
+public final class CategoryRepositoryImpl: CategoryRepository {
+
+    private let provider: Provider
+
+    public init(provider: Provider) {
+        self.provider = provider
+    }
+
+    public func fetchCategoryList() -> Observable<[CategoryResponse]> {
+        let endPoint = CategoryAPIEndpoint.getCategoryList()
+        return provider.requestData(with: endPoint, interceptor: TokenInterceptor()).map { responseDTO in
+            return responseDTO.categoryResponseList.map({ $0.toDomain() })
+        }
+    }
+}

Poppool/DataLayer/Data/Data/RepositoryImpl/MapRepositoryImpl.swift

@@ -18,15 +18,15 @@ public final class MapRepositoryImpl: MapRepository {
         northEastLon: Double,
         southWestLat: Double,
         southWestLon: Double,
-        categories: [Int64]
+        categories: [Int]
     ) -> Observable<[MapPopUpStore]> {
         return provider.requestData(
             with: MapAPIEndpoint.locations_fetchStoresInBounds(
                 northEastLat: northEastLat,
                 northEastLon: northEastLon,
                 southWestLat: southWestLat,
                 southWestLon: southWestLon,
-                categories: categories
+                categories: categories.map { Int64($0 ) }
             ),
             interceptor: TokenInterceptor()
         )
@@ -35,12 +35,12 @@ public final class MapRepositoryImpl: MapRepository {
 
     public func searchStores(
         query: String,
-        categories: [Int64]
+        categories: [Int]
     ) -> Observable<[MapPopUpStore]> {
         return provider.requestData(
             with: MapAPIEndpoint.locations_searchStores(
                 query: query,
-                categories: categories
+                categories: categories.map { Int64($0 ) }
             ),
             interceptor: TokenInterceptor()
         )

Poppool/DataLayer/Data/Data/RepositoryImpl/Search/SearchAPIRepositoryImpl.swift

@@ -0,0 +1,41 @@
+import Foundation
+
+import DomainInterface
+import Infrastructure
+
+import RxSwift
+
+public final class SearchAPIRepositoryImpl: SearchAPIRepository {
+
+    private let provider: Provider
+    private let tokenInterceptor = TokenInterceptor()
+    private let userDefaultService: UserDefaultService
+
+    public init(
+        provider: Provider,
+        userDefaultService: UserDefaultService
+    ) {
+        self.provider = provider
+        self.userDefaultService = userDefaultService
+    }
+
+    public func fetchSearchResult(by query: String) -> Observable<KeywordBasePopupStoreListResponse> {
+
+        let request = GetSearchPopupStoreRequestDTO(query: query)
+        let endPoint = SearchAPIEndPoint.getSearchPopUpList(request: request)
+        return provider.requestData(    // 실패했을때는 키워드 저장이 안되도록 수정
+            with: endPoint,
+            interceptor: tokenInterceptor
+        )
+        .map { $0.toDomain() }
+        .do { _ in self.saveSearchKeyword(keyword: query) }
+    }
+}
+
+private extension SearchAPIRepositoryImpl {
+    func saveSearchKeyword(keyword: String) {
+        let existingList = userDefaultService.fetchArray(keyType: .searchKeyword) ?? []
+        let updatedList = [keyword] + existingList.filter { $0 != keyword }
+        userDefaultService.save(keyType: .searchKeyword, value: updatedList)
+    }
+}

Poppool/DataLayer/Data/Data/RepositoryImpl/SignUpRepositoryImpl.swift

@@ -30,7 +30,7 @@ public final class SignUpRepositoryImpl: SignUpRepository {
         age: Int32,
         socialEmail: String,
         socialType: String,
-        interests: [Int64],
+        interests: [Int],
         appleAuthorizationCode: String?
     ) -> Completable {
         let endPoint = SignUpAPIEndpoint.signUp_trySignUp(with: .init(

Poppool/DataLayer/Data/Data/RepositoryImpl/UserAPIRepositoryImpl.swift

@@ -86,14 +86,14 @@ public final class UserAPIRepositoryImpl: UserAPIRepository {
     }
 
     public func putUserCategory(
-        interestCategoriesToAdd: [Int64],
-        interestCategoriesToDelete: [Int64],
-        interestCategoriesToKeep: [Int64]
+        interestCategoriesToAdd: [Int],
+        interestCategoriesToDelete: [Int],
+        interestCategoriesToKeep: [Int]
     ) -> Completable {
         let request = PutUserCategoryRequestDTO(
-            interestCategoriesToAdd: interestCategoriesToAdd,
-            interestCategoriesToDelete: interestCategoriesToDelete,
-            interestCategoriesToKeep: interestCategoriesToKeep
+            interestCategoriesToAdd: interestCategoriesToAdd.map { Int64($0 ) },
+            interestCategoriesToDelete: interestCategoriesToDelete.map { Int64($0 ) },
+            interestCategoriesToKeep: interestCategoriesToKeep.map { Int64($0 ) }
         )
         let endPoint = UserAPIEndPoint.putUserCategory(request: request)
         return provider.request(with: endPoint, interceptor: tokenInterceptor)

Poppool/DomainLayer/Domain/Domain/UseCaseImpl/FetchCategoryListUseCaseImpl.swift

@@ -0,0 +1,18 @@
+import Foundation
+
+import DomainInterface
+
+import RxSwift
+
+public final class FetchCategoryListUseCaseImpl: FetchCategoryListUseCase {
+
+    private let repository: CategoryRepository
+
+    public init(repository: CategoryRepository) {
+        self.repository = repository
+    }
+
+    public func execute() -> Observable<[CategoryResponse]> {
+        return repository.fetchCategoryList()
+    }
+}