From d327df7a9465a330895f1b9ec07a7f675cfaf9eb Mon Sep 17 00:00:00 2001 From: maeng-kim Date: Fri, 8 Aug 2025 02:31:14 +0900 Subject: [PATCH 1/2] =?UTF-8?q?[feat/#211]=20=EC=84=9C=EC=9A=B8=20?= =?UTF-8?q?=EC=9D=B4=EC=99=B8=20=EC=A7=80=EC=97=AD=20=ED=8C=9D=EC=97=85=20?= =?UTF-8?q?=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LocationSearchViewController.swift | 7 +++++++ .../Home/ViewModel/HomeViewModel.swift | 16 ++++++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/Roomie/Roomie/Presentation/Home/ViewController/LocationSearchViewController.swift b/Roomie/Roomie/Presentation/Home/ViewController/LocationSearchViewController.swift index ad4978a..599f613 100644 --- a/Roomie/Roomie/Presentation/Home/ViewController/LocationSearchViewController.swift +++ b/Roomie/Roomie/Presentation/Home/ViewController/LocationSearchViewController.swift @@ -138,6 +138,13 @@ private extension LocationSearchSheetViewController { self.updateEmptyView(isEmpty: result.isEmpty) } .store(in: cancelBag) + + output.inValidLocation + .receive(on: DispatchQueue.main) + .sink { _ in + Toast().show(message: "서울 이외의 지역은 아직 준비중이에요", inset: 23, view: self.rootView) + } + .store(in: cancelBag) } func createDiffableDataSource() -> UICollectionViewDiffableDataSource { diff --git a/Roomie/Roomie/Presentation/Home/ViewModel/HomeViewModel.swift b/Roomie/Roomie/Presentation/Home/ViewModel/HomeViewModel.swift index a36c910..51545da 100644 --- a/Roomie/Roomie/Presentation/Home/ViewModel/HomeViewModel.swift +++ b/Roomie/Roomie/Presentation/Home/ViewModel/HomeViewModel.swift @@ -19,6 +19,7 @@ final class HomeViewModel { private let didTapHouseDataSubject = PassthroughSubject() private let locationSearchDataSubject = PassthroughSubject() private let isSuccessSubject = PassthroughSubject() + private let invalidLocationSubject = PassthroughSubject() init(service: HomeServiceProtocol) { self.service = service @@ -40,6 +41,7 @@ extension HomeViewModel: ViewModelType { let pinnedInfo: AnyPublisher<(Int,Bool), Never> let locationSearchData: AnyPublisher let isSuccess: AnyPublisher + let inValidLocation: AnyPublisher } func transform(from input: Input, cancelBag: CancelBag) -> Output { @@ -114,7 +116,8 @@ extension HomeViewModel: ViewModelType { houseCount: houseCount, pinnedInfo: pinnedInfoData, locationSearchData: locationSearchData, - isSuccess: isSuccess + isSuccess: isSuccess, + inValidLocation: invalidLocationSubject.eraseToAnyPublisher() ) } } @@ -163,7 +166,16 @@ private extension HomeViewModel { latitude: latitude, longitude: longitude, location: location - ), let _ = responseBody.data else { return } + ) else { + isSuccessSubject.send(false) + return + } + + if responseBody.data?.location.isEmpty == true { + invalidLocationSubject.send(responseBody.message) + return + } + fetchHomeData() isSuccessSubject.send(true) } catch { From 9d94b04d084976a821e28925e37c089c178bb4cb Mon Sep 17 00:00:00 2001 From: maeng-kim Date: Fri, 8 Aug 2025 23:18:31 +0900 Subject: [PATCH 2/2] =?UTF-8?q?[chore/#211]=20=ED=99=88=20=EB=B7=B0=20?= =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EC=9B=B9=EB=B7=B0=20=EB=A7=81?= =?UTF-8?q?=ED=81=AC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Home/ViewController/APPLELOVERCLUBViewController.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Roomie/Roomie/Presentation/Home/ViewController/APPLELOVERCLUBViewController.swift b/Roomie/Roomie/Presentation/Home/ViewController/APPLELOVERCLUBViewController.swift index df3bbe0..4d96255 100644 --- a/Roomie/Roomie/Presentation/Home/ViewController/APPLELOVERCLUBViewController.swift +++ b/Roomie/Roomie/Presentation/Home/ViewController/APPLELOVERCLUBViewController.swift @@ -62,7 +62,7 @@ final class APPLELOVERCLUBViewController: BaseViewController { // MARK: - Function func loadURL() { - if let url = URL(string: "https://1401kms-70595.waveon.me") { + if let url = URL(string: "https://smore.im/quiz/mDC9DH57g2x") { let urlRequest = URLRequest(url: url) webView?.load(urlRequest) } else {