Design/#33 내여행탭

Plugins/DependencyPlugin/ProjectDescriptionHelpers/Dependency+Project.swift

@@ -13,10 +13,10 @@ public extension TargetDependency {
         public struct Home {}
         public struct TabBar {}
         public struct Follow {}
-        public struct Travel {}
         public struct Search {}
         public struct Setting {}
         public struct PopularTravel {}
+        public struct MyTravel {}
         public struct TravelTool {}
     }
 
@@ -63,12 +63,6 @@ public extension TargetDependency.Features.Follow {
     static let feature = TargetDependency.Features.project(name: "Feature", group: group)
 }
 
-public extension TargetDependency.Features.Travel {
-    static let group = "Travel"
-
-    static let feature = TargetDependency.Features.project(name: "Feature", group: group)
-}
-
 public extension TargetDependency.Features.Search {
     static let group = "Search"
 
@@ -93,6 +87,12 @@ public extension TargetDependency.Features.PopularTravel {
     static let feature = TargetDependency.Features.project(name: "Feature", group: group)
 }
 
+public extension TargetDependency.Features.MyTravel {
+    static let group = "MyTravel"
+
+    static let feature = TargetDependency.Features.project(name: "Feature", group: group)
+}
+
 public extension TargetDependency.Features.TravelTool {
     static let group = "TravelTool"
 

Projects/App/Sources/Application/AppComponent.swift

@@ -73,6 +73,15 @@ final class AppComponent: Component<EmptyDependency>, RootDependency {
             TemplatesSearchUsecase(travelTemplateRepository: travelTemplateRepository)
         }
     }
+
+    var myTravelUsecase: MyTravelUsecaseProtocol {
+        shared {
+            MyTravelUsecase(
+                travelTemplateRepository: travelTemplateRepository,
+                userTravelRepository: userTravelRepository
+            )
+        }
+    }
 
     var authRepository: AuthRepositoryInterface {
         shared { makeAuthRepository() }

Projects/Core/Sources/Extensions/Foundation+/Date+.swift

@@ -0,0 +1,18 @@
+//
+//  Date+.swift
+//  Core
+//
+//  Created by 최안용 on 2/22/26.
+//  Copyright © 2026 NDGL-iOS. All rights reserved.
+//
+
+import Foundation
+
+public extension Date {
+    func toKoreanMMdd() -> String {
+        let formatter = DateFormatter()
+        formatter.locale = Locale(identifier: "ko_KR")
+        formatter.dateFormat = "M월 d일"
+        return formatter.string(from: self)
+    }
+}

Projects/Core/Sources/Extensions/Foundation+/String+.swift

@@ -31,4 +31,11 @@ public extension String {
         let locale = Locale(identifier: "ko_KR")
         return locale.localizedString(forRegionCode: self) ?? "알 수 없음"
     }
+
+    func toDate() -> Date? {
+        let formatter = DateFormatter()
+        formatter.locale = Locale(identifier: "en_US_POSIX")
+        formatter.dateFormat = "yyyy-MM-dd"
+        return formatter.date(from: self)
+    }
 }

Projects/Core/Sources/Storage/UserDefaultWrapper.swift

@@ -0,0 +1,31 @@
+//
+//  UserDefaultWrapper.swift
+//  Core
+//
+//  Created by 최안용 on 2/23/26.
+//  Copyright © 2026 NDGL-iOS. All rights reserved.
+//
+
+import Foundation
+
+@propertyWrapper public struct UserDefaultWrapper<T> {
+    public var wrappedValue: T? {
+        get {
+            return UserDefaults.standard.object(forKey: self.key.rawValue) as? T
+        }
+
+        set {
+            if newValue == nil {
+                UserDefaults.standard.removeObject(forKey: self.key.rawValue)
+            } else {
+                UserDefaults.standard.setValue(newValue, forKey: self.key.rawValue)
+            }
+        }
+    }
+
+    private let key: UserDefaultKeys
+
+    public init(key: UserDefaultKeys) {
+        self.key = key
+    }
+}

Projects/Core/Sources/Storage/UserManager.swift

@@ -0,0 +1,33 @@
+//
+//  UserManager.swift
+//  Core
+//
+//  Created by 최안용 on 2/23/26.
+//  Copyright © 2026 NDGL-iOS. All rights reserved.
+//
+
+import Foundation
+
+public enum UserDefaultKeys: String {
+    case uuid = "uuid"
+    case nickname = "nickname"
+    case isFirstOpen = "isFirstOpen"
+}
+
+public final class UserManager {
+    @UserDefaultWrapper(key: .uuid) public var uuid: String?
+    @UserDefaultWrapper(key: .nickname) public var nickname: String?
+    @UserDefaultWrapper(key: .isFirstOpen) private var isFirstOpen: Bool?
+
+    public static let shared = UserManager()
+
+    private init() {}
+
+    public func isFirstOpenApp() -> Bool {
+        guard let isFirstOpen else {
+            self.isFirstOpen = true
+            return true
+        }
+        return !isFirstOpen
+    }
+}

Projects/Data/Sources/Repository/UserTravel /UserTravelRepository.swift

@@ -41,4 +41,12 @@ public final class UserTravelRepository: UserTravelRepositoryInterface {
             throw error.toNDGLError()
         }
     }
+
+    public func fetchUpcomingList(page: Int?, size: Int?) async throws -> [UpcomingInfo] {
+        do {
+            return try await service.getUpcomingList(page: page, size: size).toDomain()
+        } catch {
+            throw error.toNDGLError()
+        }
+    }
 }

Projects/Data/Sources/Transform/UserTravelTransform.swift

@@ -49,11 +49,22 @@ extension CreateUserTravelResponse {
     }
 }
 
-extension String {
-    func toDate() -> Date? {
-        let formatter = DateFormatter()
-        formatter.locale = Locale(identifier: "en_US_POSIX")
-        formatter.dateFormat = "yyyy-MM-dd"
-        return formatter.date(from: self)
+extension UpcomingListResponse {
+    func toDomain() -> [UpcomingInfo] {
+        self.content.map {
+            .init(
+                id: $0.id,
+                title: $0.title,
+                country: $0.country,
+                city: $0.city,
+                startDate: $0.startDate.toDate() ?? .now,
+                endDate: $0.endDate.toDate() ?? .now,
+                nights: $0.nights,
+                days: $0.days,
+                templateId: $0.templateId,
+                thumbnail: $0.thumbnail,
+                profileImage: $0.profileImage
+            )
+        }
     }
 }

Projects/Domain/Sources/Interface/UserTravel/UserTravelRepositoryInterface.swift

@@ -10,5 +10,7 @@ import Foundation
 
 public protocol UserTravelRepositoryInterface {
     func createUserTravel(request: CreateTravelRequest) async throws -> CreateTravelResponse
+//    func fetchContentCard(id: Int) async throws ->
     func fetchUpcoming() async throws -> MyTripSummary
+    func fetchUpcomingList(page: Int?, size: Int?) async throws -> [UpcomingInfo]
 }

Projects/Domain/Sources/Model/Home/UpcomingInfo.swift

@@ -0,0 +1,49 @@
+//
+//  UpcomingInfo.swift
+//  Domain
+//
+//  Created by 최안용 on 2/22/26.
+//  Copyright © 2026 NDGL-iOS. All rights reserved.
+//
+
+import Foundation
+
+public struct UpcomingInfo {
+    public let id: Int
+    public let title: String
+    public let country: String
+    public let city: String
+    public let startDate: Date
+    public let endDate: Date
+    public let nights: Int
+    public let days: Int
+    public let templateId: Int
+    public let thumbnail: String?
+    public let profileImage: String?
+
+    public init(
+        id: Int,
+        title: String,
+        country: String,
+        city: String,
+        startDate: Date,
+        endDate: Date,
+        nights: Int,
+        days: Int,
+        templateId: Int,
+        thumbnail: String?,
+        profileImage: String?
+    ) {
+        self.id = id
+        self.title = title
+        self.country = country
+        self.city = city
+        self.startDate = startDate
+        self.endDate = endDate
+        self.nights = nights
+        self.days = days
+        self.templateId = templateId
+        self.thumbnail = thumbnail
+        self.profileImage = profileImage
+    }
+}

Projects/Domain/Sources/UseCase/MyTravelUsecase.swift

@@ -0,0 +1,58 @@
+//
+//  MyTravelUsecase.swift
+//  Domain
+//
+//  Created by 최안용 on 2/22/26.
+//  Copyright © 2026 NDGL-iOS. All rights reserved.
+//
+
+import Foundation
+
+public protocol MyTravelUsecaseProtocol {
+    func fetchMyTripInfo() async throws -> MyTripSummary
+    func fetchUpcomingList(page: Int?, size: Int?) async throws -> [UpcomingInfo]
+    func fetchRecommendTripList(page: Int?, size: Int?) async throws -> [TripInfo]
+}
+
+public extension MyTravelUsecaseProtocol {
+    func fetchUpcomingList(
+        page: Int? = nil,
+        size: Int? = nil
+    ) async throws -> [UpcomingInfo] {
+        try await fetchUpcomingList(page: page, size: size)
+    }
+
+    func fetchRecommendTripList(
+        page: Int? = nil,
+        size: Int? = nil
+    ) async throws -> [TripInfo] {
+        try await fetchRecommendTripList(page: page, size: size)
+    }
+}
+
+public final class MyTravelUsecase {
+    private let travelTemplateRepository: TravelTemplateRepositoryInterface
+    private let userTravelRepository: UserTravelRepositoryInterface
+
+    public init(
+        travelTemplateRepository: TravelTemplateRepositoryInterface,
+        userTravelRepository: UserTravelRepositoryInterface
+    ) {
+        self.travelTemplateRepository = travelTemplateRepository
+        self.userTravelRepository = userTravelRepository
+    }
+}
+
+extension MyTravelUsecase: MyTravelUsecaseProtocol {
+    public func fetchMyTripInfo() async throws -> MyTripSummary {
+        try await userTravelRepository.fetchUpcoming()
+    }
+
+    public func fetchUpcomingList(page: Int?, size: Int?) async throws -> [UpcomingInfo] {
+        try await userTravelRepository.fetchUpcomingList(page: page, size: size)
+    }
+
+    public func fetchRecommendTripList(page: Int?, size: Int?) async throws -> [TripInfo] {
+        try await travelTemplateRepository.fetchRecommendTripList(page: page, size: size)
+    }
+}

Projects/Features/HomeFeature/Sources/HomeInteractor.swift

@@ -64,9 +64,6 @@ final class HomeInteractor: PresentableInteractor<HomePresentable>, HomeInteract
 
     override func didBecomeActive() {
         super.didBecomeActive()
-
-        setupStream()
-        fetchHomeData()
     }
 
     override func willResignActive() {
@@ -179,7 +176,8 @@ final class HomeInteractor: PresentableInteractor<HomePresentable>, HomeInteract
 
 // MARK: - HomePresentableListener
 extension HomeInteractor: HomePresentableListener {
-    func viewWillAppear() {
+    func viewDidLoad() {
+        setupStream()
         fetchHomeData()
     }
 

Projects/Features/HomeFeature/Sources/HomeViewController.swift

@@ -23,7 +23,7 @@ protocol HomePresentableListener: AnyObject {
     func itemSelected(item: HomeItem)
     func moreBtnTapped()
     func reloadBtnTapped()
-    func viewWillAppear()
+    func viewDidLoad()
 }
 
 // MARK: - HomeViewController
@@ -58,12 +58,12 @@ final class HomeViewController: UIViewController, HomeViewControllable {
         setCollectionView()
         setDataSource()
         bindInteractor()
+        listener?.viewDidLoad()
     }
 
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         navigationController?.setNavigationBarHidden(true, animated: animated)
-        listener?.viewWillAppear()
     }
 }
 
@@ -239,7 +239,7 @@ private extension HomeViewController {
         let headerRegistration = createHeaderRegistration()
         let popularFooterRegistration = createPopularFooterRegistration()
 
-        dataSource?.supplementaryViewProvider = { collectionView, kind, indexPath in
+        dataSource.supplementaryViewProvider = { collectionView, kind, indexPath in
             guard HomeSectionKind(rawValue: indexPath.section) != nil else {
                 return UICollectionReusableView()
             }

Projects/Features/HomeFeature/Sources/Models/HomePresentationModel.swift

@@ -149,12 +149,3 @@ extension TripInfo {
         )
     }
 }
-
-extension Date {
-    func toKoreanMMdd() -> String {
-        let formatter = DateFormatter()
-        formatter.locale = Locale(identifier: "ko_KR")
-        formatter.dateFormat = "M월 d일"
-        return formatter.string(from: self)
-    }
-}

Projects/Features/HomeFeature/Sources/Views/CollectionView/Registration/HomeRegistration.swift

@@ -47,7 +47,14 @@ extension HomeViewController {
 
     func createRecommedTripCellRegistration() -> UICollectionView.CellRegistration<RecommendInfoCell, HomePresentationModel.RecommendedTrip> {
         return UICollectionView.CellRegistration { cell, indexPath, item in
-            cell.configure(item)
+            cell.configure(
+                title: item.title,
+                thumbnailUrl: item.thumbnailUrl,
+                countryCode: item.country,
+                creator: item.creator,
+                city: item.city,
+                schedule: item.schedule
+            )
         }
     }