Merge pull request #83 from YAPP-Github/TNT-210-TrainerHome

syss220211 · web-flow · commit f1a1fa4bc5fe · 2025-02-13T20:43:36.000+09:00
[TNT-210] 트레이너 캘린더 api 연결
diff --git a/TnT/Projects/DesignSystem/Sources/Components/Calendar/TCalendarRepresentable.swift b/TnT/Projects/DesignSystem/Sources/Components/Calendar/TCalendarRepresentable.swift
@@ -64,9 +64,10 @@ public struct TCalendarRepresentable: UIViewRepresentable {
         calendar.appearance.titleDefaultColor = .clear
         calendar.calendarWeekdayView.weekdayLabels[0].textColor = UIColor(.red500)
         
+        
         return calendar
     }
-    
+
     public func updateUIView(_ uiView: FSCalendar, context: Context) {
         // `selectedDate` 반영
         uiView.select(selectedDate)
diff --git a/TnT/Projects/Domain/Sources/DTO/Trainer/TrainerHomeResponseDTO.swift b/TnT/Projects/Domain/Sources/DTO/Trainer/TrainerHomeResponseDTO.swift
@@ -98,3 +98,79 @@ public struct SessonEntity: Equatable, Encodable {
         self.isCompleted = isCompleted
     }
 }
+
+// mapper
+// MARK: - GetDateSessionListDTO -> GetDateSessionListEntity
+public extension GetDateSessionListDTO {
+    func toEntity() -> GetDateSessionListEntity {
+        return GetDateSessionListEntity(
+            count: self.count,
+            date: self.date,
+            lessons: self.lessons.map { $0.toEntity() }
+        )
+    }
+    
+    // GetDateSessionListEntity -> GetDateSessionListDTO
+    func toDTO() -> GetDateSessionListDTO {
+        return GetDateSessionListDTO(
+            count: self.count,
+            date: self.date,
+            lessons: self.lessons.map { $0.toDTO() }
+        )
+    }
+}
+
+// MARK: - SessonDTO -> SessonEntity
+public extension SessonDTO {
+    public func toEntity() -> SessonEntity {
+        return SessonEntity(
+            ptLessonId: self.ptLessonId,
+            traineeId: self.traineeId,
+            traineeName: self.traineeName,
+            session: self.session,
+            startTime: self.startTime,
+            endTime: self.endTime,
+            isCompleted: self.isCompleted
+        )
+    }
+    
+    // SessonEntity -> SessonDTO
+    public func toDTO() -> SessonDTO {
+        return SessonDTO(
+            ptLessonId: self.ptLessonId,
+            traineeId: self.traineeId,
+            traineeName: self.traineeName,
+            session: self.session,
+            startTime: self.startTime,
+            endTime: self.endTime,
+            isCompleted: self.isCompleted
+        )
+    }
+}
+
+// MARK: - GetDateSessionListEntity -> GetDateSessionListDTO
+public extension GetDateSessionListEntity {
+    public func toDTO() -> GetDateSessionListDTO {
+        return GetDateSessionListDTO(
+            count: self.count,
+            date: self.date,
+            lessons: self.lessons.map { $0.toDTO() }
+        )
+    }
+}
+
+// MARK: - SessonEntity -> SessonDTO
+public extension SessonEntity {
+    public func toDTO() -> SessonDTO {
+        return SessonDTO(
+            ptLessonId: self.ptLessonId,
+            traineeId: self.traineeId,
+            traineeName: self.traineeName,
+            session: self.session,
+            startTime: self.startTime,
+            endTime: self.endTime,
+            isCompleted: self.isCompleted
+        )
+    }
+}
+
diff --git a/TnT/Projects/Presentation/Sources/Home/Trainer/TrainerHomeFeature.swift b/TnT/Projects/Presentation/Sources/Home/Trainer/TrainerHomeFeature.swift
@@ -78,6 +78,7 @@ public struct TrainerHomeFeature {
     }
     
     @Dependency(\.traineeUseCase) private var traineeUseCase: TraineeUseCase
+    @Dependency(\.trainerRepoUseCase) private var trainerRepoUseCase: TrainerRepository
     
     public enum Action: Sendable, ViewAction {
         /// 뷰에서 발생한 액션을 처리합니다.
@@ -103,6 +104,14 @@ public struct TrainerHomeFeature {
             case tapPopUpConnectButton
             /// 화면이 표시될 때
             case onAppear
+            /// events 타입에 맞춰서 달력 스케줄 캐수 표시 데이터 계산
+            case fetchMonthlyLessons(year: Int, month: Int)
+            /// 달력 스케줄 캐수 표시 데이터 업데이트
+            case updateEvents([Date: Int])
+            /// 특정 날짜 탭
+            case calendarDateTap
+            /// 탭한 일자 api 형태에 맞춰 변환하기(yyyy-mm-dd)
+            case settingSessionList(sessions: GetDateSessionListEntity)
         }
     }
     
@@ -117,7 +126,7 @@ public struct TrainerHomeFeature {
             case .view(let action):
                 switch action {
                 case .binding(\.selectedDate):
-                    print(state.events[state.selectedDate])
+                    print("state.events[state.selectedDate] \(state.events[state.selectedDate])")
                     return .none
                     
                 case .binding:
@@ -157,11 +166,59 @@ public struct TrainerHomeFeature {
                     return .send(.setNavigating(.trainerMakeInvitationCodePage))
                     
                 case .onAppear:
+                    let year: Int = Calendar.current.component(.year, from: state.selectedDate)
+                    let month: Int = Calendar.current.component(.month, from: state.selectedDate)
+                    
                     if let hideUntil = state.hidePopupUntil, hideUntil > Date() {
                         state.view_isPopUpPresented = false
                     } else {
                         state.view_isPopUpPresented = true
                     }
+                    
+                    return .send(.view(.fetchMonthlyLessons(year: year, month: month)))
+                    
+                case .fetchMonthlyLessons(year: let year, month: let month):
+                    return .run { send in
+                        do {
+                            let temp: GetMonthlyLessonListResDTO = try await trainerRepoUseCase.getMonthlyLessonList(
+                                year: year,
+                                month: month
+                            )
+                            
+                            let dateFormatter: DateFormatter = DateFormatter()
+                            dateFormatter.dateFormat = "yyyy-MM-dd"
+                            
+                            var events: [Date: Int] = [:]
+                            for lesson in temp.calendarPtLessonCounts {
+                                if let date = dateFormatter.date(from: lesson.date) {
+                                    events[date] = lesson.count
+                                } else {
+                                    print("Invalid date format: \(lesson.date)")
+                                }
+                            }
+                            await send(.view(.updateEvents(events)))
+                        } catch {
+                            print("리스트 Fetching Error: \(error)")
+                        }
+                    }
+                case .updateEvents(let events):
+                    state.events = events
+                    return .none
+                    
+                case .calendarDateTap:
+                    let formattedDate = TDateFormatUtility.formatter(for: .yyyyMMdd).string(from: state.selectedDate)
+                    
+                    return .run { send in
+                        do {
+                            let sessionList: GetDateSessionListEntity = try await trainerRepoUseCase.getDateSessionList(date: formattedDate).toEntity()
+                            await send(.view(.settingSessionList(sessions: sessionList)))
+                        } catch {
+                            print("error \(error.localizedDescription)")
+                        }
+                    }
+                    
+                case .settingSessionList(let list):
+                    state.tappedsessionInfo = list
                     return .none
                 }
             case .setNavigating:
diff --git a/TnT/Projects/Presentation/Sources/Home/Trainer/TrainerHomeView.swift b/TnT/Projects/Presentation/Sources/Home/Trainer/TrainerHomeView.swift
@@ -75,11 +75,15 @@ public struct TrainerHomeView: View {
                     currentPage: $store.view_currentPage,
                     events: store.events
                 )
+                .onChange(of: store.state.selectedDate, { oldValue, newValue in
+                    let startOfDay = Calendar.current.startOfDay(for: newValue)
+                    store.selectedDate = startOfDay
+                    store.send(.view(.calendarDateTap))
+                })
                 .padding(.horizontal, 20)
             }
         }
         .padding(.vertical, 12)
-        
     }
     
     /// 수업 리스트 상단 타이틀
@@ -110,10 +114,12 @@ public struct TrainerHomeView: View {
     @ViewBuilder
     private func RecordList() -> some View {
         VStack {
-            if let record = store.tappedsessionInfo {
+            if let record = store.tappedsessionInfo, !record.lessons.isEmpty {
                 ForEach(record.lessons, id: \.id) { record in
                     SessionCellView(session: record) {
                         send(.tapSessionCompleted(id: record.ptLessonId))
+                    } onTap: {
+                        // TODO: - 트레이너 기록 추가
                     }
                 }
             } else {
@@ -131,9 +137,10 @@ public struct TrainerHomeView: View {
             .frame(width: 126, height: 58)
             .overlay {
                 HStack(spacing: 4) {
-                    Image(.icnPlusEmpty)
+                    Image(.icnPlus)
                         .resizable()
                         .frame(width: 24, height: 24)
+                        .tint(Color.common0)
                     Text("수업추가")
                         .typographyStyle(.body1Medium, with: .neutral50)
                 }
@@ -215,6 +222,7 @@ extension TrainerHomeView {
     struct SessionCellView: View {
         var session: SessonEntity
         var onTapComplete: () -> Void
+        var onTap: (() -> Void)?
         
         var body: some View {
             HStack(spacing: 20) {
@@ -237,7 +245,7 @@ extension TrainerHomeView {
                     
                     if session.isCompleted {
                         Button {
-                            //
+                            onTap?()
                         } label: {
                             HStack(spacing: 4) {
                                 Image(.icnWriteWhite)
diff --git a/TnT/Projects/TnTApp/Sources/ContentView.swift b/TnT/Projects/TnTApp/Sources/ContentView.swift
@@ -12,7 +12,19 @@ import ComposableArchitecture
 
 struct ContentView: View {
     var body: some View {
-        Text("")
+                TrainerHomeView(store: Store(initialState: TrainerHomeFeature.State(), reducer: {
+                    TrainerHomeFeature()
+                }))
+//                TrainerMypageView(store: Store(initialState: TrainerMypageFeature.State(
+//                    userName: "홍길동",
+//                            userImageUrl: nil,
+//                            studentCount: 10,
+//                            oldStudentCount: 5,
+//                            appPushNotificationAllowed: true,
+//                            versionInfo: "1.0.0"
+//                    ), reducer: {
+//                    TrainerMypageFeature()
+//                }))
     }
 }
 
diff --git a/TnT/graph.png b/TnT/graph.png
