Loverde-Company-LTDA/LCEssentials
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 18 Wiki Activity

[cart-checkout] Fix delivery fee and address sync using stale cached profile

Browse Source 
Cart's delivery fee and Checkout's address validation both fetched the
customer profile without forcing a cache refresh (2h TTL), then let that
possibly-stale address book unconditionally overwrite the just-picked
appState.address coordinates before building the fee/validation payload.
Result: changing the address on Home didn't reliably move the cart's
delivery fee, and Checkout's 'Alterar' could silently revert to the old
address when the stale coordinates made the backend report it as not
served.

Force-refresh the profile fetch and only use it to fill genuine gaps in
appState.address, never to override a live user selection.
This commit is contained in:
Daniel Arantes Loverde
2026-07-10 10:23:59 -03:00
parent 380cd43657
commit 4fc6a666b2
2 changed files with 35 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Sources/PediFoods/Views/Main/CartView.swift
View File

@@ -287,7 +287,7 @@ struct CartView: View {
defer { isLoadingDeliveryFee = false } defer { isLoadingDeliveryFee = false }
do { do {
let profileResponse = try await ApiService().profile() let profileResponse = try await ApiService().profile(forceRefresh: true)
let addresses = profileResponse.result?.addressBook ?? [] let addresses = profileResponse.result?.addressBook ?? []
if let selectedId = appState.address.selectedId, selectedId.isEmpty == false { if let selectedId = appState.address.selectedId, selectedId.isEmpty == false {
@@ -312,20 +312,30 @@ struct CartView: View {
} }
if let selected = selectedCustomerAddress { if let selected = selectedCustomerAddress {
appState.address.selectedId = selected.id // appState.address reflects the address the user just picked —
let label = (selected.label ?? "").trimmingCharacters(in: .whitespacesAndNewlines) // authoritative. Only fill in gaps from the address book here,
if label.isEmpty == false { // never overwrite a live selection with a (possibly stale)
appState.address.display = label // cached record, or the fee/validation payload below can end
// up built against the wrong coordinates.
if appState.address.selectedId == nil || appState.address.selectedId?.isEmpty == true {
appState.address.selectedId = selected.id
} }
if let lat = selected.latLong?.first, let lng = selected.latLong?.dropFirst().first { if appState.address.display.isEmpty || appState.address.display == "Defina seu endereco" {
let label = (selected.label ?? "").trimmingCharacters(in: .whitespacesAndNewlines)
if label.isEmpty == false {
appState.address.display = label
}
}
if appState.address.latitude == nil || appState.address.longitude == nil,
let lat = selected.latLong?.first, let lng = selected.latLong?.dropFirst().first {
appState.address.latitude = lat appState.address.latitude = lat
appState.address.longitude = lng appState.address.longitude = lng
} }
SessionStateStore.saveAddress(appState.address) SessionStateStore.saveAddress(appState.address)
} }
let payloadLat = selectedCustomerAddress?.latLong?.first ?? appState.address.latitude let payloadLat = appState.address.latitude ?? selectedCustomerAddress?.latLong?.first
let payloadLng = selectedCustomerAddress?.latLong?.dropFirst().first ?? appState.address.longitude let payloadLng = appState.address.longitude ?? selectedCustomerAddress?.latLong?.dropFirst().first
let payload = ValidateDeliveryAddressPayload( let payload = ValidateDeliveryAddressPayload(
address: ValidateDeliveryAddressDataPayload( address: ValidateDeliveryAddressDataPayload(

23
Sources/PediFoods/Views/Main/CheckoutView+Logic.swift
View File

@@ -71,7 +71,7 @@ extension CheckoutView {
@MainActor @MainActor
func refreshSelectedCustomerAddress() async { func refreshSelectedCustomerAddress() async {
do { do {
let response = try await ApiService().profile() let response = try await ApiService().profile(forceRefresh: true)
if let customer = response.result { if let customer = response.result {
appState.profile.id = customer.id appState.profile.id = customer.id
appState.profile.name = customer.name appState.profile.name = customer.name
@@ -117,12 +117,23 @@ extension CheckoutView {
} }
if let selected = selectedCustomerAddress { if let selected = selectedCustomerAddress {
appState.address.selectedId = selected.id // appState.address reflects the address the user just picked —
let label = (selected.label ?? "").trimmingCharacters(in: .whitespacesAndNewlines) // authoritative. Only fill in gaps from the address book here,
if label.isEmpty == false { // never overwrite a live selection with a (possibly stale)
appState.address.display = label // cached record, or delivery validation below runs against
// the wrong coordinates and can wrongly report the address
// as not served, reverting the user's pick.
if appState.address.selectedId == nil || appState.address.selectedId?.isEmpty == true {
appState.address.selectedId = selected.id
} }
if let lat = selected.latLong?.first, let lng = selected.latLong?.dropFirst().first { if appState.address.display.isEmpty || appState.address.display == "Defina seu endereco" {
let label = (selected.label ?? "").trimmingCharacters(in: .whitespacesAndNewlines)
if label.isEmpty == false {
appState.address.display = label
}
}
if appState.address.latitude == nil || appState.address.longitude == nil,
let lat = selected.latLong?.first, let lng = selected.latLong?.dropFirst().first {
appState.address.latitude = lat appState.address.latitude = lat
appState.address.longitude = lng appState.address.longitude = lng
} }