From 302bb0dd628aa638563d13ab39d7836b757b1256 Mon Sep 17 00:00:00 2001 From: JinUng41 Date: Mon, 9 Sep 2024 14:08:59 +0900 Subject: [PATCH] =?UTF-8?q?refactor/#373=20=EB=AA=A8=EC=9E=84=20=EC=A0=84?= =?UTF-8?q?=EC=B2=B4=20=EC=95=BD=EC=86=8D=EA=B3=BC=20=EB=82=B4=EA=B0=80=20?= =?UTF-8?q?=EC=B0=B8=EC=97=AC=ED=95=9C=20=EC=95=BD=EC=86=8D=20=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C=20=EB=A9=94=EC=84=9C=EB=93=9C=20=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Network/Service/MeetingService.swift | 160 ++---------------- .../Service/MeetingInfoService.swift | 5 +- 2 files changed, 15 insertions(+), 150 deletions(-) diff --git a/KkuMulKum/Network/Service/MeetingService.swift b/KkuMulKum/Network/Service/MeetingService.swift index 20ff4804..1d71db71 100644 --- a/KkuMulKum/Network/Service/MeetingService.swift +++ b/KkuMulKum/Network/Service/MeetingService.swift @@ -54,20 +54,20 @@ extension MeetingService: MeetingInfoServiceProtocol { return try await request(with: .fetchMeetingMember(meetingID: meetingID)) } - func fetchMeetingPromiseList( + func fetchMeetingPromiseList(with meetingID: Int) -> Single> { + return provider.rx.request(.fetchMeetingPromiseList(meetingID: meetingID)) + .map(ResponseBodyDTO.self) + .catch { error in + print(">>> 에러 발생: \(error.localizedDescription) : \(#function) : \(Self.self)") + return .error(error) + } + } + + func fetchParticipatedPromiseList( with meetingID: Int, - isParticipant: Bool? + isParticipant: Bool ) -> Single> { - if let isParticipant { - return provider.rx.request(.fetchParticipatedPromiseList(meetingID: meetingID, isParticipant: isParticipant)) - .map(ResponseBodyDTO.self) - .catch { error in - print(">>> 에러 발생: \(error.localizedDescription) : \(#function) : \(Self.self)") - return .error(error) - } - } - - return provider.rx.request(.fetchMeetingPromiseList(meetingID: meetingID)) + return provider.rx.request(.fetchParticipatedPromiseList(meetingID: meetingID, isParticipant: isParticipant)) .map(ResponseBodyDTO.self) .catch { error in print(">>> 에러 발생: \(error.localizedDescription) : \(#function) : \(Self.self)") @@ -101,139 +101,3 @@ extension MeetingService: InviteCodeServiceProtocol { return try await self.request(with: .joinMeeting(request: request)) } } - -final class MockMeetingInfoService: MeetingInfoServiceProtocol { - func fetchMeetingInfo(with meetingID: Int) -> ResponseBodyDTO? { - let mockData = MeetingInfoModel( - meetingID: 1, - name: "웅웅난진웅", - createdAt: "2024.06.08", - metCount: 3, - invitationCode: "WD56CQ" - ) - - return ResponseBodyDTO(success: true, data: mockData, error: nil) - } - - func fetchMeetingMemberList(with meetingID: Int) -> ResponseBodyDTO? { - let mockData = MeetingMembersModel( - memberCount: 14, - members: [ - Member( - memberID: 1, - name: "김진웅", - profileImageURL: "https://reqres.in/img/faces/\(Int.random(in: 1...10))-image.jpg" - ), - Member( - memberID: 2, - name: "김수연", - profileImageURL: "https://reqres.in/img/faces/\(Int.random(in: 1...10))-image.jpg" - ), - Member( - memberID: 3, - name: "이지훈", - profileImageURL: "https://reqres.in/img/faces/\(Int.random(in: 1...10))-image.jpg" - ), - Member( - memberID: 4, - name: "이유진", - profileImageURL: "https://reqres.in/img/faces/\(Int.random(in: 1...10))-image.jpg" - ), - Member( - memberID: 5, - name: "이승현", - profileImageURL: "https://reqres.in/img/faces/\(Int.random(in: 1...10))-image.jpg" - ), - Member( - memberID: 6, - name: "허준혁", - profileImageURL: "https://reqres.in/img/faces/\(Int.random(in: 1...10))-image.jpg" - ), - Member( - memberID: 7, - name: "배차은우", - profileImageURL: "https://reqres.in/img/faces/\(Int.random(in: 1...10))-image.jpg" - ), - Member( - memberID: 8, - name: "김윤서", - profileImageURL: "https://reqres.in/img/faces/\(Int.random(in: 1...10))-image.jpg" - ), - Member( - memberID: 9, - name: "정혜진", - profileImageURL: "https://reqres.in/img/faces/\(Int.random(in: 1...10))-image.jpg" - ), - Member( - memberID: 10, - name: "주효은", - profileImageURL: "https://reqres.in/img/faces/\(Int.random(in: 1...10))-image.jpg" - ), - Member( - memberID: 11, - name: "박상준", - profileImageURL: "https://reqres.in/img/faces/\(Int.random(in: 1...10))-image.jpg" - ), - Member( - memberID: 12, - name: "김채원", - profileImageURL: "https://reqres.in/img/faces/\(Int.random(in: 1...10))-image.jpg" - ), - Member( - memberID: 13, - name: "류희재", - profileImageURL: "https://reqres.in/img/faces/\(Int.random(in: 1...10))-image.jpg" - ), - Member( - memberID: 14, - name: "김민지", - profileImageURL: "https://reqres.in/img/faces/\(Int.random(in: 1...10))-image.jpg" - ) - ] - ) - - return ResponseBodyDTO(success: true, data: mockData, error: nil) - } - - func fetchMeetingPromiseList( - with meetingID: Int, - isParticipant: Bool? - ) -> Single> { - let mockData = MeetingPromisesModel( - promises: [ - MeetingPromise(promiseID: 1,name: "꾸물 리프레시 데이",dDay: 0,time: "PM 2:00",placeName: "DMC역"), - MeetingPromise(promiseID: 2,name: "꾸물 잼얘 나이트",dDay: 10,time: "PM 6:00",placeName: "홍대입구"), - MeetingPromise(promiseID: 3,name: "친구 생일 파티",dDay: 5,time: "PM 7:00",placeName: "강남역"), - MeetingPromise(promiseID: 4,name: "주말 산책",dDay: 3,time: "AM 10:00",placeName: "서울숲"), - MeetingPromise(promiseID: 5,name: "프로젝트 미팅",dDay: 1,time: "AM 9:00",placeName: "삼성역"), - MeetingPromise(promiseID: 6,name: "독서 모임",dDay: 7,time: "PM 3:00",placeName: "합정역"), - MeetingPromise(promiseID: 7,name: "헬스클럽 모임",dDay: 2,time: "AM 8:00",placeName: "신촌역"), - MeetingPromise(promiseID: 8,name: "영화 관람",dDay: 4,time: "PM 8:00",placeName: "잠실역"), - MeetingPromise(promiseID: 9,name: "저녁 식사",dDay: 6,time: "PM 7:30",placeName: "이태원역"), - MeetingPromise(promiseID: 10,name: "아침 조깅",dDay: 14,time: "AM 6:00",placeName: "한강공원"), - MeetingPromise(promiseID: 11,name: "커피 브레이크",dDay: 8,time: "PM 4:00",placeName: "을지로입구"), - MeetingPromise(promiseID: 12,name: "스터디 그룹",dDay: 12,time: "PM 5:00",placeName: "강남역"), - MeetingPromise(promiseID: 13,name: "뮤직 페스티벌",dDay: 9,time: "PM 2:00",placeName: "난지공원"), - MeetingPromise(promiseID: 14, name: "낚시 여행", dDay: 11, time: "AM 5:00", placeName: "속초항"), - MeetingPromise(promiseID: 15, name: "가족 모임", dDay: 13, time: "PM 1:00", placeName: "광화문역") - ] - ) - - return .just(ResponseBodyDTO(success: true, data: mockData, error: nil)) - } - - func exitMeeting(with meetingID: Int) -> Single> { - let falseResponse = ResponseBodyDTO(success: false, data: nil, error: nil) - return .just(falseResponse) - } -} - -final class MockInviteCodeService: InviteCodeServiceProtocol { - func joinMeeting(with request: RegisterMeetingsModel) -> ResponseBodyDTO? { - let mockData = RegisterMeetingsResponseModel( - meetingID: 1 - ) - - return ResponseBodyDTO.init(success: true, data: mockData, error: nil) - } -} diff --git a/KkuMulKum/Source/MeetingInfo/Service/MeetingInfoService.swift b/KkuMulKum/Source/MeetingInfo/Service/MeetingInfoService.swift index 2489ea98..f7ba6910 100644 --- a/KkuMulKum/Source/MeetingInfo/Service/MeetingInfoService.swift +++ b/KkuMulKum/Source/MeetingInfo/Service/MeetingInfoService.swift @@ -12,9 +12,10 @@ import RxSwift protocol MeetingInfoServiceProtocol { func fetchMeetingInfo(with meetingID: Int) async throws -> ResponseBodyDTO? func fetchMeetingMemberList(with meetingID: Int) async throws -> ResponseBodyDTO? - func fetchMeetingPromiseList( + func fetchMeetingPromiseList(with meetingID: Int) -> Single> + func fetchParticipatedPromiseList( with meetingID: Int, - isParticipant: Bool? + isParticipant: Bool ) -> Single> func exitMeeting(with meetingID: Int) -> Single> }