Feat/#125 Flowstate, 시술 일정 추가 API 연결

Cherrish-iOS/Cherrish-iOS/Data/Model/CreateUserProcedureRequestDTO.swift

@@ -0,0 +1,19 @@
+//
+//  UserProcedureItemRequestDTO.swift
+//  Cherrish-iOS
+//
+//  Created by 어재선 on 1/21/26.
+//
+
+import Foundation
+
+struct UserProcedureItemRequestDTO: Encodable, Decodable {
+    let procedureId: Int
+    let downtimeDays: Int
+}
+
+struct CreateUserProcedureRequestDTO: Encodable, Decodable {
+    let scheduledAt: String
+    let recoveryTargetDate: String
+    let procedures: [UserProcedureItemRequestDTO]
+}

Cherrish-iOS/Cherrish-iOS/Data/Network/EndPoint/HomeAPI.swift

@@ -47,7 +47,7 @@ extension HomeAPI: EndPoint {
         }
     }
 
-    var queryParameters: [String: String]? {
+    var queryParameters: [String: Any]? {
         switch self {
         case .fetchDashboard:
             return nil

Cherrish-iOS/Cherrish-iOS/Data/Network/EndPoint/TreatmentAPI.swift

@@ -11,14 +11,16 @@ import Alamofire
 enum TreatmentAPI: EndPoint {
     case fetchCategories(userId: Int)
     case fetchProcedures(userId: Int, id: Int? = nil, text: String? = nil)
+    case createUserProcedure(userId: Int, request: CreateUserProcedureRequestDTO)
 
     var basePath: String {
         switch self {
         case .fetchCategories:
             return "/api"
-
         case .fetchProcedures:
             return "/api"
+        case .createUserProcedure:
+            return "/api"
         }
     }
 
@@ -28,6 +30,8 @@ enum TreatmentAPI: EndPoint {
             return "/worries"
         case .fetchProcedures:
             return "/procedures"
+        case .createUserProcedure:
+            return "/user-procedures"
         }
     }
 
@@ -37,6 +41,8 @@ enum TreatmentAPI: EndPoint {
             return .get
         case .fetchProcedures:
             return .get
+        case .createUserProcedure:
+            return .post
         }
     }
 
@@ -46,6 +52,9 @@ enum TreatmentAPI: EndPoint {
             return .withAuth(userID: userId)
         case .fetchProcedures(let userId, _,  _):
             return .withAuth(userID: userId)
+        case .createUserProcedure(let userId, _):
+            return .withAuth(userID: userId)
+
         }
     }
 
@@ -56,6 +65,8 @@ enum TreatmentAPI: EndPoint {
             return URLEncoding.default
         case .fetchProcedures:
             return URLEncoding.default
+        case .createUserProcedure:
+            return JSONEncoding.default
         }
     }
 
@@ -65,22 +76,36 @@ enum TreatmentAPI: EndPoint {
             return nil
         case .fetchProcedures(_, let id, let text):
             var params: [String: Any] = [:]
-               if let id = id {
-                   params["worryId"] = id
-               } 
-               if let text = text {
-                   params["keyword"] = "\(text)"
-               }
-               return params
+            if let id = id {
+                params["worryId"] = id
+            }
+            if let text = text {
+                params["keyword"] = "\(text)"
+            }
+            return params
+        case .createUserProcedure:
+            return nil
         }
     }
 
+
     var bodyParameters: Alamofire.Parameters? {
         switch self {
         case .fetchCategories:
             return .none
         case .fetchProcedures:
             return .none
+        case .createUserProcedure(_, let request):
+            return [
+                "scheduledAt": request.scheduledAt,
+                "recoveryTargetDate": request.recoveryTargetDate,
+                "procedures": request.procedures.map {
+                    [
+                        "procedureId": $0.procedureId,
+                        "downtimeDays": $0.downtimeDays
+                    ]
+                }
+            ]
         }
-    }  
+    }
 }

Cherrish-iOS/Cherrish-iOS/Data/Repository/TreatmentRepository.swift

@@ -8,6 +8,8 @@
 import Foundation
 
 struct DefaultTreatmentRepository: TreatmentInterface {
+
+
     private let networkService: NetworkService
     private let userDefaultService: UserDefaultService
 
@@ -32,9 +34,24 @@ struct DefaultTreatmentRepository: TreatmentInterface {
         let response = try await networkService.request(TreatmentAPI.fetchProcedures(userId: userId,id: id, text: keyword), decodingType: ProceduresResponseDTO.self)
         return response.procedures.map { $0.toEntity() }
     }
+
+    func createUserProcedure(scheduledDate: String, recoveryDate: String, treatments: [TreatmentEntity]) async throws {
+        let userId: Int = userDefaultService.load(key: .userID) ?? 1
+        let request = CreateUserProcedureRequestDTO(
+            scheduledAt: scheduledDate,
+            recoveryTargetDate: recoveryDate,
+            procedures: treatments.compactMap { $0.toRequestDTO() }
+        )
+        let _ = try await networkService.request(TreatmentAPI.createUserProcedure(userId: userId, request: request), decodingType: UserProcedureItemRequestDTO.self)
+    }
 }
 
 struct MockTreatmentRepository: TreatmentInterface {
+
+    func createUserProcedure(scheduledDate: String, recoveryDate: String, treatments: [TreatmentEntity]) {
+
+    }
+
     func fetchTreatment(id: Int?, keyword: String?) async throws -> [TreatmentEntity] {
         return []
     }

Cherrish-iOS/Cherrish-iOS/Domain/DomainDependencyAssembler.swift

@@ -25,10 +25,6 @@ final class DomainDependencyAssembler: DependencyAssembler {
             return
         }
 
-        guard let treatmentCategoryRepository = DIContainer.shared.resolve(type: TreatmentInterface.self) else {
-            return
-        }
-
         DIContainer.shared.register(type: FetchProcedureCountOfMonth.self) {
             return DefaultFetchProcedureCountOfMonth(repository: calendarRepository)
         }
@@ -76,5 +72,9 @@ final class DomainDependencyAssembler: DependencyAssembler {
         DIContainer.shared.register(type: FetchUserInfoUseCase.self) {
             return DefaultFetchUserInfoUserCase(repository: myPageRepository)
         }
+
+        DIContainer.shared .register(type: CreateUserProcedureUseCase.self) {
+            return DefaultCreateUserProcedureUseCase(repository: treatmentRepository)
+        }
     }
 }

Cherrish-iOS/Cherrish-iOS/Domain/Interface/TreatmentInterface.swift

@@ -10,4 +10,5 @@ import Foundation
 protocol TreatmentInterface {
     func fetchCategories() async throws -> [TreatmentCategoryEntity]
     func fetchTreatment(id: Int?, keyword: String?) async throws -> [TreatmentEntity]
+    func createUserProcedure(scheduledDate: String, recoveryDate: String, treatments: [TreatmentEntity]) async throws
 }

Cherrish-iOS/Cherrish-iOS/Domain/Model/TreatmentEntity.swift

@@ -20,5 +20,13 @@ struct TreatmentEntity: Identifiable, Equatable, Hashable {
         }
 }
 
-
+extension TreatmentEntity {
+    func toRequestDTO() -> UserProcedureItemRequestDTO? {
+        guard let downtime = setDowntime else { return nil }
+        return UserProcedureItemRequestDTO(
+            procedureId: id,
+            downtimeDays: downtime
+        )
+    }
+}
 

Cherrish-iOS/Cherrish-iOS/Domain/UseCase/CreateUserProcedureUseCase.swift

@@ -0,0 +1,25 @@
+//
+//  CreateUserProcedureUseCase.swift
+//  Cherrish-iOS
+//
+//  Created by 어재선 on 1/21/26.
+//
+
+import Foundation
+
+protocol CreateUserProcedureUseCase {
+    func excute(scheduledDate: String, recoveryDate: String, treatments: [TreatmentEntity]) async throws
+}
+
+struct DefaultCreateUserProcedureUseCase: CreateUserProcedureUseCase {
+
+    private let repository: TreatmentInterface
+
+    init(repository: TreatmentInterface) {
+        self.repository = repository
+    }
+
+    func excute(scheduledDate: String, recoveryDate: String, treatments: [TreatmentEntity]) async throws {
+        return try await repository.createUserProcedure(scheduledDate: scheduledDate, recoveryDate: recoveryDate, treatments: treatments)
+    }
+}

Cherrish-iOS/Cherrish-iOS/Presentation/Feature/Calendar/CalendarMain/CalendarView.swift

@@ -150,6 +150,7 @@ extension CalendarView {
                         .foregroundStyle(.gray600)
                         .frame(width: 24.adjustedW, height: 24.adjustedH)
                         .onTapGesture {
+                            viewModel.confirmDate()
                             calendarCoordinator.push(.selectTreatment)
                         }
                 case .selectedProcedure:
@@ -252,9 +253,11 @@ extension CalendarView {
                 leadingIcon: Image(.plus),
                 trailingIcon: nil,
                 action: {
+                    viewModel.confirmDate()
                     calendarCoordinator.push(
                         .selectTreatment
                     )
+
                 }
             )
             .padding(.horizontal, 24)

Cherrish-iOS/Cherrish-iOS/Presentation/Feature/Calendar/CalendarMain/CalendarViewModel.swift

@@ -26,17 +26,24 @@ final class CalendarViewModel: ObservableObject {
     private let fetchProcedureCountOfMonthUseCase: FetchProcedureCountOfMonth
     private let fetchTodayProcedureListUseCase: FetchTodayProcedureListUseCase
     private let fetchProcedureDowntimeUseCase: FetchProcedureDowntimeUseCase
+    private let calendarTreatmentFlowState: CalendarTreatmentFlowState
 
     init(
         fetchProcedureCountOfMonthUseCase: FetchProcedureCountOfMonth,
         fetchTodayProcedureListUseCase: FetchTodayProcedureListUseCase,
-        fetchProcedureDowntimeUseCase: FetchProcedureDowntimeUseCase
+        fetchProcedureDowntimeUseCase: FetchProcedureDowntimeUseCase,
+        calendarTreatmentFlowState: CalendarTreatmentFlowState
     ) {
         self.fetchProcedureCountOfMonthUseCase = fetchProcedureCountOfMonthUseCase
         self.fetchTodayProcedureListUseCase = fetchTodayProcedureListUseCase
+        self.calendarTreatmentFlowState = calendarTreatmentFlowState
         self.fetchProcedureDowntimeUseCase = fetchProcedureDowntimeUseCase
     }
 
+    func confirmDate() {
+        calendarTreatmentFlowState.selectedDaet = selectedDate
+    }
+
     func select(date: Date) {
         selectedDate = date
     }
@@ -94,6 +101,10 @@ final class CalendarViewModel: ObservableObject {
         return procedureList.isEmpty
     }
 
+    func sendDateToTreatmentView() {
+        calendarTreatmentFlowState.selectedDaet = selectedDate
+    }
+
     @MainActor
     func fetchProcedureCountsOfMonth() async throws {
         let calendar = Calendar.current

Cherrish-iOS/Cherrish-iOS/Presentation/Feature/Calendar/CalendarTreatmentFlowState.swift

@@ -0,0 +1,12 @@
+//
+//  CalendarTreatmentFlowState.swift
+//  Cherrish-iOS
+//
+//  Created by 이나연 on 1/21/26.
+//
+
+import Foundation
+
+final class CalendarTreatmentFlowState: ObservableObject {
+    @Published var selectedDaet: Date?
+}

Cherrish-iOS/Cherrish-iOS/Presentation/Feature/Calendar/Treatment/View/NoTreatment/NoTreatmentView.swift

@@ -62,7 +62,6 @@ struct NoTreatmentView: View {
         switch viewModel.state {
         case .treatmentSelectedCategory:
             TreatmentSelectedCategory(viewModel: viewModel)
-                .padding(.horizontal, 34.adjustedW)
                 .id(String(describing: viewModel.state))
 
         case .targetDdaySetting:
@@ -72,7 +71,6 @@ struct NoTreatmentView: View {
                 month: $viewModel.month,
                 day: $viewModel.day
             )
-            .padding(.horizontal, 34.adjustedW)
             .id(String(describing: viewModel.state))
 
         case .treatmentFilter:
@@ -113,7 +111,15 @@ struct NoTreatmentView: View {
                 leadingIcon: nil,
                 trailingIcon: nil
             ) {
-                viewModel.next()
+                if viewModel.state == .downTimeSetting {
+                    Task {
+                        try await viewModel.createUserProcedure()
+                        tabBarCoordinator.isTabbarHidden = false
+                        calendarCoordinator.popToRoot()
+                    }
+                } else {
+                    viewModel.next()
+                }
             }
             .padding(.horizontal, 25.adjustedW)
         }
@@ -160,7 +166,7 @@ private struct TreatmentSelectedCategory: View {
 
                 Spacer()
             }
-
+            .padding(.horizontal, 34.adjustedW)
             Spacer()
                 .frame(height: 40.adjustedH)
             ScrollView(.vertical, showsIndicators:false) {
@@ -182,7 +188,7 @@ private struct TreatmentSelectedCategory: View {
                             )
                         )
                     }
-                }
+                } .padding(.horizontal, 34.adjustedW)
             }
         }
     }

Cherrish-iOS/Cherrish-iOS/Presentation/Feature/Calendar/Treatment/View/Treatment/TreatmentView.swift

@@ -110,7 +110,15 @@ struct TreatmentView: View {
                 leadingIcon: nil,
                 trailingIcon: nil
             ) {
-                viewModel.next()
+                if viewModel.state == .downTimeSetting {
+                    Task {
+                        try await viewModel.createUserProcedure()
+                        tabBarCoordinator.isTabbarHidden = false
+                        calendarCoordinator.popToRoot()
+                    }
+                } else {
+                    viewModel.next()
+                }
             }
             .padding(.horizontal, 25.adjustedW)
         }