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

syss220211 · web-flow · commit 5882116f69c1 · 2025-02-14T01:44:15.000+09:00
[TNT-213] 트레이너 회원 목록 화면 연결
diff --git a/TnT/Projects/Data/Sources/Network/Service/Trainer/TrainerRepositoryImpl.swift b/TnT/Projects/Data/Sources/Network/Service/Trainer/TrainerRepositoryImpl.swift
@@ -50,10 +50,10 @@ public struct TrainerRepositoryImpl: TrainerRepository {
         return try await networkService.request(TrainerTargetType.getMonthlyLessonList(year: year, month: month), decodingType: GetMonthlyLessonListResDTO.self)
     }
     
-    public func getMembersList() async throws -> GetMembersListDTO {
+    public func getMembersList() async throws -> GetActiveTraineesListResDTO {
         return try await networkService.request(
             TrainerTargetType.getMemebersList,
-            decodingType: GetMembersListDTO.self
+            decodingType: GetActiveTraineesListResDTO.self
         )
     }
     
diff --git a/TnT/Projects/DesignSystem/Sources/Navigation/TNavigation.swift b/TnT/Projects/DesignSystem/Sources/Navigation/TNavigation.swift
@@ -66,7 +66,7 @@ public struct TNavigation: View {
                 .frame(width: 32, height: 32)
             
         case .LTextRButtonTitle(let leftTitle, let pointText, _):
-            HStack(spacing: 6){
+            HStack(spacing: 6) {
                 Text(leftTitle)
                     .typographyStyle(.heading2, with: .neutral900)
                 if let pointText = pointText {
@@ -88,7 +88,7 @@ public struct TNavigation: View {
             Text(centerTitle)
                 .typographyStyle(.heading4, with: .neutral900)
                 .frame(maxWidth: .infinity, alignment: .center)
-        case .LButton, .LTextRButtonTitle(_, _, _):
+        case .LButton, .LTextRButtonTitle:
             EmptyView()
         }
     }
@@ -120,9 +120,10 @@ public struct TNavigation: View {
             TButton(
                 title: rightButton,
                 config: .small,
-                state: .disable(.gray(isEnabled: true))) {
+                state: .disable(.primary(isEnabled: true))) {
                     rightAction?()
                 }
+                .frame(width: 90)
         }
     }
 }
diff --git a/TnT/Projects/Domain/Sources/DTO/Trainer/TrainerResponseDTO.swift b/TnT/Projects/Domain/Sources/DTO/Trainer/TrainerResponseDTO.swift
@@ -48,3 +48,17 @@ public typealias PostLessonResDTO = EmptyResponse
 
 /// PT 수업 완료 처리 응답 DTO
 public typealias PutCompleteLessonResDTO = EmptyResponse
+
+public extension ActiveTraineeInfoResDTO {
+    func dtoToEntity() -> ActiveTraineeInfoResEntity {
+        return .init(
+            id: self.id,
+            name: self.name,
+            profileImageUrl: self.profileImageUrl,
+            finishedPtCount: self.finishedPtCount,
+            totalPtCount: self.totalPtCount,
+            memo: self.memo,
+            ptGoals: self.ptGoals
+        )
+    }
+}
diff --git a/TnT/Projects/Domain/Sources/Entity/TraineeListItemEntity.swift b/TnT/Projects/Domain/Sources/Entity/TraineeListItemEntity.swift
@@ -23,3 +23,19 @@ public struct TraineeListItemEntity: Equatable, Sendable {
         self.name = name
     }
 }
+
+/// 관리 중인 회원 목록 응답 DTO
+public struct GetActiveTraineesListResEntity: Equatable {
+    public let trainees: [ActiveTraineeInfoResEntity]
+}
+
+/// 관리 중인 회원 정보 DTO
+public struct ActiveTraineeInfoResEntity: Sendable, Equatable {
+    public let id: Int
+    public let name: String
+    public let profileImageUrl: String
+    public let finishedPtCount: Int
+    public let totalPtCount: Int
+    public let memo: String
+    public let ptGoals: [String]
+}
diff --git a/TnT/Projects/Domain/Sources/Repository/TrainerRepository.swift b/TnT/Projects/Domain/Sources/Repository/TrainerRepository.swift
@@ -30,7 +30,7 @@ public protocol TrainerRepository {
     func getMonthlyLessonList(year: Int, month: Int) async throws -> GetMonthlyLessonListResDTO
     
     /// 회원 조희
-    func getMembersList() async throws -> GetMembersListDTO
+    func getMembersList() async throws -> GetActiveTraineesListResDTO
     
     /// 연결 완료된 트레이니 정보 불러오기
     func getConnectedTraineeInfo(trainerId: Int, traineeId: Int) async throws -> GetConnectedTraineeInfoResponseDTO
diff --git a/TnT/Projects/Domain/Sources/UseCase/TrainerUseCase.swift b/TnT/Projects/Domain/Sources/UseCase/TrainerUseCase.swift
@@ -33,7 +33,7 @@ public struct DefaultTrainerUseCase: TrainerRepository {
         return try await trainerRepository.getDateSessionList(date: date)
     }
     
-    public func getMembersList() async throws -> GetMembersListDTO {
+    public func getMembersList() async throws -> GetActiveTraineesListResDTO {
         return try await trainerRepository.getMembersList()
     }
     
diff --git a/TnT/Projects/Presentation/Sources/Alarm/AlarmCheckView.swift b/TnT/Projects/Presentation/Sources/Alarm/AlarmCheckView.swift
@@ -31,28 +31,45 @@ public struct AlarmCheckView: View {
                 leftAction: { send(.tapNavBackButton) }
             )
             
-            ScrollView {
+            ScrollView(showsIndicators: false) {
                 AlarmList()
                 Spacer()
             }
         }
         .navigationBarBackButtonHidden(true)
+        
     }
     
     // MARK: - Sections
     @ViewBuilder
     private func AlarmList() -> some View {
         VStack(spacing: 0) {
-            ForEach(store.alarmList, id: \.alarmId) { item in
-                AlarmListItem(
-                    alarmTypeText: item.alarmTypeText,
-                    alarmMainText: item.alarmMainText,
-                    alarmTimeText: item.alarmDate.timeAgoDisplay(),
-                    alarmSeenBefore: item.alarmSeenBefore
-                )
+            if store.alarmList.isEmpty {
+                EmptyView()
+            } else {
+                ForEach(store.alarmList, id: \.alarmId) { item in
+                    AlarmListItem(
+                        alarmTypeText: item.alarmTypeText,
+                        alarmMainText: item.alarmMainText,
+                        alarmTimeText: item.alarmDate.timeAgoDisplay(),
+                        alarmSeenBefore: item.alarmSeenBefore
+                    )
+                }
             }
         }
     }
+    
+    @ViewBuilder
+    private func EmptyView() -> some View {
+        VStack {
+            Spacer()
+            Text("최근 받은 알림이 없어요")
+                .typographyStyle(.label1Medium, with: Color.neutral400)
+                .frame(maxWidth: .infinity, alignment: .center)
+            Spacer()
+        }
+        .frame(minHeight: UIScreen.main.bounds.height - 104)
+    }
 }
 
 private extension AlarmCheckView {
diff --git a/TnT/Projects/Presentation/Sources/Coordinator/TrainerMainFlow/TrainerMainFlowFeature.swift b/TnT/Projects/Presentation/Sources/Coordinator/TrainerMainFlow/TrainerMainFlowFeature.swift
@@ -56,6 +56,7 @@ public struct TrainerMainFlowFeature {
                         
                         /// 트레이너 회원목록
                     case .trainerTraineeList:
+                        state.path.append(.trainerManagment(.init()))
                         return .none
                         
                         /// 트레이너 마이페이지
@@ -118,6 +119,8 @@ extension TrainerMainFlowFeature {
         case connectionComplete(ConnectionCompleteFeature)
         /// 연결된 트레이니 프로필
         case connectedTraineeProfile(ConnectedTraineeProfileFeature)
+        /// 트레이너 회원 관리 페이지
+        case trainerManagment(TrainerManagementFeature)
         
         // MARK: MyPage
         /// 초대코드 발급
diff --git a/TnT/Projects/Presentation/Sources/Coordinator/TrainerMainFlow/TrainerMainFlowView.swift b/TnT/Projects/Presentation/Sources/Coordinator/TrainerMainFlow/TrainerMainFlowView.swift
@@ -28,7 +28,7 @@ public struct TrainerMainFlowView: View {
                 TrainerMainTabView(store: store)
             case .addPTSession(let store):
                 TrainerAddPTSessionView(store: store)
-                
+
                 // MARK: Home
             case .alarmCheck(let store):
                 AlarmCheckView(store: store)
@@ -40,6 +40,8 @@ public struct TrainerMainFlowView: View {
                 // MARK: MyPage
             case .trainerMakeInvitationCodePage(let store):
                 MakeInvitationCodeView(store: store)
+            case .trainerManagment(let store):
+                TrainerManagementView(store: store)
             }
         }
     }
diff --git a/TnT/Projects/Presentation/Sources/GestureNavigation/GestureNavigation.swift b/TnT/Projects/Presentation/Sources/GestureNavigation/GestureNavigation.swift
@@ -0,0 +1,21 @@
+//
+//  GestureNavigation.swift
+//  Presentation
+//
+//  Created by 박서연 on 2/13/25.
+//  Copyright © 2025 yapp25thTeamTnT. All rights reserved.
+//
+
+import Foundation
+import UIKit
+
+extension UINavigationController: ObservableObject, UIGestureRecognizerDelegate {
+  open override func viewDidLoad() {
+    super.viewDidLoad()
+    interactivePopGestureRecognizer?.delegate = self
+  }
+  
+  public func gestureRecognizerShouldBegin(_ gestureRecognizer: UIGestureRecognizer) -> Bool {
+    return viewControllers.count > 2
+  }
+}
diff --git a/TnT/Projects/Presentation/Sources/MainTab/Trainer/TrainerMainTabFeature.swift b/TnT/Projects/Presentation/Sources/MainTab/Trainer/TrainerMainTabFeature.swift
@@ -15,7 +15,7 @@ public struct TrainerMainTabFeature {
     public enum State: Equatable {
         case home(TrainerHomeFeature.State)
 //        case feedback
-        case traineeList
+        case traineeList(TrainerManagementFeature.State)
         case myPage(TrainerMypageFeature.State)
         
         /// state case와 tabinfo 연결
@@ -69,7 +69,7 @@ public struct TrainerMainTabFeature {
 //            /// 피드백 화면에서 발생하는 액션 처리
 //            case feedbackAction
             /// 회원 목록 화면에서 발생하는 액션 처리
-            case traineeListAction
+            case traineeListAction(TrainerManagementFeature.Action)
             /// 마이페이지 화면에서 발생하는 액션 처리
             case myPageAction(TrainerMypageFeature.Action)
         }
@@ -92,8 +92,7 @@ public struct TrainerMainTabFeature {
 //                        state = .feedback
 //                        return .none
                     case .traineeList:
-                        // TODO: traineeList Feature 작성 후 추가해주세요
-                        state = .traineeList
+                        state = .traineeList(.init())
                         return .none
                     case .mypage:
                         state = .myPage(.init())
@@ -134,7 +133,7 @@ extension TrainerMainTabFeature {
 //        /// 트레이너 피드백
 //        case trainerFeedback
         /// 트레이너 회원 목록
-        case trainerTraineeList
+        case trainerTraineeList(TrainerManagementFeature.RoutingScreen)
         /// 트레이너 마이페이지
         case trainerMyPage(TrainerMypageFeature.RoutingScreen)
     }
diff --git a/TnT/Projects/Presentation/Sources/MainTab/Trainer/TrainerMainTabView.swift b/TnT/Projects/Presentation/Sources/MainTab/Trainer/TrainerMainTabView.swift
@@ -33,8 +33,7 @@ public struct TrainerMainTabView: View {
 //                }
             case .traineeList:
                 if let store = store.scope(state: \.traineeList, action: \.subFeature.traineeListAction) {
-                    Color.clear
-                        .frame(maxWidth: .infinity, maxHeight: .infinity)
+                    TrainerManagementView(store: store)
                 }
             case .myPage:
                 if let store = store.scope(state: \.myPage, action: \.subFeature.myPageAction) {
diff --git a/TnT/Projects/Presentation/Sources/MyPage/Trainer/TrainerManagmentFeature.swift b/TnT/Projects/Presentation/Sources/MyPage/Trainer/TrainerManagmentFeature.swift
diff --git a/TnT/Projects/Presentation/Sources/TrainerManagement/TrainerManagementView.swift b/TnT/Projects/Presentation/Sources/TrainerManagement/TrainerManagementView.swift
diff --git a/TnT/Projects/Presentation/Sources/TrainerManagement/TrainerManagmentFeature.swift b/TnT/Projects/Presentation/Sources/TrainerManagement/TrainerManagmentFeature.swift

Original file line number	Diff line number	Diff line change
`@@ -50,10 +50,10 @@ public struct TrainerRepositoryImpl: TrainerRepository {`
`50`	`50`	`return try await networkService.request(TrainerTargetType.getMonthlyLessonList(year: year, month: month), decodingType: GetMonthlyLessonListResDTO.self)`
`51`	`51`	`}`
`52`	`52`
`53`		`- public func getMembersList() async throws -> GetMembersListDTO {`
	`53`	`+ public func getMembersList() async throws -> GetActiveTraineesListResDTO {`
`54`	`54`	`return try await networkService.request(`
`55`	`55`	`TrainerTargetType.getMemebersList,`
`56`		`- decodingType: GetMembersListDTO.self`
	`56`	`+ decodingType: GetActiveTraineesListResDTO.self`
`57`	`57`	`)`
`58`	`58`	`}`
`59`	`59`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public struct TNavigation: View {`
`66`	`66`	`.frame(width: 32, height: 32)`
`67`	`67`
`68`	`68`	`case .LTextRButtonTitle(let leftTitle, let pointText, _):`
`69`		`- HStack(spacing: 6){`
	`69`	`+ HStack(spacing: 6) {`
`70`	`70`	`Text(leftTitle)`
`71`	`71`	`.typographyStyle(.heading2, with: .neutral900)`
`72`	`72`	`if let pointText = pointText {`
`@@ -88,7 +88,7 @@ public struct TNavigation: View {`
`88`	`88`	`Text(centerTitle)`
`89`	`89`	`.typographyStyle(.heading4, with: .neutral900)`
`90`	`90`	`.frame(maxWidth: .infinity, alignment: .center)`
`91`		`- case .LButton, .LTextRButtonTitle(_, _, _):`
	`91`	`+ case .LButton, .LTextRButtonTitle:`
`92`	`92`	`EmptyView()`
`93`	`93`	`}`
`94`	`94`	`}`
`@@ -120,9 +120,10 @@ public struct TNavigation: View {`
`120`	`120`	`TButton(`
`121`	`121`	`title: rightButton,`
`122`	`122`	`config: .small,`
`123`		`- state: .disable(.gray(isEnabled: true))) {`
	`123`	`+ state: .disable(.primary(isEnabled: true))) {`
`124`	`124`	`rightAction?()`
`125`	`125`	`}`
	`126`	`+ .frame(width: 90)`
`126`	`127`	`}`
`127`	`128`	`}`
`128`	`129`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public struct DefaultTrainerUseCase: TrainerRepository {`
`33`	`33`	`return try await trainerRepository.getDateSessionList(date: date)`
`34`	`34`	`}`
`35`	`35`
`36`		`- public func getMembersList() async throws -> GetMembersListDTO {`
	`36`	`+ public func getMembersList() async throws -> GetActiveTraineesListResDTO {`
`37`	`37`	`return try await trainerRepository.getMembersList()`
`38`	`38`	`}`
`39`	`39`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public struct TrainerMainFlowView: View {`
`28`	`28`	`TrainerMainTabView(store: store)`
`29`	`29`	`case .addPTSession(let store):`
`30`	`30`	`TrainerAddPTSessionView(store: store)`
`31`		`-`
	`31`	`+`
`32`	`32`	`// MARK: Home`
`33`	`33`	`case .alarmCheck(let store):`
`34`	`34`	`AlarmCheckView(store: store)`
`@@ -40,6 +40,8 @@ public struct TrainerMainFlowView: View {`
`40`	`40`	`// MARK: MyPage`
`41`	`41`	`case .trainerMakeInvitationCodePage(let store):`
`42`	`42`	`MakeInvitationCodeView(store: store)`
	`43`	`+ case .trainerManagment(let store):`
	`44`	`+ TrainerManagementView(store: store)`
`43`	`45`	`}`
`44`	`46`	`}`
`45`	`47`	`}`