Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions MarketPlace/Model/Market/MarketSearchModel.swift
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ struct MarketSearchModel: Identifiable, Codable {
var address: String
var thumbnail: String
var isNewCoupon: Bool
var isClosingCoupon: Bool
var major: String
var orderNo: Int?

var id: Int { return marketId }
}
7 changes: 6 additions & 1 deletion MarketPlace/View/Search/View/SearchSecondView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import SwiftUI
struct SearchSecondView: View {
@ObservedObject var viewModel: SearchMarketViewModel
@Binding var lastIndex: Int
@Binding var lastPageID: Int

var body: some View {
ScrollView {
Expand All @@ -24,8 +25,12 @@ struct SearchSecondView: View {
}
}
.onAppear {
guard index == viewModel.market.count - 1 else { return }
guard index == viewModel.market.count - 1,
let lastPageIndex = viewModel.lastPageIndex
else { return }

lastIndex = index
lastPageID = lastPageIndex
}
}
}.padding()
Expand Down
7 changes: 4 additions & 3 deletions MarketPlace/View/Search/View/SearchView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ struct SearchView: View {

@State private var hasData: Bool = true
@State var lastIndex: Int = 0
@State var lastPageID: Int = 0

var body: some View {
VStack(spacing: 0) {
Expand Down Expand Up @@ -64,7 +65,7 @@ struct SearchView: View {

} else {
if hasData {
SearchSecondView(viewModel: viewModel, lastIndex: $lastIndex)
SearchSecondView(viewModel: viewModel, lastIndex: $lastIndex, lastPageID: $lastPageID)
.padding(.top, 20)

} else{
Expand All @@ -87,12 +88,12 @@ struct SearchView: View {
}
.onChange(of: lastIndex, { _, newValue in
Task {
hasData = await viewModel.fetchMarkets(lastPageIndex: lastIndex, keyword: viewModel.currentKeyword)
hasData = await viewModel.fetchSearchingMarkets(lastPageIndex: lastPageID, keyword: viewModel.currentKeyword)
}
})
.onChange(of: viewModel.searchText) { _, newValue in
Task {
hasData = await viewModel.fetchMarkets(keyword: newValue)
hasData = await viewModel.fetchSearchingMarkets(keyword: newValue)
viewModel.currentKeyword = newValue
}

Expand Down
5 changes: 2 additions & 3 deletions MarketPlace/ViewModel/Search/SearchMarketViewModel.swift
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ final class SearchMarketViewModel: ObservableObject {

// MARK: - 검색 결과 불러오는 메서드
@MainActor
func fetchMarkets(
func fetchSearchingMarkets(
lastPageIndex: Int? = nil,
pageSize: Int? = nil,
keyword: String
Expand All @@ -70,7 +70,7 @@ final class SearchMarketViewModel: ObservableObject {
hasNextPage = true
}

guard !isLoading, hasNextPage else { return false }
guard !isLoading, hasNextPage else { return hasData }

isLoading = true

Expand All @@ -95,7 +95,6 @@ final class SearchMarketViewModel: ObservableObject {
self.hasNextPage = data.response.hasNext
currentPage += 1

// self.market = data.response.marketResDtos
if market.isEmpty {
hasData = false
}
Expand Down