[IDLE-000] 요양보호사는 워크넷 공고를 카드로 볼 수 있고 상세정보를 확인할 수 있다.

project/Projects/App/Sources/RootCoordinator/Main/Worker/SubCoordinator/AppliedAndLikedBoardCoordinator.swift

@@ -7,6 +7,7 @@
 
 import UIKit
 import WorkerFeature
+import Entity
 import BaseFeature
 import CenterFeature
 import PresentationCore
@@ -65,13 +66,15 @@ class AppliedAndLikedBoardCoordinator: WorkerRecruitmentBoardCoordinatable {
 }
 
 extension AppliedAndLikedBoardCoordinator {
-    public func showPostDetail(postId: String) {
+    public func showPostDetail(postType: RecruitmentPostType, postId: String) {
         let coodinator = PostDetailForWorkerCoodinator(
             dependency: .init(
+                postType: postType,
                 postId: postId,
                 parent: self,
                 navigationController: navigationController,
-                recruitmentPostUseCase: injector.resolve(RecruitmentPostUseCase.self)
+                recruitmentPostUseCase: injector.resolve(RecruitmentPostUseCase.self),
+                workerProfileUseCase: injector.resolve(WorkerProfileUseCase.self)
             )
         )
         addChildCoordinator(coodinator)

project/Projects/App/Sources/RootCoordinator/Main/Worker/SubCoordinator/WorkerRecruitmentBoardCoordinator.swift

@@ -9,6 +9,7 @@ import UIKit
 import WorkerFeature
 import BaseFeature
 import CenterFeature
+import Entity
 import PresentationCore
 import UseCaseInterface
 
@@ -54,13 +55,15 @@ class WorkerRecruitmentBoardCoordinator: WorkerRecruitmentBoardCoordinatable {
 }
 
 extension WorkerRecruitmentBoardCoordinator {
-    public func showPostDetail(postId: String) {
+    public func showPostDetail(postType: RecruitmentPostType, postId: String) {
         let coodinator = PostDetailForWorkerCoodinator(
             dependency: .init(
+                postType: postType,
                 postId: postId,
                 parent: self,
                 navigationController: navigationController,
-                recruitmentPostUseCase: injector.resolve(RecruitmentPostUseCase.self)
+                recruitmentPostUseCase: injector.resolve(RecruitmentPostUseCase.self),
+                workerProfileUseCase: injector.resolve(WorkerProfileUseCase.self)
             )
         )
         addChildCoordinator(coodinator)

project/Projects/Data/ConcreteRepository/RecruitmentPost/DefaultRecruitmentPostRepository.swift

@@ -15,11 +15,13 @@ import Moya
 public class DefaultRecruitmentPostRepository: RecruitmentPostRepository {
 
     private var recruitmentPostService: RecruitmentPostService = .init()
+    private var crawlingPostService: CrawlingPostService = .init()
     private var applyService: ApplyService = .init()
 
     public init(_ store: KeyValueStore? = nil) {
         if let store {
             self.recruitmentPostService = RecruitmentPostService(keyValueStore: store)
+            self.crawlingPostService = CrawlingPostService(keyValueStore: store)
             self.applyService = ApplyService(keyValueStore: store)
         }
     }
@@ -91,73 +93,61 @@ public class DefaultRecruitmentPostRepository: RecruitmentPostRepository {
     }
 
     // MARK: Worker
-    public func getPostDetailForWorker(id: String) -> RxSwift.Single<Entity.RecruitmentPostForWorkerBundle> {
+    public func getNativePostDetailForWorker(id: String) -> RxSwift.Single<Entity.RecruitmentPostForWorkerBundle> {
         recruitmentPostService.request(
             api: .postDetail(id: id, userType: .worker),
             with: .withToken
         )
-        .map(RecruitmentPostDTO.self)
-        .map { dto in
-            dto.toEntity()
-        }
+        .mapToEntity(NativeRecruitmentPostDetailDTO.self)
+    }
+
+    public func getWorknetPostDetailForWorker(id: String) -> RxSwift.Single<Entity.WorknetRecruitmentPostDetailVO> {
+        crawlingPostService
+            .request(api: .getDetail(postId: id), with: .withToken)
+            .mapToEntity(WorknetRecruitmentPostDetailDTO.self)
     }
 
-    public func getNativePostListForWorker(nextPageId: String?, requestCnt: Int = 10) -> RxSwift.Single<Entity.RecruitmentPostListForWorkerVO> {
+
+    public func getNativePostListForWorker(nextPageId: String?, requestCnt: Int = 10) -> RxSwift.Single<RecruitmentPostListForWorkerVO> {
 
         recruitmentPostService.request(
             api: .getOnGoingNativePostListForWorker(nextPageId: nextPageId, requestCnt: String(requestCnt)),
             with: .withToken
         )
-        .map(RecruitmentPostListForWorkerDTO.self)
-        .catch({ error in
-            if let moyaError = error as? MoyaError, case .objectMapping(let error, _) = moyaError {
-                #if DEBUG
-                print("앱용 공고 전체조회 에러:", error.localizedDescription)
-                #endif
-            }
-            return .error(error)
-        })
-        .map { dto in
-            dto.toEntity()
-        }
+        .mapToEntity(RecruitmentPostListForWorkerDTO<NativeRecruitmentPostForWorkerDTO>.self)
     }
 
-    public func getFavoritePostListForWorker(nextPageId: String?, requestCnt: Int) -> RxSwift.Single<Entity.RecruitmentPostListForWorkerVO> {
+    public func getNativeFavoritePostListForWorker() -> RxSwift.Single<[RecruitmentPostForWorkerRepresentable]> {
         recruitmentPostService.request(
-            api: .getFavoritePostListForWorker(nextPageId: nextPageId, requestCnt: String(requestCnt)),
+            api: .getNativeFavoritePost,
             with: .withToken
         )
-        .map(RecruitmentPostListForWorkerDTO.self)
-        .catch({ error in
-            if let moyaError = error as? MoyaError, case .objectMapping(let error, _) = moyaError {
-                #if DEBUG
-                print("즐겨찾기한 공고 전체조회 에러:",error.localizedDescription)
-                #endif
-            }
-            return .error(error)
-        })
-        .map { dto in
-            dto.toEntity()
-        }
+        .mapToEntity(FavoriteRecruitmentPostListForWorkerDTO<NativeRecruitmentPostForWorkerDTO>.self)
     }
 
-    public func getAppliedPostListForWorker(nextPageId: String?, requestCnt: Int) -> RxSwift.Single<Entity.RecruitmentPostListForWorkerVO> {
+    public func getWorknetFavoritePostListForWorker() -> RxSwift.Single<[RecruitmentPostForWorkerRepresentable]> {
+        crawlingPostService.request(
+            api: .getWorknetFavoritePost,
+            with: .withToken
+        )
+        .mapToEntity(FavoriteRecruitmentPostListForWorkerDTO<WorkNetRecruitmentPostForWorkerDTO>.self)
+    }
+
+    public func getAppliedPostListForWorker(nextPageId: String?, requestCnt: Int) -> RxSwift.Single<RecruitmentPostListForWorkerVO> {
         recruitmentPostService.request(
             api: .getAppliedPostListForWorker(nextPageId: nextPageId, requestCnt: String(requestCnt)),
             with: .withToken
         )
-        .map(RecruitmentPostListForWorkerDTO.self)
-        .catch({ error in
-            if let moyaError = error as? MoyaError, case .objectMapping(let error, _) = moyaError {
-                #if DEBUG
-                print("지원한 공고 전체조회 에러:", error.localizedDescription)
-                #endif
-            }
-            return .error(error)
-        })
-        .map { dto in
-            dto.toEntity()
-        }
+        .mapToEntity(RecruitmentPostListForWorkerDTO<NativeRecruitmentPostForWorkerDTO>.self)
+    }
+
+    public func getWorknetPostListForWorker(nextPageId: String?, requestCnt: Int) -> RxSwift.Single<RecruitmentPostListForWorkerVO> {
+        crawlingPostService
+            .request(
+                api: .getPostList(nextPageId: nextPageId, requestCnt: requestCnt),
+                with: .withToken
+            )
+            .mapToEntity(RecruitmentPostListForWorkerDTO<WorkNetRecruitmentPostForWorkerDTO>.self)
     }
 
     public func applyToPost(postId: String, method: ApplyType) -> Single<Void> {

project/Projects/Data/ConcretesTests/SaveUserInfoDataTests.swift

@@ -91,7 +91,9 @@ class SaveUserInfoDataTests: XCTestCase {
                 expYear: nil,
                 address: .init(roadAddress: "test", jibunAddress: "test"),
                 introductionText: "test",
-                specialty: "test"
+                specialty: "test",
+                longitude: 0.0,
+                latitude: 0.0
             )
         )
 

project/Projects/Data/DataSource/API/BaseAPI.swift

@@ -13,6 +13,7 @@ public enum APIType {
     case auth
     case users
     case job_postings
+    case crawling_job_postings
     case external(url: String)
     case applys
 }
@@ -36,6 +37,8 @@ public extension BaseAPI {
             baseStr += "/users"
         case .job_postings:
             baseStr += "/job-postings"
+        case .crawling_job_postings:
+            baseStr += "/crawling-job-postings"
         case .applys:
             baseStr += "/applys"
         case .external(let url):

project/Projects/Data/DataSource/API/CrawlingPostAPI.swift

@@ -0,0 +1,78 @@
+//
+//  CrawlingPostAPI.swift
+//  DataSource
+//
+//  Created by choijunios on 9/6/24.
+//
+
+import Foundation
+import Alamofire
+import Moya
+
+public enum CrawlingPostAPI {
+
+    case getPostList(nextPageId: String?, requestCnt: Int)
+    case getDetail(postId: String)
+    case getWorknetFavoritePost
+}
+
+extension CrawlingPostAPI: BaseAPI {
+    public var apiType: APIType {
+        .crawling_job_postings
+    }
+
+    public var path: String {
+        switch self {
+        case .getPostList:
+            ""
+        case .getDetail(let postId):
+            "/\(postId)"
+        case .getWorknetFavoritePost:
+            "/my/favorites"
+        }
+    }
+
+    public var method: Moya.Method {
+        switch self {
+        case .getPostList:
+            .get
+        case .getDetail:
+            .get
+        case .getWorknetFavoritePost:
+            .get
+        }
+    }
+
+    var bodyParameters: Parameters? {
+        var params: Parameters = [:]
+        switch self {
+        case .getPostList(let nextPageId, let requestCnt):
+            if let nextPageId {
+                params["next"] = nextPageId
+            }
+            params["limit"] = requestCnt
+        default:
+            break
+        }
+
+        return params
+    }
+
+    var parameterEncoding: ParameterEncoding {
+        switch self {
+        case .getPostList:
+            return URLEncoding.queryString
+        default:
+            return JSONEncoding.default
+        }
+    }
+
+    public var task: Moya.Task {
+        switch self {
+        case .getPostList:
+            .requestParameters(parameters: bodyParameters ?? [:], encoding: parameterEncoding)
+        default:
+            .requestPlain
+        }
+    }
+}

project/Projects/Data/DataSource/API/RcruitmentPostAPI.swift

@@ -31,8 +31,10 @@ public enum RcruitmentPostAPI {
 
     // Worker
     case getOnGoingNativePostListForWorker(nextPageId: String?, requestCnt: String)
-    case getFavoritePostListForWorker(nextPageId: String?, requestCnt: String)
     case getAppliedPostListForWorker(nextPageId: String?, requestCnt: String)
+
+    // Favorite posts
+    case getNativeFavoritePost
     case addFavoritePost(id: String, jobPostingType: RecruitmentPostType)
     case removeFavoritePost(id: String)
 }
@@ -73,11 +75,12 @@ extension RcruitmentPostAPI: BaseAPI {
 
         case .getOnGoingNativePostListForWorker:
             ""
-        case .getFavoritePostListForWorker:
-            "/my/favorites"
         case .getAppliedPostListForWorker:
             "/carer/my/applied"
 
+
+        case .getNativeFavoritePost:
+            "/my/favorites"
         case .addFavoritePost(let id, _):
             "/\(id)/favorites"
         case .removeFavoritePost(let id):
@@ -115,11 +118,11 @@ extension RcruitmentPostAPI: BaseAPI {
 
         case .getOnGoingNativePostListForWorker:
             .get
-        case .getFavoritePostListForWorker:
-            .get
         case .getAppliedPostListForWorker:
             .get
 
+        case .getNativeFavoritePost:
+            .get
         case .addFavoritePost:
             .post
         case .removeFavoritePost:
@@ -135,11 +138,6 @@ extension RcruitmentPostAPI: BaseAPI {
                 params["next"] = nextPageId
             }
             params["limit"] = requestCnt
-        case .getFavoritePostListForWorker(let nextPageId, let requestCnt):
-            if let nextPageId {
-                params["next"] = nextPageId
-            }
-            params["limit"] = requestCnt
         case .getAppliedPostListForWorker(let nextPageId, let requestCnt):
             if let nextPageId {
                 params["next"] = nextPageId
@@ -156,7 +154,6 @@ extension RcruitmentPostAPI: BaseAPI {
     var parameterEncoding: ParameterEncoding {
         switch self {
         case .getOnGoingNativePostListForWorker,
-                .getFavoritePostListForWorker,
                 .getAppliedPostListForWorker:
             return URLEncoding.queryString
         default:
@@ -167,7 +164,6 @@ extension RcruitmentPostAPI: BaseAPI {
     public var task: Moya.Task {
         switch self {
         case .getOnGoingNativePostListForWorker,
-                .getFavoritePostListForWorker,
                 .getAppliedPostListForWorker:
             .requestParameters(parameters: bodyParameters ?? [:], encoding: parameterEncoding)
         case .registerPost(let bodyData):

project/Projects/Data/DataSource/DTO/RecruitmentPost/RecruitmentPostDetailForWorkerDTO.swift → project/Projects/Data/DataSource/DTO/RecruitmentPost/NativeRecruitmentPostDetailDTO.swift

@@ -1,5 +1,5 @@
 //
-//  RecruitmentPostDetailForWorkerDTO.swift
+//  NativeRecruitmentPostDetailDTO.swift
 //  NetworkDataSource
 //
 //  Created by choijunios on 8/15/24.
@@ -8,7 +8,7 @@
 import Foundation
 import Entity
 
-public struct RecruitmentPostDTO: Codable {
+public struct NativeRecruitmentPostDetailDTO: EntityRepresentable {
     public let id: String
 
     public let longitude: String
@@ -106,8 +106,8 @@ public struct RecruitmentPostDTO: Codable {
         )
 
         let jobLocation: LocationInformation = .init(
-            longitude: Double(longitude)!,
-            latitude: Double(latitude)!
+            longitude: Double(longitude) ?? 0.0,
+            latitude: Double(latitude) ?? 0.0
         )
 
         // MARK: Apply date