[Pl-29] Entity 모듈 적용, 모델 프로퍼티 수정

Author: junyng

AppPackage/Package.swift

@@ -79,7 +79,8 @@ let package = Package(
             name: "TimeTableFeature",
             dependencies: [
                 .product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
-                .product(name: "APIClient", package: "Planz-iOS-APIClient")
+                "APIClient",
+                "APIClientLive"
             ]
         ),
         .target(

AppPackage/Sources/Entity/Model.swift

@@ -30,31 +30,31 @@ public struct UpdateUsernameRequest: Encodable, Equatable {
 public struct CreatePromisingRequest: Encodable, Equatable {
     private enum CodingKeys: String, CodingKey {
         case name = "promisingName"
-        case startDate = "minTime"
-        case endDate = "maxTime"
+        case minTime
+        case maxTime
         case categoryID = "categoryId"
         case availableDates
         case place = "placeName"
     }
 
     public let name: String
-    public let startDate: Date
-    public let endDate: Date
+    public let minTime: String
+    public let maxTime: String
     public let categoryID: Int
-    public let availableDates: [Date]
+    public let availableDates: [String]
     public let place: String
 
     public init(
         name: String,
-        startDate: Date,
-        endDate: Date,
+        minTime: String,
+        maxTime: String,
         categoryID: Int,
-        availableDates: [Date],
+        availableDates: [String],
         place: String
     ) {
         self.name = name
-        self.startDate = startDate
-        self.endDate = endDate
+        self.minTime = minTime
+        self.maxTime = maxTime
         self.categoryID = categoryID
         self.availableDates = availableDates
         self.place = place
@@ -74,29 +74,21 @@ public struct CreatePromisingResponse: Decodable, Equatable {
 }
 
 public struct PromisingSessionResponse: Decodable, Equatable {
-    private enum CodingKeys: String, CodingKey {
-        case startDate = "minTime"
-        case endDate = "maxTime"
-        case totalCount
-        case unit
-        case availableDates
-    }
-
-    public let startDate: Date
-    public let endDate: Date
+    public let minTime: String
+    public let maxTime: String
     public let totalCount: Int
-    public let unit: Int
-    public let availableDates: [Date]
+    public let unit: Double
+    public let availableDates: [String]
 
     public init(
-        startDate: Date,
-        endDate: Date,
+        minTime: String,
+        maxTime: String,
         totalCount: Int,
-        unit: Int,
-        availableDates: [Date]
+        unit: Double,
+        availableDates: [String]
     ) {
-        self.startDate = startDate
-        self.endDate = endDate
+        self.minTime = minTime
+        self.maxTime = maxTime
         self.totalCount = totalCount
         self.unit = unit
         self.availableDates = availableDates
@@ -172,12 +164,28 @@ public struct PromisingSession: Codable, Equatable {
 }
 
 public struct PromisingTime: Codable, Equatable {
-    public let unit: Int
-    public let timeTable: TimeTable
+    public let unit: Double
+    public let timeTable: [TimeTable]
 
     public struct TimeTable: Codable, Equatable {
-        public let date: Date
+        public let date: String
         public let times: [Bool]
+
+        public init(
+            date: String,
+            times: [Bool]
+        ) {
+            self.date = date
+            self.times = times
+        }
+    }
+
+    public init(
+        unit: Double,
+        timeTable: [TimeTable]
+    ) {
+        self.unit = unit
+        self.timeTable = timeTable
     }
 }
 

AppPackage/Sources/MakePromise/MakePromiseStore.swift

@@ -9,6 +9,7 @@
 import APIClient
 import CalendarFeature
 import ComposableArchitecture
+import Entity
 import Foundation
 import TimeTableFeature
 
@@ -104,7 +105,7 @@ public struct MakePromise: ReducerProtocol {
             }
         }
 
-        var timeTable: TimeTable.State? {
+        var timeTable: TimeTableFeature.TimeTable.State? {
             get {
                 steps.compactMap { step in
                     guard case let .timeTable(state) = step else {
@@ -148,7 +149,7 @@ public struct MakePromise: ReducerProtocol {
             case setNameAndPlace(SetNameAndPlace.State)
             case calendar(CalendarCore.State)
             case timeSelection(TimeSelection.State)
-            case timeTable(TimeTable.State)
+            case timeTable(TimeTableFeature.TimeTable.State)
         }
 
         var isNextButtonEnable: Bool {
@@ -209,13 +210,13 @@ public struct MakePromise: ReducerProtocol {
         case dismiss
         case nextButtonTapped
         case backButtonTapped
-        case temporaryPromisingResponse(TaskResult<SharedModels.CreatePromisingResponse>)
-        case updatePromiseTimeRespose(TaskResult<SharedModels.UpdatePromiseTimeResponse>)
+        case temporaryPromisingResponse(TaskResult<CreatePromisingResponse>)
+        case updatePromiseTimeRespose(TaskResult<UpdatePromiseTimeResponse>)
         case selectTheme(SelectTheme.Action)
         case setNameAndPlace(SetNameAndPlace.Action)
         case calendar(CalendarCore.Action)
         case timeSelection(TimeSelection.Action)
-        case timeTable(TimeTable.Action)
+        case timeTable(TimeTableFeature.TimeTable.Action)
         case alert(PresentationAction<AlertAction>)
     }
 
@@ -268,7 +269,7 @@ public struct MakePromise: ReducerProtocol {
                                             )
                                         )
                                     ),
-                                    as: SharedModels.UpdatePromiseTimeResponse.self
+                                    as: UpdatePromiseTimeResponse.self
                                 )
                             }
                         )
@@ -329,7 +330,7 @@ public struct MakePromise: ReducerProtocol {
                                         )
                                     )
                                 ),
-                                as: SharedModels.CreatePromisingResponse.self
+                                as: CreatePromisingResponse.self
                             )
                         }
                     )
@@ -376,31 +377,6 @@ private enum Resource {
     }
 }
 
-extension SharedModels.CreatePromisingResponse: Equatable {
-    public static func == (lhs: SharedModels.CreatePromisingResponse, rhs: SharedModels.CreatePromisingResponse) -> Bool {
-        lhs.id == rhs.id
-    }
-}
-
-extension SharedModels.PromisingTime: Equatable {
-    public static func == (
-        lhs: SharedModels.PromisingTime,
-        rhs: SharedModels.PromisingTime
-    ) -> Bool {
-        lhs.unit == rhs.unit
-            && lhs.timeTable.count == rhs.timeTable.count
-    }
-}
-
-extension SharedModels.UpdatePromiseTimeResponse: Equatable {
-    public static func == (
-        lhs: SharedModels.UpdatePromiseTimeResponse,
-        rhs: SharedModels.UpdatePromiseTimeResponse
-    ) -> Bool {
-        lhs.promiseID == rhs.promiseID
-    }
-}
-
 private var dateFormatter: DateFormatter = {
     let dateFormatter = DateFormatter()
     dateFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss"

AppPackage/Sources/MakePromise/SubViews/SelectThemeStore.swift

@@ -9,6 +9,7 @@
 import APIClient
 import APIClientLive
 import ComposableArchitecture
+import Entity
 import Foundation
 import SwiftUI
 
@@ -25,7 +26,7 @@ public struct SelectTheme: ReducerProtocol {
 
     public enum Action: Equatable {
         case task
-        case categoriesResponse(TaskResult<[SharedModels.Category]>)
+        case categoriesResponse(TaskResult<[Entity.Category]>)
         case selectThemeItem(id: Int, action: SelectThemeItem.Action)
     }
 
@@ -40,7 +41,7 @@ public struct SelectTheme: ReducerProtocol {
                         TaskResult {
                             try await apiClient.request(
                                 route: .promising(.fetchCategories),
-                                as: [SharedModels.Category].self
+                                as: [Entity.Category].self
                             )
                         }
                     )
@@ -69,11 +70,3 @@ public struct SelectTheme: ReducerProtocol {
         }
     }
 }
-
-extension SharedModels.Category: Equatable {
-    public static func == (lhs: SharedModels.Category, rhs: SharedModels.Category) -> Bool {
-        lhs.id == rhs.id
-            && lhs.keyword == rhs.keyword
-            && lhs.type == rhs.type
-    }
-}

AppPackage/Sources/MakePromise/SubViews/SetNameAndPlaceStore.swift

@@ -9,6 +9,7 @@
 import APIClient
 import APIClientLive
 import ComposableArchitecture
+import Entity
 import Foundation
 
 public struct SetNameAndPlace: ReducerProtocol {
@@ -64,7 +65,7 @@ public struct SetNameAndPlace: ReducerProtocol {
 
     public enum Action: Equatable {
         case task
-        case placeHintResponse(TaskResult<SharedModels.CategoryName>)
+        case placeHintResponse(TaskResult<CategoryName>)
         case filledPromiseName(String)
         case filledPromisePlace(String)
     }
@@ -80,7 +81,7 @@ public struct SetNameAndPlace: ReducerProtocol {
                         TaskResult {
                             try await apiClient.request(
                                 route: .promising(.randomName(id)),
-                                as: SharedModels.CategoryName.self
+                                as: CategoryName.self
                             )
                         }
                     )
@@ -100,9 +101,3 @@ public struct SetNameAndPlace: ReducerProtocol {
         }
     }
 }
-
-extension SharedModels.CategoryName: Equatable {
-    public static func == (lhs: SharedModels.CategoryName, rhs: SharedModels.CategoryName) -> Bool {
-        lhs.name == rhs.name
-    }
-}

AppPackage/Sources/TimeTableFeature/TimeTableView.swift

@@ -9,6 +9,7 @@
 import APIClient
 import APIClientLive
 import ComposableArchitecture
+import Entity
 import SwiftUI
 
 public struct TimeTable: ReducerProtocol {
@@ -98,7 +99,7 @@ public struct TimeTable: ReducerProtocol {
 
     public enum Action: Equatable {
         case task
-        case fetchSessionResponse(TaskResult<SharedModels.PromisingSessionResponse>)
+        case fetchSessionResponse(TaskResult<PromisingSessionResponse>)
         case timeCellTapped(row: Int, column: Int)
     }
 
@@ -116,7 +117,7 @@ public struct TimeTable: ReducerProtocol {
                         TaskResult {
                             try await apiClient.request(
                                 route: .promising(.fetchSession(id)),
-                                as: SharedModels.PromisingSessionResponse.self
+                                as: PromisingSessionResponse.self
                             )
                         }
                     )
@@ -382,16 +383,3 @@ private var dateFormatter: DateFormatter = {
     dateFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss"
     return dateFormatter
 }()
-
-extension SharedModels.PromisingSessionResponse: Equatable {
-    public static func == (
-        lhs: SharedModels.PromisingSessionResponse,
-        rhs: SharedModels.PromisingSessionResponse
-    ) -> Bool {
-        lhs.minTime == rhs.minTime
-            && lhs.maxTime == rhs.maxTime
-            && lhs.totalCount == rhs.totalCount
-            && lhs.unit == rhs.unit
-            && lhs.availableDates == rhs.availableDates
-    }
-}