Skip to content

[feat/#211] 서울 이외 지역 팝업 처리 #214

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
maeng-kim wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

[feat/#211] 서울 이외 지역 팝업 처리 #214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d327df7
[feat/#211] 서울 이외 지역 팝업 처리
maeng-kim Aug 7, 2025
9d94b04
[chore/#211] 홈 뷰 테스트 웹뷰 링크 수정
maeng-kim Aug 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Roomie/Roomie/Presentation/Home/ViewController/APPLELOVERCLUBViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
7 changes: 7 additions & 0 deletions Roomie/Roomie/Presentation/Home/ViewController/LocationSearchViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<Int, Location> {
Expand Down
16 changes: 14 additions & 2 deletions Roomie/Roomie/Presentation/Home/ViewModel/HomeViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ final class HomeViewModel {
private let didTapHouseDataSubject = PassthroughSubject<Int, Never>()
private let locationSearchDataSubject = PassthroughSubject<MapSearchResponseDTO, Never>()
private let isSuccessSubject = PassthroughSubject<Bool, Never>()
private let invalidLocationSubject = PassthroughSubject<String, Never>()

init(service: HomeServiceProtocol) {
self.service = service
Expand All @@ -40,6 +41,7 @@ extension HomeViewModel: ViewModelType {
let pinnedInfo: AnyPublisher<(Int,Bool), Never>
let locationSearchData: AnyPublisher<MapSearchResponseDTO, Never>
let isSuccess: AnyPublisher<Bool, Never>
let inValidLocation: AnyPublisher<String, Never>
}

func transform(from input: Input, cancelBag: CancelBag) -> Output {
Expand Down Expand Up @@ -114,7 +116,8 @@ extension HomeViewModel: ViewModelType {
houseCount: houseCount,
pinnedInfo: pinnedInfoData,
locationSearchData: locationSearchData,
isSuccess: isSuccess
isSuccess: isSuccess,
inValidLocation: invalidLocationSubject.eraseToAnyPublisher()
)
}
}
Expand Down Expand Up @@ -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
}
Comment on lines +173 to +177
Copy link
Copy Markdown
Collaborator

@SeungWon1125 SeungWon1125 Aug 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

오옹 좋은데요..??


fetchHomeData()
isSuccessSubject.send(true)
} catch {
Expand Down