merge :: (#239) 자습실 자리 종류 보기 API에 QueryString 추가

team-aliens · Apr 2, 2023 · f9d8dbf · f9d8dbf
2 parents 4ee66a5 + d32a5aa
commit f9d8dbf
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 12 deletions.
diff --git a/Projects/Features/MyPageFeature/Sources/MyPage/MyPageView.swift b/Projects/Features/MyPageFeature/Sources/MyPage/MyPageView.swift
@@ -141,7 +141,8 @@ struct MyPageView: View {
                     } label: {
                         myPageOptionRowCardView(title: "비밀번호 변경")
                             .dmsFont(.body(.body2), color: .GrayScale.gray6)
-                            .cornerRadius(10, corners: [ appState.features.pointService ? [.bottomLeft, .bottomRight] : .allCorners ])
+                            .cornerRadius(10, corners: appState.features.pointService
+                                          ? [.bottomLeft, .bottomRight] : .allCorners)
                     }
 
                 }

diff --git a/Projects/Features/StudyRoomFeature/Sources/StudyRoomDetail/StudyRoomDetailViewModel.swift b/Projects/Features/StudyRoomFeature/Sources/StudyRoomDetail/StudyRoomDetailViewModel.swift
@@ -49,7 +49,7 @@ final class StudyRoomDetailViewModel: BaseViewModel {
 
     func fetchSeatType() {
         addCancellable(
-            fetchSeatTypesUseCase.execute()
+            fetchSeatTypesUseCase.execute(studyroomID: studyRoomEntity.id)
         ) { [weak self] seatTypes in
             self?.seatTypes = seatTypes
         }

diff --git a/Projects/Services/APIKit/Sources/StudyRoomsAPI.swift b/Projects/Services/APIKit/Sources/StudyRoomsAPI.swift
@@ -5,7 +5,7 @@ import Moya
 
 public enum StudyRoomsAPI {
     case fetchStudyAvailableTime
-    case fetchSeatTypes
+    case fetchSeatTypes(studyroomID: String)
     case fetchStudyRoomList(timeSlot: String?)
     case fetchDetailStudyRoom(roomID: String, timeSlot: String)
     case fetchMyStudyRoomApplicationItems
@@ -64,6 +64,14 @@ extension StudyRoomsAPI: DmsAPI {
 
     public var task: Moya.Task {
         switch self {
+        case let .fetchSeatTypes(studyroomID):
+            return .requestParameters(
+                parameters: [
+                    "study_room_id": studyroomID
+                ],
+                encoding: URLEncoding.queryString
+            )
+
         case let .fetchStudyRoomList(timeSlot):
             return .requestParameters(
                 parameters: [

diff --git a/...s/Services/DataModule/Sources/StudyRooms/Repositories/Impl/StudyRoomsRepositoryImpl.swift b/...s/Services/DataModule/Sources/StudyRooms/Repositories/Impl/StudyRoomsRepositoryImpl.swift
@@ -15,8 +15,8 @@ public struct StudyRoomsRepositoryImpl: StudyRoomsRepository {
         remoteStudyRoomsDataSource.fetchStudyAvailableTime()
     }
 
-    public func fetchSeatTypes() -> AnyPublisher<[SeatTypeEntity], DmsError> {
-        remoteStudyRoomsDataSource.fetchSeatTypes()
+    public func fetchSeatTypes(studyroomID: String) -> AnyPublisher<[SeatTypeEntity], DmsError> {
+        remoteStudyRoomsDataSource.fetchSeatTypes(studyroomID: studyroomID)
     }
 
     public func fetchStudyRoomList(timeSlot: String?) -> AnyPublisher<[StudyRoomEntity], DmsError> {

diff --git a/...ects/Services/DataModule/Sources/StudyRooms/UseCases/Impl/FetchSeatTypesUseCaseImpl.swift b/...ects/Services/DataModule/Sources/StudyRooms/UseCases/Impl/FetchSeatTypesUseCaseImpl.swift
@@ -10,7 +10,7 @@ public struct FetchSeatTypesUseCaseImpl: FetchSeatTypesUseCase {
         self.studyRoomsRepository = studyRoomsRepository
     }
 
-    public func execute() -> AnyPublisher<[SeatTypeEntity], DmsError> {
-        studyRoomsRepository.fetchSeatTypes()
+    public func execute(studyroomID: String) -> AnyPublisher<[SeatTypeEntity], DmsError> {
+        studyRoomsRepository.fetchSeatTypes(studyroomID: studyroomID)
     }
 }
diff --git a/Projects/Services/DomainModule/Sources/StudyRooms/Repository/StudyRoomsRepository.swift b/Projects/Services/DomainModule/Sources/StudyRooms/Repository/StudyRoomsRepository.swift
@@ -4,7 +4,7 @@ import ErrorModule
 
 public protocol StudyRoomsRepository {
     func fetchStudyAvailableTime() -> AnyPublisher<StudyAvailableTimeEntity, DmsError>
-    func fetchSeatTypes() -> AnyPublisher<[SeatTypeEntity], DmsError>
+    func fetchSeatTypes(studyroomID: String) -> AnyPublisher<[SeatTypeEntity], DmsError>
     func fetchStudyRoomList(timeSlot: String?) -> AnyPublisher<[StudyRoomEntity], DmsError>
     func fetchDetailStudyRoom(roomID: String, timeSlot: String) -> AnyPublisher<DetailStudyRoomEntity, DmsError>
     func applyStudyRoomSeat(seatID: String, timeSlot: String) -> AnyPublisher<Void, DmsError>

diff --git a/Projects/Services/DomainModule/Sources/StudyRooms/UseCases/FetchSeatTypesUseCase.swift b/Projects/Services/DomainModule/Sources/StudyRooms/UseCases/FetchSeatTypesUseCase.swift
@@ -3,5 +3,5 @@ import DataMappingModule
 import ErrorModule
 
 public protocol FetchSeatTypesUseCase {
-    func execute() -> AnyPublisher<[SeatTypeEntity], DmsError>
+    func execute(studyroomID: String) -> AnyPublisher<[SeatTypeEntity], DmsError>
 }
diff --git a/...ervices/NetworkModule/Sources/StudyRooms/Remote/Impl/RemoteStudyRoomsDataSourceImpl.swift b/...ervices/NetworkModule/Sources/StudyRooms/Remote/Impl/RemoteStudyRoomsDataSourceImpl.swift
@@ -23,8 +23,8 @@ public final class RemoteStudyRoomsDataSourceImpl: BaseRemoteDataSource<StudyRoo
             .eraseToAnyPublisher()
     }
 
-    public func fetchSeatTypes() -> AnyPublisher<[SeatTypeEntity], DmsError> {
-        request(.fetchSeatTypes, dto: FetchSeatTypesResponseDTO.self)
+    public func fetchSeatTypes(studyroomID: String) -> AnyPublisher<[SeatTypeEntity], DmsError> {
+        request(.fetchSeatTypes(studyroomID: studyroomID), dto: FetchSeatTypesResponseDTO.self)
             .map { $0.toDomain() }
             .eraseToAnyPublisher()
     }

diff --git a/Projects/Services/NetworkModule/Sources/StudyRooms/Remote/RemoteStudyRoomsDataSource.swift b/Projects/Services/NetworkModule/Sources/StudyRooms/Remote/RemoteStudyRoomsDataSource.swift
@@ -7,7 +7,7 @@ import Foundation
 
 public protocol RemoteStudyRoomsDataSource {
     func fetchStudyAvailableTime() -> AnyPublisher<StudyAvailableTimeEntity, DmsError>
-    func fetchSeatTypes() -> AnyPublisher<[SeatTypeEntity], DmsError>
+    func fetchSeatTypes(studyroomID: String) -> AnyPublisher<[SeatTypeEntity], DmsError>
     func fetchStudyRoomList(timeSlot: String?) -> AnyPublisher<[StudyRoomEntity], DmsError>
     func fetchDetailStudyRoom(roomID: String, timeSlot: String) -> AnyPublisher<DetailStudyRoomEntity, DmsError>
     func applyStudyRoomSeat(seatID: String, timeSlot: String) -> AnyPublisher<Void, DmsError>