🐛 :: [#198] 충돌 해결

Service/Sources/DI/DataSourceAssembly.swift

@@ -38,5 +38,9 @@ public final class DataSourceAssembly: Assembly {
         container.register(UserRemoteProtocol.self) { r in
             UserRemote(keychainLocal: r.resolve(KeychainLocalProtocol.self)!)
         }
+
+        container.register(ClubAttendRemoteProtocol.self) { r in
+            ClubAttendRemote(keychainLocal: r.resolve(KeychainLocalProtocol.self)!)
+        }
     }
 }

Service/Sources/DI/RepositoryAssembly.swift

@@ -27,5 +27,8 @@ public final class RepositoryAssembly: Assembly {
         container.register(ClubMemberRepository.self) { r in
             DefaultClubMemberRepository(clubMemberRemote: r.resolve(ClubMemberRemoteProtocol.self)!)
         }
+        container.register(ClubAttendRepository.self) { r in
+            DefaultClubAttendRepository(clubAttendRemote: r.resolve(ClubAttendRemoteProtocol.self)!)
+        }
     }
 }

Service/Sources/DI/UseCaseAssembly.swift

@@ -86,6 +86,26 @@ public final class UseCaseAssembly: Assembly {
                 clubMemberRepository: r.resolve(ClubMemberRepository.self)!
             )
         }
+        container.register(FetchClubAttendListUseCase.self) { r in
+            FetchClubAttendListUseCase(
+                clubAttendRepository: r.resolve(ClubAttendRepository.self)!
+            )
+        }
+        container.register(CreateAttendanceUseCase.self) { r in
+            CreateAttendanceUseCase(
+                clubAttendRepository: r.resolve(ClubAttendRepository.self)!
+            )
+        }
+        container.register(ChangeAllAttendStatusUseCase.self) { r in
+            ChangeAllAttendStatusUseCase(
+                clubAttendRepository: r.resolve(ClubAttendRepository.self)!
+            )
+        }
+        container.register(StatusAllApplyUseCase.self) { r in
+            StatusAllApplyUseCase(
+                clubAttendRepository: r.resolve(ClubAttendRepository.self)!
+            )
+        }
 
         // MARK: - User
         container.register(FetchProfileUseCase.self) { r in

Service/Sources/Data/DataSource/Remote/API/ClubAttendAPI.swift

@@ -0,0 +1,97 @@
+import Moya
+import Foundation
+
+enum ClubAttendAPI {
+    case fetchAttendList(clubID: Int, date: String?, period: Period?)
+    case createAttendance(clubID: Int, name: String, date: String, period: [Period])
+    case changeAllAttendStatus(attendanceID: String, attendanceStatus: AttendanceStatus)
+    case statusAllApply(attendanceIDs: [String], attendanceStatus: AttendanceStatus)
+}
+
+extension ClubAttendAPI: GCMSAPI {
+    var domain: GCMSDomain {
+        return .attend
+    }
+
+    var urlPath: String {
+        switch self {
+        case let .fetchAttendList(clubID, _, _):
+            return "/\(clubID)"
+
+        case let .createAttendance(clubID, _, _, _):
+            return "/\(clubID)/club"
+
+        case .changeAllAttendStatus(_, _):
+            return ""
+
+        case .statusAllApply(_, _):
+            return "/batch"
+        }
+    }
+
+    var method: Moya.Method {
+        switch self {
+        case .fetchAttendList:
+            return .get
+
+        case .changeAllAttendStatus, .statusAllApply:
+            return .patch
+
+        case .createAttendance:
+            return .post
+        }
+    }
+
+    var task: Task {
+        switch self {
+        case let .fetchAttendList(_, date, period):
+            return .requestParameters(parameters: [
+                "date": date,
+                "period": period
+            ], encoding: URLEncoding.queryString)
+
+        case let .createAttendance(_, name, date, period):
+            return .requestPlain
+
+        case .changeAllAttendStatus(_, _):
+            return .requestPlain
+
+        case .statusAllApply(_, _):
+            return .requestPlain
+        }
+    }
+
+    var jwtTokenType: JWTTokenType? {
+        switch self {
+        default:
+            return .accessToken
+        }
+    }
+
+    typealias ErrorType = ClubAttendError
+    var errorMapper: [Int: ClubAttendError]? {
+        switch self {
+        case .fetchAttendList:
+            return [
+                401: .unauthorized,
+                403: .notClubMember,
+                404: .notFoundClub,
+                500: .serverError
+            ]
+
+        case .statusAllApply:
+            return [
+                401: .unauthorized,
+                403: .notClubHeadOrClubTeacher,
+                404: .notFoundClub,
+                500: .serverError
+            ]
+
+        case .createAttendance:
+            return [:]
+
+        case .changeAllAttendStatus:
+            return [:]
+        }
+    }
+}

Service/Sources/Data/DataSource/Remote/API/GCMSAPI.swift

@@ -42,6 +42,7 @@ enum GCMSDomain: String {
     case club
     case clubMember = "club-member"
     case applicant
+    case attend
 }
 
 extension GCMSDomain {

Service/Sources/Data/DataSource/Remote/DataMapping/Club/Attend/FetchClubAttendListResponse.swift

@@ -0,0 +1,47 @@
+import Foundation
+
+public struct FetchClubAttendListResponse: Decodable {
+    let date: String?
+    let period: String?
+    let users: [UsersResponse]
+
+    public struct UsersResponse: Decodable {
+        public let uuid: UUID
+        public let attendanceID: String
+        public let name: String
+        public let grade: Int
+        public let classNum: Int
+        public let number: Int
+        public let attendanceStatus: AttendanceStatus
+
+        enum CodingKeys: String, CodingKey, Decodable {
+            case uuid
+            case attendanceID = "attendanceId"
+            case name
+            case grade
+            case classNum
+            case number
+            case attendanceStatus
+        }
+    }
+}
+
+extension FetchClubAttendListResponse.UsersResponse {
+    func toDomain() -> ClubAttend {
+        ClubAttend(
+            uuid: uuid,
+            attendanceID: attendanceID,
+            name: name,
+            grade: grade,
+            classNum: classNum,
+            number: number,
+            attendanceStatus: attendanceStatus
+        )
+    }
+}
+
+extension FetchClubAttendListResponse {
+    func toDomain() -> [ClubAttend] {
+        self.users.map { $0.toDomain() }
+    }
+}

Service/Sources/Data/DataSource/Remote/DataSource/ClubAttendRemote.swift

@@ -0,0 +1,32 @@
+import RxSwift
+import Foundation
+
+protocol ClubAttendRemoteProtocol {
+    func fetchAttendList(clubID: Int, date: String?, period: Period?) -> Single<[ClubAttend]>
+    func createAttendance(clubID: Int, name: String, date: String, period: [Period]) -> Completable
+    func changeAllAttendStatus(attendanceID: String, attendanceStatus: AttendanceStatus) -> Completable
+    func statusAllApply(attendanceIDs: [String], attendanceStatus: AttendanceStatus) -> Completable
+}
+
+final class ClubAttendRemote: BaseRemote<ClubAttendAPI>, ClubAttendRemoteProtocol {
+    func fetchAttendList(clubID: Int, date: String?, period: Period?) -> Single<[ClubAttend]> {
+        self.request(.fetchAttendList(clubID: clubID, date: date, period: period))
+            .map(FetchClubAttendListResponse.self)
+            .map { $0.toDomain() }
+    }
+
+    func createAttendance(clubID: Int, name: String, date: String, period: [Period]) -> Completable {
+        self.request(.createAttendance(clubID: clubID, name: name, date: date, period: period))
+            .asCompletable()
+    }
+
+    func changeAllAttendStatus(attendanceID: String, attendanceStatus: AttendanceStatus) -> Completable {
+        self.request(.changeAllAttendStatus(attendanceID: attendanceID, attendanceStatus: attendanceStatus))
+            .asCompletable()
+    }
+
+    func statusAllApply(attendanceIDs: [String], attendanceStatus: AttendanceStatus) -> Completable {
+        self.request(.statusAllApply(attendanceIDs: attendanceIDs, attendanceStatus: attendanceStatus))
+            .asCompletable()
+    }
+}

Service/Sources/Data/Repositories/DefaultClubAttendRepository.swift

@@ -0,0 +1,26 @@
+import Foundation
+import RxSwift
+
+final class DefaultClubAttendRepository: ClubAttendRepository {
+    private let clubAttendRemote: any ClubAttendRemoteProtocol
+
+    init(clubAttendRemote: any ClubAttendRemoteProtocol) {
+        self.clubAttendRemote = clubAttendRemote
+    }
+
+    func fetchAttendList(clubID: Int, date: String?, period: Period?) -> Single<[ClubAttend]> {
+        clubAttendRemote.fetchAttendList(clubID: clubID, date: date, period: period)
+    }
+
+    func createAttendance(clubID: Int, name: String, date: String, period: [Period]) -> Completable {
+        clubAttendRemote.createAttendance(clubID: clubID, name: name, date: date, period: period)
+    }
+
+    func changeAllAttendStatus(attendanceID: String, attendanceStatus: AttendanceStatus) -> Completable {
+        clubAttendRemote.changeAllAttendStatus(attendanceID: attendanceID, attendanceStatus: attendanceStatus)
+    }
+
+    func statusAllApply(attendanceIDs: [String], attendanceStatus: AttendanceStatus) -> Completable {
+        clubAttendRemote.statusAllApply(attendanceIDs: attendanceIDs, attendanceStatus: attendanceStatus)
+    }
+}

Service/Sources/Domain/Entities/ClubAttend.swift

@@ -0,0 +1,29 @@
+import Foundation
+
+public struct ClubAttend: Equatable {
+    public let uuid: UUID
+    public let attendanceID: String
+    public let name: String
+    public let grade: Int
+    public let classNum: Int
+    public let number: Int
+    public let attendanceStatus: AttendanceStatus
+
+    public init(
+        uuid: UUID,
+        attendanceID: String,
+        name: String,
+        grade: Int,
+        classNum: Int,
+        number: Int,
+        attendanceStatus: AttendanceStatus
+    ) {
+        self.uuid = uuid
+        self.attendanceID = attendanceID
+        self.name = name
+        self.grade = grade
+        self.classNum = classNum
+        self.number = number
+        self.attendanceStatus = attendanceStatus
+    }
+}

Service/Sources/Domain/Entities/MiniProfile.swift

@@ -4,7 +4,10 @@ public struct MiniProfile: Equatable {
     public let name: String
     public let profileImg: String
 
-    public init(name: String, profileImg: String) {
+    public init(
+        name: String,
+        profileImg: String
+    ) {
         self.name = name
         self.profileImg = profileImg
     }

Service/Sources/Domain/Entities/User.swift

@@ -1,7 +1,15 @@
 import Foundation
 
 public struct User: Equatable {
-    public init(uuid: UUID, email: String, name: String, grade: Int, classNum: Int, number: Int, profileImg: String?) {
+    public init(
+        uuid: UUID,
+        email: String,
+        name: String,
+        grade: Int,
+        classNum: Int,
+        number: Int,
+        profileImg: String?
+    ) {
         self.uuid = uuid
         self.email = email
         self.name = name

Service/Sources/Domain/Entities/UserProfile.swift

@@ -1,7 +1,16 @@
 import Foundation
 
 public struct UserProfile: Equatable {
-    public init(uuid: UUID, email: String, name: String, grade: Int, classNum: Int, number: Int, profileImg: String?, clubs: [ClubList]) {
+    public init(
+        uuid: UUID,
+        email: String,
+        name: String,
+        grade: Int,
+        classNum: Int,
+        number: Int,
+        profileImg: String?,
+        clubs: [ClubList]
+    ) {
         self.uuid = uuid
         self.email = email
         self.name = name

Service/Sources/Domain/Enums/AttendanceStatus.swift

@@ -0,0 +1,6 @@
+public enum AttendanceStatus: String, Codable {
+    case attendance = "ATTENDANCE"
+    case late = "LATE"
+    case reasonableAbsent = "REASONABLE_ABSENT"
+    case absent = "ABSENT"
+}

Service/Sources/Domain/Enums/Period.swift

@@ -0,0 +1,13 @@
+public enum Period: String, Codable, CaseIterable {
+    case first = "FIRST"
+    case second = "SECOND"
+    case third = "THIRD"
+    case fourth = "FOURTH"
+    case fifth = "FIFTH"
+    case sixth = "SIXTH"
+    case seventh = "SEVENTH"
+    case eighth = "EIGHTH"
+    case ninth = "NINTH"
+    case tenth = "TENTH"
+    case eleventh = "ELEVENTH"
+}

Service/Sources/Domain/Error/ClubApplicantError.swift

@@ -28,14 +28,15 @@ extension ClubApplicantError: LocalizedError {
         switch self {
         case let .error(message, _):
             return message
+
         case .notClubMember:
             return "동아리 구성원이 아니면 사용할 수 없습니다."
 
         case .bodyIsNull:
             return "요청이 잘못되었습니다"
 
         case .unauthorized, .serverError:
-            return "알수없는 에러가 발생했습니다. 잠시 후 다시 시도해 주세요."
+            return "알 수 없는 에러가 발생했습니다. 잠시 후 다시 시도해 주세요."
 
         case .alreadyClubMemberOrSameTypeClub:
             return "이미 같은 동아리 소속이거나 같은 타입의 동아리를 이미 신청했습니다."