From 35efe8ede0f1fc3c0783e61cb726001d3d4a8e7e Mon Sep 17 00:00:00 2001 From: mmaybei Date: Wed, 17 Jul 2024 04:15:33 +0900 Subject: [PATCH] =?UTF-8?q?fix/#185=20=EC=84=9C=EB=B9=84=EC=8A=A4=ED=83=80?= =?UTF-8?q?=EC=9E=85=20ResponseBodyDTO=EB=A1=9C=20=EB=B0=94=EA=BF=A8?= =?UTF-8?q?=EC=96=B4=EC=9A=94=20...?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- KkuMulKum/Resource/Service/HomeService.swift | 142 ++++++++++-------- .../Resource/Service/MeetingListService.swift | 28 ++-- 2 files changed, 93 insertions(+), 77 deletions(-) diff --git a/KkuMulKum/Resource/Service/HomeService.swift b/KkuMulKum/Resource/Service/HomeService.swift index ce2b9f45..2ccbb036 100644 --- a/KkuMulKum/Resource/Service/HomeService.swift +++ b/KkuMulKum/Resource/Service/HomeService.swift @@ -8,82 +8,94 @@ import Foundation protocol HomeServiceType { - func fetchLoginUser() -> LoginUserModel? - func fetchNearestPromise() -> NearestPromiseModel? - func fetchUpcomingPromise() -> UpcomingPromiseListModel? + func fetchLoginUser() -> ResponseBodyDTO + func fetchNearestPromise() -> ResponseBodyDTO + func fetchUpcomingPromise() -> ResponseBodyDTO } final class MockHomeService: HomeServiceType { - func fetchLoginUser() -> LoginUserModel? { - let mockData = LoginUserModel( - name: "꾸물리안", - level: 4, - promiseCount: 8, - tardyCount: 2, - tardySum: 72, - profileImageURL: "" + func fetchLoginUser() -> ResponseBodyDTO { + let mockData = ResponseBodyDTO( + success: true, + data: LoginUserModel( + name: "꾸물리안", + level: 4, + promiseCount: 8, + tardyCount: 2, + tardySum: 72, + profileImageURL: "" + ), + error: nil ) return mockData } - func fetchNearestPromise() -> NearestPromiseModel? { - let mockData = NearestPromiseModel( - id: 1, - dDay: 0, - name: "꾸물이들 대환장 파티", - meetingName: "꾸물이들", - dressUpLevel: "냐미", - date: "2024.07.16", - time: "PM 8:00", - placeName: "DMC역" + func fetchNearestPromise() -> ResponseBodyDTO { + let mockData = ResponseBodyDTO( + success: true, + data: NearestPromiseModel( + id: 1, + dDay: 0, + name: "꾸물이들 대환장 파티", + meetingName: "꾸물이들", + dressUpLevel: "냐미", + date: "2024.07.16", + time: "PM 8:00", + placeName: "DMC역" + ), + error: nil ) return mockData } - func fetchUpcomingPromise() -> UpcomingPromiseListModel? { - let mockData = UpcomingPromiseListModel( - promises: [ - UpcomingPromise( - id: 1, - dDay: 1, - name: "누가 코코볼 다 먹었어?", - meetingName: "우마우스", - dressUpLevel: "", - date: "2024.07.17", - time: "PM 2:00", - placeName: "가자하우스" - ), - UpcomingPromise( - id: 2, - dDay: 1, - name: "누가 코코볼 다 먹었어?", - meetingName: "우마우스", - dressUpLevel: "", - date: "2024.07.17", - time: "PM 2:00", - placeName: "가자하우스" - ), - UpcomingPromise( - id: 3, - dDay: 1, - name: "누가 코코볼 다 먹었어?", - meetingName: "우마우스", - dressUpLevel: "", - date: "2024.07.17", - time: "PM 2:00", - placeName: "가자하우스" - ), - UpcomingPromise( - id: 4, - dDay: 1, - name: "누가 코코볼 다 먹었어?", - meetingName: "우마우스", - dressUpLevel: "", - date: "2024.07.17", - time: "PM 2:00", - placeName: "가자하우스" - ) - ] + func fetchUpcomingPromise() -> ResponseBodyDTO { + let mockData = ResponseBodyDTO( + success: true, + data: UpcomingPromiseListModel( + promises: [ + UpcomingPromise( + id: 1, + dDay: 1, + name: "누가 코코볼 다 먹었어?", + meetingName: "우마우스", + dressUpLevel: "", + date: "2024.07.17", + time: "PM 2:00", + placeName: "가자하우스" + ), + UpcomingPromise( + id: 2, + dDay: 1, + name: "누가 코코볼 다 먹었어?", + meetingName: "우마우스", + dressUpLevel: "", + date: "2024.07.17", + time: "PM 2:00", + placeName: "가자하우스" + ), + UpcomingPromise( + id: 3, + dDay: 1, + name: "누가 코코볼 다 먹었어?", + meetingName: "우마우스", + dressUpLevel: "", + date: "2024.07.17", + time: "PM 2:00", + placeName: "가자하우스" + ), + UpcomingPromise( + id: 4, + dDay: 1, + name: "누가 코코볼 다 먹었어?", + meetingName: "우마우스", + dressUpLevel: "", + date: "2024.07.17", + time: "PM 2:00", + placeName: "가자하우스" + ) + ] + ), + error: nil ) return mockData } diff --git a/KkuMulKum/Resource/Service/MeetingListService.swift b/KkuMulKum/Resource/Service/MeetingListService.swift index 65326662..2b480080 100644 --- a/KkuMulKum/Resource/Service/MeetingListService.swift +++ b/KkuMulKum/Resource/Service/MeetingListService.swift @@ -8,21 +8,25 @@ import Foundation protocol MeetingListServiceType { - func fetchMeetingList() -> MeetingListModel? + func fetchMeetingList() -> ResponseBodyDTO } final class MockMeetingListService: MeetingListServiceType { - func fetchMeetingList() -> MeetingListModel? { - let mockData = MeetingListModel( - count: 6, - meetings: [ - Meeting(id: 1, name: "꾸물이들", memberCount: 14), - Meeting(id: 2, name: "아요레디", memberCount: 28), - Meeting(id: 3, name: "안드가자", memberCount: 26), - Meeting(id: 4, name: "난이서버", memberCount: 30), - Meeting(id: 5, name: "캔디팟", memberCount: 24), - Meeting(id: 6, name: "열기팟", memberCount: 24) - ] + func fetchMeetingList() -> ResponseBodyDTO { + let mockData = ResponseBodyDTO( + success: true, + data: MeetingListModel( + count: 6, + meetings: [ + Meeting(id: 1, name: "꾸물이들", memberCount: 14), + Meeting(id: 2, name: "아요레디", memberCount: 28), + Meeting(id: 3, name: "안드가자", memberCount: 26), + Meeting(id: 4, name: "난이서버", memberCount: 30), + Meeting(id: 5, name: "캔디팟", memberCount: 24), + Meeting(id: 6, name: "열기팟", memberCount: 24) + ] + ), + error: nil ) return mockData }