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

[TNT-213] 트레이너 회원목록 페이지 작성
YAPP-Github · Feb 10, 2025 · 78b0919 · 78b0919
2 parents f75cf83 + b04683d
commit 78b0919
Show file tree

Hide file tree

Showing 12 changed files with 409 additions and 1 deletion.
diff --git a/TnT/Projects/DIContainer/Sources/DIContainer.swift b/TnT/Projects/DIContainer/Sources/DIContainer.swift
@@ -30,6 +30,10 @@ private enum SocialUseCaseKey: DependencyKey {
     static let liveValue: SocialLoginUseCase = SocialLoginUseCase(socialLoginRepository: SocialLogInRepositoryImpl(loginManager: SNSLoginManager()))
 }
 
+private enum TrainerUseCaseRepoKey: DependencyKey {
+    static let liveValue: TrainerRepository = DefaultTrainerUseCase(trainerRepository: TrainerRepositoryImpl())
+}
+
 private enum KeyChainManagerKey: DependencyKey {
     static let liveValue: KeyChainManager = keyChainManager
 }
@@ -60,4 +64,9 @@ public extension DependencyValues {
         get { self[SocialUseCaseKey.self] }
         set { self[SocialUseCaseKey.self] = newValue }
     }
+
+    var trainerRepoUseCase: TrainerRepository {
+        get { self[TrainerUseCaseRepoKey.self] }
+        set { self[TrainerUseCaseRepoKey.self] = newValue }
+    }
 }
diff --git a/TnT/Projects/Data/Sources/Network/Service/Trainer/TrainerRepositoryImpl.swift b/TnT/Projects/Data/Sources/Network/Service/Trainer/TrainerRepositoryImpl.swift
@@ -45,4 +45,11 @@ public struct TrainerRepositoryImpl: TrainerRepository {
             decodingType: GetDateSessionListDTO.self
         )
     }
+
+    public func getMembersList() async throws -> GetMembersListDTO {
+        return try await networkService.request(
+            TrainerTargetType.getMemebersList,
+            decodingType: GetMembersListDTO.self
+        )
+    }
 }
diff --git a/TnT/Projects/Data/Sources/Network/Service/Trainer/TrainerTargetType.swift b/TnT/Projects/Data/Sources/Network/Service/Trainer/TrainerTargetType.swift
@@ -20,6 +20,8 @@ public enum TrainerTargetType {
     case getDateLessionList(date: String)
     /// 트레이너 초대코드 재발급
     case getReissuanceInvitationCode
+    /// 회원 조희
+    case getMemebersList
 }
 
 extension TrainerTargetType: TargetType {
@@ -38,6 +40,8 @@ extension TrainerTargetType: TargetType {
             return "/lessions/\(date)"
         case .getReissuanceInvitationCode:
             return "/invitation-code/reissue"
+        case .getMemebersList:
+            return "/members"
         }
     }
 
@@ -51,6 +55,8 @@ extension TrainerTargetType: TargetType {
             return .get
         case .getReissuanceInvitationCode:
             return .put
+        case .getMemebersList:
+            return .get
         }
     }
 
@@ -64,6 +70,8 @@ extension TrainerTargetType: TargetType {
             return .requestPlain
         case .getReissuanceInvitationCode:
             return .requestPlain
+        case .getMemebersList:
+            return .requestPlain
         }
     }
 
@@ -77,6 +85,8 @@ extension TrainerTargetType: TargetType {
             return ["Content-Type": "application/json"]
         case .getReissuanceInvitationCode:
             return ["Content-Type": "application/json"]
+        case .getMemebersList:
+            return ["Content-Type": "application/json"]
         }
     }
 

diff --git a/TnT/Projects/DesignSystem/Sources/Navigation/TNavigation.swift b/TnT/Projects/DesignSystem/Sources/Navigation/TNavigation.swift
@@ -64,6 +64,16 @@ public struct TNavigation: View {
             Rectangle()
                 .fill(Color.clear)
                 .frame(width: 32, height: 32)
+
+        case .LTextRButtonTitle(let leftTitle, let pointText, _):
+            HStack(spacing: 6){
+                Text(leftTitle)
+                    .typographyStyle(.heading2, with: .neutral900)
+                if let pointText = pointText {
+                    Text(pointText)
+                        .typographyStyle(.heading2, with: .red500)
+                } else { EmptyView() }
+            }
         }
     }
 
@@ -78,7 +88,7 @@ public struct TNavigation: View {
             Text(centerTitle)
                 .typographyStyle(.heading4, with: .neutral900)
                 .frame(maxWidth: .infinity, alignment: .center)
-        case .LButton:
+        case .LButton, .LTextRButtonTitle(_, _, _):
             EmptyView()
         }
     }
@@ -105,6 +115,14 @@ public struct TNavigation: View {
             Rectangle()
                 .fill(Color.clear)
                 .frame(width: 32, height: 32)
+
+        case .LTextRButtonTitle(_, _, let rightButton):
+            TButton(
+                title: rightButton,
+                config: .small,
+                state: .disable(.gray(isEnabled: true))) {
+                    rightAction?()
+                }
         }
     }
 }
@@ -143,4 +161,6 @@ public enum TNavigationCase {
     case Title(centerTitle: String)
     /// 왼쪽 이미지
     case LButton(leftImage: ImageResource)
+    /// 왼쪽 텍스트, 오른쪽 버튼
+    case LTextRButtonTitle(leftTitle: String, pointText: String?, rightButton: String)
 }
diff --git a/TnT/Projects/Domain/Sources/DTO/Trainer/GetMembersListDTO.swift b/TnT/Projects/Domain/Sources/DTO/Trainer/GetMembersListDTO.swift
@@ -0,0 +1,59 @@
+//
+//  GetMembersListDTO.swift
+//  Domain
+//
+//  Created by 박서연 on 2/8/25.
+//  Copyright © 2025 yapp25thTeamTnT. All rights reserved.
+//
+
+import Foundation
+
+/// 트레이너 회원 조회 DTO
+public struct GetMembersListDTO: Decodable {
+    /// 이름
+    public let name: String
+    /// 이메일
+    public let email: String
+    /// 프로필 사진
+    public let profileImageUrl: String
+    /// 생년월일
+    public let birthday: String?
+    /// 유저 타입 (트레이너/트레이니)
+    public let memberType: String
+    /// 소셜 로그인 타입
+    public let socialType: String
+    /// 관리중인 회원의 수
+    public let managementMember: Int
+    /// 함께했던 회원의 수
+    public let fellowMember: Int
+    /// 트레이너 ID
+    public let trainerId: String
+    /// 트레이니 키
+    public let height: Double?
+    /// 트레이니 무게
+    public let weight: Double?
+    /// 주의사항
+    public let cautionNote: String?
+    /// PT 목표
+    public let goalContents: [String]
+}
+
+public extension GetMembersListDTO {
+    public static func toEntity(resEntity: GetMembersListDTO) -> GetMembersListEntity {
+        return GetMembersListEntity(
+            name: resEntity.name,
+            email: resEntity.email,
+            profileImageUrl: resEntity.profileImageUrl,
+            birthday: resEntity.birthday ?? "",
+            memberType: resEntity.memberType,
+            socialType: resEntity.socialType,
+            managementMember: resEntity.managementMember,
+            fellowMember: resEntity.fellowMember,
+            trainerId: resEntity.trainerId,
+            height: resEntity.height ?? 0.0,
+            weight: resEntity.weight ?? 0.0,
+            cautionNote: resEntity.cautionNote ?? "",
+            goalContents: resEntity.goalContents
+        )
+    }
+}
diff --git a/TnT/Projects/Domain/Sources/Entity/GetMembersListEntity.swift b/TnT/Projects/Domain/Sources/Entity/GetMembersListEntity.swift
@@ -0,0 +1,92 @@
+//
+//  GetMembersListEntity.swift
+//  Domain
+//
+//  Created by 박서연 on 2/8/25.
+//  Copyright © 2025 yapp25thTeamTnT. All rights reserved.
+//
+
+import Foundation
+
+/// 트레이너 회원 조회 DTO
+public struct GetMembersListEntity: Encodable, Equatable {
+    /// ID 값 활용을 위한 추가
+    public let id: String
+    /// 이름
+    public let name: String
+    /// 이메일
+    public let email: String
+    /// 프로필 사진
+    public let profileImageUrl: String
+    /// 생년월일
+    public let birthday: String?
+    /// 유저 타입 (트레이너/트레이니)
+    public let memberType: String
+    /// 소셜 로그인 타입
+    public let socialType: String
+    /// 관리중인 회원의 수
+    public let managementMember: Int
+    /// 함께했던 회원의 수
+    public let fellowMember: Int
+    /// 트레이너 ID
+    public let trainerId: String
+    /// 트레이니 키
+    public let height: Double?
+    /// 트레이니 무게
+    public let weight: Double?
+    /// 주의사항
+    public let cautionNote: String?
+    /// PT 목표
+    public let goalContents: [String]
+
+    public init(
+        id: String = UUID().uuidString,
+        name: String,
+        email: String,
+        profileImageUrl: String,
+        birthday: String?,
+        memberType: String,
+        socialType: String,
+        managementMember: Int,
+        fellowMember: Int,
+        trainerId: String,
+        height: Double?,
+        weight: Double?,
+        cautionNote: String?,
+        goalContents: [String]
+    ) {
+        self.id = id
+        self.name = name
+        self.email = email
+        self.profileImageUrl = profileImageUrl
+        self.birthday = birthday
+        self.memberType = memberType
+        self.socialType = socialType
+        self.managementMember = managementMember
+        self.fellowMember = fellowMember
+        self.trainerId = trainerId
+        self.height = height
+        self.weight = weight
+        self.cautionNote = cautionNote
+        self.goalContents = goalContents
+    }
+}
+
+extension GetMembersListEntity {
+    static func toDTO(entity: GetMembersListEntity) -> GetMembersListDTO {
+        return GetMembersListDTO(
+            name: entity.name,
+            email: entity.email,
+            profileImageUrl: entity.profileImageUrl,
+            birthday: entity.birthday ?? "",
+            memberType: entity.memberType,
+            socialType: entity.socialType,
+            managementMember: entity.managementMember,
+            fellowMember: entity.fellowMember,
+            trainerId: entity.trainerId,
+            height: entity.height ?? 0.0,
+            weight: entity.weight ?? 0.0,
+            cautionNote: entity.cautionNote ?? "",
+            goalContents: entity.goalContents)
+    }
+}
diff --git a/...ects/Domain/Sources/Extension/Date+.swift → ...main/Sources/Policy/Extension/Date+.swift b/...ects/Domain/Sources/Extension/Date+.swift → ...main/Sources/Policy/Extension/Date+.swift
diff --git a/...ts/Domain/Sources/Extension/String+.swift → ...in/Sources/Policy/Extension/String+.swift b/...ts/Domain/Sources/Extension/String+.swift → ...in/Sources/Policy/Extension/String+.swift
diff --git a/TnT/Projects/Domain/Sources/Repository/TrainerRepository.swift b/TnT/Projects/Domain/Sources/Repository/TrainerRepository.swift
@@ -25,4 +25,7 @@ public protocol TrainerRepository {
 
     /// 트레이너 캘린더에 특정 날짜의 수업 정보 가져오기
     func getDateSessionList(date: String) async throws -> GetDateSessionListDTO
+
+    /// 회원 조희
+    func getMembersList() async throws -> GetMembersListDTO
 }
diff --git a/TnT/Projects/Domain/Sources/UseCase/TrainerUseCase.swift b/TnT/Projects/Domain/Sources/UseCase/TrainerUseCase.swift
@@ -0,0 +1,39 @@
+//
+//  TrainerUseCase.swift
+//  Domain
+//
+//  Created by 박서연 on 2/8/25.
+//  Copyright © 2025 yapp25thTeamTnT. All rights reserved.
+//
+
+import Foundation
+
+// MARK: - TrainerUseCase Default 구현체
+public struct DefaultTrainerUseCase: TrainerRepository {
+
+    private let trainerRepository: TrainerRepository
+
+    public init (trainerRepository: TrainerRepository) {
+        self.trainerRepository = trainerRepository
+    }
+
+    public func getVerifyInvitationCode(code: String) async throws -> GetVerifyInvitationCodeResDTO {
+        return try await trainerRepository.getVerifyInvitationCode(code: code)
+    }
+
+    public func getTheFirstInvitationCode() async throws -> GetTheFirstInvitationCodeDTO {
+        return try await trainerRepository.getTheFirstInvitationCode()
+    }
+
+    public func getReissuanceInvitationCode() async throws -> GetReissuanceInvitationCodeDTO {
+        return try await trainerRepository.getReissuanceInvitationCode()
+    }
+
+    public func getDateSessionList(date: String) async throws -> GetDateSessionListDTO {
+        return try await trainerRepository.getDateSessionList(date: date)
+    }
+
+    public func getMembersList() async throws -> GetMembersListDTO {
+        return try await trainerRepository.getMembersList()
+    }
+}