Merge pull request #87 from YAPP-Github/TNT-213-TrainerTraineeList

[TNT-213] 트레이너 회원 목록에서 회원 초대 연결 & 트레이너 캘린더 API연결

TnT/Projects/Data/Sources/Network/Service/Trainer/TrainerRepositoryImpl.swift

@@ -50,13 +50,6 @@ public struct TrainerRepositoryImpl: TrainerRepository {
         return try await networkService.request(TrainerTargetType.getMonthlyLessonList(year: year, month: month), decodingType: GetMonthlyLessonListResDTO.self)
     }
 
-    public func getMembersList() async throws -> GetActiveTraineesListResDTO {
-        return try await networkService.request(
-            TrainerTargetType.getMemebersList,
-            decodingType: GetActiveTraineesListResDTO.self
-        )
-    }
-
     public func getConnectedTraineeInfo(trainerId: Int, traineeId: Int) async throws -> GetConnectedTraineeInfoResponseDTO {
         return try await networkService.request(TrainerTargetType.getConnectedTraineeInfo(trainerId: trainerId, traineeId: traineeId), decodingType: GetConnectedTraineeInfoResponseDTO.self)
     }

TnT/Projects/DesignSystem/Resources/Assets.xcassets/Icons/icn_check_mark_green.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "icn_check_mark_green.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

TnT/Projects/DesignSystem/Resources/Assets.xcassets/Icons/icn_plus_gray.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "icn_plus_gray.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

TnT/Projects/DesignSystem/Resources/Assets.xcassets/Icons/icn_plus_white.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "icn_plus_white.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

TnT/Projects/DesignSystem/Resources/Assets.xcassets/Icons/icn_write_gray.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "icn_write_gray.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

TnT/Projects/DesignSystem/Sources/Components/Calendar/TCalendarRepresentable.swift

@@ -64,7 +64,6 @@ public struct TCalendarRepresentable: UIViewRepresentable {
         calendar.appearance.titleDefaultColor = .clear
         calendar.calendarWeekdayView.weekdayLabels[0].textColor = UIColor(.red500)
 
-
         return calendar
     }
 

TnT/Projects/DesignSystem/Sources/DesignSystem/Image+DesignSystem.swift

@@ -29,9 +29,11 @@ public extension ImageResource {
     static let icnMypageFilled: ImageResource = DesignSystemAsset.icnMypageFilled.imageResource
     static let icnWriteWhite: ImageResource = DesignSystemAsset.icnWriteWhite.imageResource
     static let icnWriteBlack: ImageResource = DesignSystemAsset.icnWriteBlack.imageResource
+    static let icnWriteGray: ImageResource = DesignSystemAsset.icnWriteGray.imageResource
     static let icnRadioButtonUnselected: ImageResource = DesignSystemAsset.icnRadioButtonUnselected.imageResource
     static let icnRadioButtonSelected: ImageResource = DesignSystemAsset.icnRadioButtonSelected.imageResource
     static let icnCheckMarkEmpty: ImageResource = DesignSystemAsset.icnCheckMarkEmpty.imageResource
+    static let icnCheckMarkGreen: ImageResource = DesignSystemAsset.icnCheckMarkGreen.imageResource
     static let icnCheckMarkFilled: ImageResource = DesignSystemAsset.icnCheckMarkFilled.imageResource
     static let icnCheckButtonUnselected: ImageResource = DesignSystemAsset.icnCheckButtonUnselected.imageResource
     static let icnCheckButtonSelected: ImageResource = DesignSystemAsset.icnCheckButtonSelected.imageResource
@@ -50,6 +52,7 @@ public extension ImageResource {
     static let icnWriteBlackFilled: ImageResource = DesignSystemAsset.icnWriteBlackFilled.imageResource
     static let icnPlus: ImageResource = DesignSystemAsset.icnPlus.imageResource
     static let icnPlusEmpty: ImageResource = DesignSystemAsset.icnPlusEmpty.imageResource
+    static let icnPlusGray: ImageResource = DesignSystemAsset.icnPlusGray.imageResource
     static let icnAlarm: ImageResource = DesignSystemAsset.icnAlarm.imageResource
     static let icnCalendar: ImageResource = DesignSystemAsset.icnCalendar.imageResource
     static let icnDelete24px: ImageResource = DesignSystemAsset.icnDelete24.imageResource

TnT/Projects/Domain/Sources/DTO/Trainer/TrainerHomeResponseDTO.swift

@@ -29,6 +29,7 @@ public struct SessonDTO: Decodable {
     public let ptLessonId: String
     public let traineeId: String
     public let traineeName: String
+    public let traineeProfileImageUrl: String
     public let session: Int
     public let startTime: String
     public let endTime: String
@@ -38,6 +39,7 @@ public struct SessonDTO: Decodable {
         ptLessonId: String,
         traineeId: String,
         traineeName: String,
+        traineeProfileImageUrl: String,
         session: Int,
         startTime: String,
         endTime: String,
@@ -46,6 +48,7 @@ public struct SessonDTO: Decodable {
         self.ptLessonId = ptLessonId
         self.traineeId = traineeId
         self.traineeName = traineeName
+        self.traineeProfileImageUrl = traineeProfileImageUrl
         self.session = session
         self.startTime = startTime
         self.endTime = endTime
@@ -75,6 +78,7 @@ public struct SessonEntity: Equatable, Encodable {
     public let ptLessonId: String
     public let traineeId: String
     public let traineeName: String
+    public let traineeProfileImageUrl: String
     public let session: Int
     public let startTime: String
     public let endTime: String
@@ -84,6 +88,7 @@ public struct SessonEntity: Equatable, Encodable {
         ptLessonId: String,
         traineeId: String,
         traineeName: String,
+        traineeProfileImageUrl: String,
         session: Int,
         startTime: String,
         endTime: String,
@@ -92,6 +97,7 @@ public struct SessonEntity: Equatable, Encodable {
         self.ptLessonId = ptLessonId
         self.traineeId = traineeId
         self.traineeName = traineeName
+        self.traineeProfileImageUrl = traineeProfileImageUrl
         self.session = session
         self.startTime = startTime
         self.endTime = endTime
@@ -122,14 +128,15 @@ public extension GetDateSessionListDTO {
 
 // MARK: - SessonDTO -> SessonEntity
 public extension SessonDTO {
-    public func toEntity() -> SessonEntity {
+    func toEntity() -> SessonEntity {
         return SessonEntity(
             ptLessonId: self.ptLessonId,
             traineeId: self.traineeId,
             traineeName: self.traineeName,
+            traineeProfileImageUrl: self.traineeProfileImageUrl,
             session: self.session,
-            startTime: self.startTime,
-            endTime: self.endTime,
+            startTime: self.startTime.toDate(format: .ISO8601)?.toString(format: .a_HHmm) ?? "",
+            endTime: self.endTime.toDate(format: .ISO8601)?.toString(format: .a_HHmm) ?? "",
             isCompleted: self.isCompleted
         )
     }
@@ -140,6 +147,7 @@ public extension SessonDTO {
             ptLessonId: self.ptLessonId,
             traineeId: self.traineeId,
             traineeName: self.traineeName,
+            traineeProfileImageUrl: self.traineeProfileImageUrl,
             session: self.session,
             startTime: self.startTime,
             endTime: self.endTime,
@@ -166,6 +174,7 @@ public extension SessonEntity {
             ptLessonId: self.ptLessonId,
             traineeId: self.traineeId,
             traineeName: self.traineeName,
+            traineeProfileImageUrl: self.traineeProfileImageUrl,
             session: self.session,
             startTime: self.startTime,
             endTime: self.endTime,

TnT/Projects/Domain/Sources/Repository/TrainerRepository.swift

@@ -29,9 +29,6 @@ public protocol TrainerRepository {
     /// 달력 스케줄 카운트 표시에 필요한 PT 리스트 불러오기
     func getMonthlyLessonList(year: Int, month: Int) async throws -> GetMonthlyLessonListResDTO
 
-    /// 회원 조희
-    func getMembersList() async throws -> GetActiveTraineesListResDTO
-
     /// 연결 완료된 트레이니 정보 불러오기
     func getConnectedTraineeInfo(trainerId: Int, traineeId: Int) async throws -> GetConnectedTraineeInfoResponseDTO
 

TnT/Projects/Domain/Sources/UseCase/TrainerUseCase.swift

@@ -33,10 +33,6 @@ public struct DefaultTrainerUseCase: TrainerRepository {
         return try await trainerRepository.getDateSessionList(date: date)
     }
 
-    public func getMembersList() async throws -> GetActiveTraineesListResDTO {
-        return try await trainerRepository.getMembersList()
-    }
-
     public func getConnectedTraineeInfo(trainerId: Int, traineeId: Int) async throws -> GetConnectedTraineeInfoResponseDTO {
         return try await trainerRepository.getConnectedTraineeInfo(trainerId: trainerId, traineeId: traineeId)
     }

TnT/Projects/Presentation/Sources/Coordinator/TrainerMainFlow/TrainerMainFlowFeature.swift

@@ -55,9 +55,12 @@ public struct TrainerMainFlowFeature {
                         }
 
                         /// 트레이너 회원목록
-                    case .trainerTraineeList:
-                        state.path.append(.trainerManagment(.init()))
-                        return .none
+                    case .trainerTraineeList(let screen):
+                        switch screen {
+                        case .addTrainee:
+                            state.path.append(.addTrainee(.init()))
+                            return .none
+                        }
 
                         /// 트레이너 마이페이지
                     case .trainerMyPage(let screen):
@@ -119,8 +122,10 @@ extension TrainerMainFlowFeature {
         case connectionComplete(ConnectionCompleteFeature)
         /// 연결된 트레이니 프로필
         case connectedTraineeProfile(ConnectedTraineeProfileFeature)
-        /// 트레이너 회원 관리 페이지
-        case trainerManagment(TrainerManagementFeature)
+
+        // MARK: - 회원 목록
+        /// 회원 추가
+        case addTrainee(AddTraineeFeature)
 
         // MARK: MyPage
         /// 초대코드 발급

TnT/Projects/Presentation/Sources/Coordinator/TrainerMainFlow/TrainerMainFlowView.swift

@@ -36,12 +36,14 @@ public struct TrainerMainFlowView: View {
                 ConnectionCompleteView(store: store)
             case .connectedTraineeProfile(let store):
                 ConnectedTraineeProfileView(store: store)
+
+                // MARK: - TraineeList
+            case .addTrainee(let store):
+                AddTraineeView(store: store)
 
                 // MARK: MyPage
             case .trainerMakeInvitationCodePage(let store):
                 MakeInvitationCodeView(store: store)
-            case .trainerManagment(let store):
-                TrainerManagementView(store: store)
             }
         }
     }

TnT/Projects/Presentation/Sources/Home/Trainer/TrainerHomeFeature.swift

@@ -112,6 +112,8 @@ public struct TrainerHomeFeature {
             case calendarDateTap
             /// 탭한 일자 api 형태에 맞춰 변환하기(yyyy-mm-dd)
             case settingSessionList(sessions: GetDateSessionListEntity)
+            /// 수업 완료 후 토스트 메시지
+            case completeToastMessage
         }
     }
 
@@ -126,7 +128,7 @@ public struct TrainerHomeFeature {
             case .view(let action):
                 switch action {
                 case .binding(\.selectedDate):
-                    print("state.events[state.selectedDate] \(state.events[state.selectedDate])")
+                    //                    print("state.events[state.selectedDate] \(state.events[state.selectedDate])")
                     return .none
 
                 case .binding:
@@ -136,8 +138,15 @@ public struct TrainerHomeFeature {
                     return .send(.setNavigating(.alarmPage))
 
                 case .tapSessionCompleted(let id):
-                    // TODO: 네비게이션 연결 시 추가
-                    print("tapSessionCompleted otLessionID \(id)")
+                    guard let id = Int(id) else { return .none }
+                    return .run { send in
+                        let result: PutCompleteLessonResDTO = try await trainerRepoUseCase.putCompleteLesson(lessonId: id)
+                        await send(.view(.completeToastMessage))
+                        await send(.view(.calendarDateTap))
+                    }
+
+                case .completeToastMessage:
+                    NotificationCenter.default.post(toast: .init(presentType: .image(.icnCheckMarkGreen), message: "PT 수업을 완료했어요"))
                     return .none
 
                 case .tapAddSessionButton:
@@ -175,7 +184,12 @@ public struct TrainerHomeFeature {
                         state.view_isPopUpPresented = true
                     }
 
-                    return .send(.view(.fetchMonthlyLessons(year: year, month: month)))
+                    return .concatenate(
+                        .send(.view(.fetchMonthlyLessons(year: month == 1 ? year-1 : year, month: month == 1 ? 12 : month-1))),
+                        .send(.view(.fetchMonthlyLessons(year: year, month: month))),
+                        .send(.view(.fetchMonthlyLessons(year: year, month: month+1))),
+                        .send(.view(.calendarDateTap))
+                    )
 
                 case .fetchMonthlyLessons(year: let year, month: let month):
                     return .run { send in
@@ -206,7 +220,7 @@ public struct TrainerHomeFeature {
                     return .none
 
                 case .calendarDateTap:
-                    let formattedDate = TDateFormatUtility.formatter(for: .yyyyMMdd).string(from: state.selectedDate)
+                    let formattedDate: String = TDateFormatUtility.formatter(for: .yyyyMMdd).string(from: state.selectedDate)
 
                     return .run { send in
                         do {