feat(orders): separar reviews e criar detalhe de pedido
This commit is contained in:
@@ -4,6 +4,7 @@ struct AppOrderSummary: Decodable, Identifiable {
|
||||
let id: String
|
||||
let orderId: String?
|
||||
let realId: String?
|
||||
let storeId: String?
|
||||
let shortId: String?
|
||||
let total: Double?
|
||||
let status: String?
|
||||
@@ -14,6 +15,7 @@ struct AppOrderSummary: Decodable, Identifiable {
|
||||
let paymentMethod: String?
|
||||
let deliveryType: String?
|
||||
let storeName: String?
|
||||
let storeLogoURL: String?
|
||||
let createdAt: String?
|
||||
let updatedAt: String?
|
||||
|
||||
@@ -21,6 +23,8 @@ struct AppOrderSummary: Decodable, Identifiable {
|
||||
case id
|
||||
case orderId
|
||||
case realId
|
||||
case storeId
|
||||
case store_id
|
||||
case shortId
|
||||
case total
|
||||
case status
|
||||
@@ -31,6 +35,9 @@ struct AppOrderSummary: Decodable, Identifiable {
|
||||
case paymentMethod
|
||||
case deliveryType
|
||||
case storeName
|
||||
case storeLogo
|
||||
case store_logo
|
||||
case logo
|
||||
case date
|
||||
case createdAt
|
||||
case updatedAt
|
||||
@@ -41,6 +48,7 @@ struct AppOrderSummary: Decodable, Identifiable {
|
||||
orderId = ApiService.decodeFlexibleString(from: container, keys: [.orderId])
|
||||
id = ApiService.decodeFlexibleString(from: container, keys: [.orderId, .realId, .id]) ?? UUID().uuidString
|
||||
realId = ApiService.decodeFlexibleString(from: container, keys: [.realId])
|
||||
storeId = ApiService.decodeFlexibleString(from: container, keys: [.storeId, .store_id])
|
||||
shortId = ApiService.decodeFlexibleString(from: container, keys: [.shortId])
|
||||
total = ApiService.decodeFlexibleDouble(from: container, keys: [.total])
|
||||
status = ApiService.decodeFlexibleString(from: container, keys: [.status])
|
||||
@@ -51,6 +59,7 @@ struct AppOrderSummary: Decodable, Identifiable {
|
||||
paymentMethod = ApiService.decodeFlexibleString(from: container, keys: [.paymentMethod])
|
||||
deliveryType = ApiService.decodeFlexibleString(from: container, keys: [.deliveryType])
|
||||
storeName = ApiService.decodeFlexibleString(from: container, keys: [.storeName])
|
||||
storeLogoURL = ApiService.decodeFlexibleString(from: container, keys: [.storeLogo, .store_logo, .logo])
|
||||
let fallbackDate = ApiService.decodeFlexibleString(from: container, keys: [.date])
|
||||
createdAt = ApiService.decodeFlexibleString(from: container, keys: [.createdAt]) ?? fallbackDate
|
||||
updatedAt = ApiService.decodeFlexibleString(from: container, keys: [.updatedAt]) ?? fallbackDate
|
||||
@@ -61,6 +70,7 @@ struct PublicOrderResult: Codable, Identifiable {
|
||||
let id: String
|
||||
let shortId: String?
|
||||
let realId: String?
|
||||
let storeId: String?
|
||||
let status: String?
|
||||
let paymentStatus: String?
|
||||
let paymentConfirmed: Bool?
|
||||
@@ -68,16 +78,20 @@ struct PublicOrderResult: Codable, Identifiable {
|
||||
let paymentMethodCode: String?
|
||||
let paymentPayload: CreateOrderPaymentPayload?
|
||||
let payment: CreateOrderPaymentInfo?
|
||||
let nextAction: String?
|
||||
let deliveryType: String?
|
||||
let deliveryTypeLabel: String?
|
||||
let total: Double?
|
||||
let storeName: String?
|
||||
let storeLogoURL: String?
|
||||
let createdAt: String?
|
||||
let updatedAt: String?
|
||||
let otp: String?
|
||||
let customerOtp: String?
|
||||
let confirmOtp: String?
|
||||
let cancellationReason: String?
|
||||
let deliveryAddress: PublicOrderDeliveryAddress?
|
||||
let review: PublicOrderReview?
|
||||
let items: [PublicOrderItem]
|
||||
let timeline: [PublicOrderTimelineEvent]
|
||||
|
||||
@@ -85,6 +99,8 @@ struct PublicOrderResult: Codable, Identifiable {
|
||||
case id
|
||||
case shortId
|
||||
case realId
|
||||
case storeId
|
||||
case store_id
|
||||
case status
|
||||
case paymentStatus
|
||||
case paymentConfirmed
|
||||
@@ -92,16 +108,27 @@ struct PublicOrderResult: Codable, Identifiable {
|
||||
case paymentMethodCode
|
||||
case paymentPayload
|
||||
case payment
|
||||
case nextAction
|
||||
case deliveryType
|
||||
case deliveryTypeLabel
|
||||
case total
|
||||
case storeName
|
||||
case storeLogo
|
||||
case store_logo
|
||||
case logo
|
||||
case createdAt
|
||||
case updatedAt
|
||||
case otp
|
||||
case customerOtp
|
||||
case confirmOtp
|
||||
case cancellationReason
|
||||
case address
|
||||
case deliveryAddress
|
||||
case delivery_address
|
||||
case customerAddress
|
||||
case customer_address
|
||||
case review
|
||||
case orderReview
|
||||
case items
|
||||
case timeline
|
||||
}
|
||||
@@ -110,6 +137,7 @@ struct PublicOrderResult: Codable, Identifiable {
|
||||
id: String,
|
||||
shortId: String? = nil,
|
||||
realId: String? = nil,
|
||||
storeId: String? = nil,
|
||||
status: String? = nil,
|
||||
paymentStatus: String? = nil,
|
||||
paymentConfirmed: Bool? = nil,
|
||||
@@ -117,22 +145,27 @@ struct PublicOrderResult: Codable, Identifiable {
|
||||
paymentMethodCode: String? = nil,
|
||||
paymentPayload: CreateOrderPaymentPayload? = nil,
|
||||
payment: CreateOrderPaymentInfo? = nil,
|
||||
nextAction: String? = nil,
|
||||
deliveryType: String? = nil,
|
||||
deliveryTypeLabel: String? = nil,
|
||||
total: Double? = nil,
|
||||
storeName: String? = nil,
|
||||
storeLogoURL: String? = nil,
|
||||
createdAt: String? = nil,
|
||||
updatedAt: String? = nil,
|
||||
otp: String? = nil,
|
||||
customerOtp: String? = nil,
|
||||
confirmOtp: String? = nil,
|
||||
cancellationReason: String? = nil,
|
||||
deliveryAddress: PublicOrderDeliveryAddress? = nil,
|
||||
review: PublicOrderReview? = nil,
|
||||
items: [PublicOrderItem] = [],
|
||||
timeline: [PublicOrderTimelineEvent] = []
|
||||
) {
|
||||
self.id = id
|
||||
self.shortId = shortId
|
||||
self.realId = realId
|
||||
self.storeId = storeId
|
||||
self.status = status
|
||||
self.paymentStatus = paymentStatus
|
||||
self.paymentConfirmed = paymentConfirmed
|
||||
@@ -140,16 +173,20 @@ struct PublicOrderResult: Codable, Identifiable {
|
||||
self.paymentMethodCode = paymentMethodCode
|
||||
self.paymentPayload = paymentPayload
|
||||
self.payment = payment
|
||||
self.nextAction = nextAction
|
||||
self.deliveryType = deliveryType
|
||||
self.deliveryTypeLabel = deliveryTypeLabel
|
||||
self.total = total
|
||||
self.storeName = storeName
|
||||
self.storeLogoURL = storeLogoURL
|
||||
self.createdAt = createdAt
|
||||
self.updatedAt = updatedAt
|
||||
self.otp = otp
|
||||
self.customerOtp = customerOtp
|
||||
self.confirmOtp = confirmOtp
|
||||
self.cancellationReason = cancellationReason
|
||||
self.deliveryAddress = deliveryAddress
|
||||
self.review = review
|
||||
self.items = items
|
||||
self.timeline = timeline
|
||||
}
|
||||
@@ -159,11 +196,13 @@ struct PublicOrderResult: Codable, Identifiable {
|
||||
id = ApiService.decodeFlexibleString(from: container, keys: [.id]) ?? UUID().uuidString
|
||||
shortId = ApiService.decodeFlexibleString(from: container, keys: [.shortId])
|
||||
realId = ApiService.decodeFlexibleString(from: container, keys: [.realId])
|
||||
storeId = ApiService.decodeFlexibleString(from: container, keys: [.storeId, .store_id])
|
||||
status = ApiService.decodeFlexibleString(from: container, keys: [.status])
|
||||
paymentStatus = ApiService.decodeFlexibleString(from: container, keys: [.paymentStatus])
|
||||
paymentConfirmed = try? container.decode(Bool.self, forKey: .paymentConfirmed)
|
||||
paymentMethod = ApiService.decodeFlexibleString(from: container, keys: [.paymentMethod])
|
||||
paymentMethodCode = ApiService.decodeFlexibleString(from: container, keys: [.paymentMethodCode])
|
||||
nextAction = ApiService.decodeFlexibleString(from: container, keys: [.nextAction])
|
||||
payment = try? container.decode(CreateOrderPaymentInfo.self, forKey: .payment)
|
||||
if let objectPayload = try? container.decode(CreateOrderPaymentPayload.self, forKey: .paymentPayload) {
|
||||
paymentPayload = objectPayload
|
||||
@@ -180,16 +219,54 @@ struct PublicOrderResult: Codable, Identifiable {
|
||||
deliveryTypeLabel = ApiService.decodeFlexibleString(from: container, keys: [.deliveryTypeLabel])
|
||||
total = ApiService.decodeFlexibleDouble(from: container, keys: [.total])
|
||||
storeName = ApiService.decodeFlexibleString(from: container, keys: [.storeName])
|
||||
storeLogoURL = ApiService.decodeFlexibleString(from: container, keys: [.storeLogo, .store_logo, .logo])
|
||||
createdAt = ApiService.decodeFlexibleString(from: container, keys: [.createdAt])
|
||||
updatedAt = ApiService.decodeFlexibleString(from: container, keys: [.updatedAt])
|
||||
otp = ApiService.decodeFlexibleString(from: container, keys: [.otp])
|
||||
customerOtp = ApiService.decodeFlexibleString(from: container, keys: [.customerOtp])
|
||||
confirmOtp = ApiService.decodeFlexibleString(from: container, keys: [.confirmOtp])
|
||||
cancellationReason = ApiService.decodeFlexibleString(from: container, keys: [.cancellationReason])
|
||||
deliveryAddress = (try? container.decode(PublicOrderDeliveryAddress.self, forKey: .address))
|
||||
?? (try? container.decode(PublicOrderDeliveryAddress.self, forKey: .deliveryAddress))
|
||||
?? (try? container.decode(PublicOrderDeliveryAddress.self, forKey: .delivery_address))
|
||||
?? (try? container.decode(PublicOrderDeliveryAddress.self, forKey: .customerAddress))
|
||||
?? (try? container.decode(PublicOrderDeliveryAddress.self, forKey: .customer_address))
|
||||
review = (try? container.decode(PublicOrderReview.self, forKey: .review))
|
||||
?? (try? container.decode(PublicOrderReview.self, forKey: .orderReview))
|
||||
items = (try? container.decode([PublicOrderItem].self, forKey: .items)) ?? []
|
||||
timeline = (try? container.decode([PublicOrderTimelineEvent].self, forKey: .timeline)) ?? []
|
||||
}
|
||||
|
||||
func encode(to encoder: Encoder) throws {
|
||||
var container = encoder.container(keyedBy: CodingKeys.self)
|
||||
try container.encode(id, forKey: .id)
|
||||
try container.encodeIfPresent(shortId, forKey: .shortId)
|
||||
try container.encodeIfPresent(realId, forKey: .realId)
|
||||
try container.encodeIfPresent(storeId, forKey: .storeId)
|
||||
try container.encodeIfPresent(status, forKey: .status)
|
||||
try container.encodeIfPresent(paymentStatus, forKey: .paymentStatus)
|
||||
try container.encodeIfPresent(paymentConfirmed, forKey: .paymentConfirmed)
|
||||
try container.encodeIfPresent(paymentMethod, forKey: .paymentMethod)
|
||||
try container.encodeIfPresent(paymentMethodCode, forKey: .paymentMethodCode)
|
||||
try container.encodeIfPresent(paymentPayload, forKey: .paymentPayload)
|
||||
try container.encodeIfPresent(payment, forKey: .payment)
|
||||
try container.encodeIfPresent(nextAction, forKey: .nextAction)
|
||||
try container.encodeIfPresent(deliveryType, forKey: .deliveryType)
|
||||
try container.encodeIfPresent(deliveryTypeLabel, forKey: .deliveryTypeLabel)
|
||||
try container.encodeIfPresent(total, forKey: .total)
|
||||
try container.encodeIfPresent(storeName, forKey: .storeName)
|
||||
try container.encodeIfPresent(createdAt, forKey: .createdAt)
|
||||
try container.encodeIfPresent(updatedAt, forKey: .updatedAt)
|
||||
try container.encodeIfPresent(otp, forKey: .otp)
|
||||
try container.encodeIfPresent(customerOtp, forKey: .customerOtp)
|
||||
try container.encodeIfPresent(confirmOtp, forKey: .confirmOtp)
|
||||
try container.encodeIfPresent(cancellationReason, forKey: .cancellationReason)
|
||||
try container.encodeIfPresent(deliveryAddress, forKey: .address)
|
||||
try container.encodeIfPresent(review, forKey: .review)
|
||||
try container.encode(items, forKey: .items)
|
||||
try container.encode(timeline, forKey: .timeline)
|
||||
}
|
||||
|
||||
var displayOtpCode: String? {
|
||||
let values = [customerOtp, otp, confirmOtp]
|
||||
for value in values {
|
||||
@@ -251,6 +328,180 @@ struct PublicOrderResult: Codable, Identifiable {
|
||||
}
|
||||
}
|
||||
|
||||
struct PublicOrderDeliveryAddress: Codable {
|
||||
let label: String?
|
||||
let street: String?
|
||||
let number: String?
|
||||
let neighborhood: String?
|
||||
let city: String?
|
||||
let state: String?
|
||||
let zip: String?
|
||||
let complement: String?
|
||||
|
||||
enum CodingKeys: String, CodingKey {
|
||||
case label
|
||||
case street
|
||||
case address
|
||||
case number
|
||||
case neighborhood
|
||||
case district
|
||||
case city
|
||||
case state
|
||||
case zip
|
||||
case zipCode
|
||||
case zipcode
|
||||
case complement
|
||||
}
|
||||
|
||||
init(from decoder: Decoder) throws {
|
||||
let container = try decoder.container(keyedBy: CodingKeys.self)
|
||||
label = ApiService.decodeFlexibleString(from: container, keys: [.label])
|
||||
street = ApiService.decodeFlexibleString(from: container, keys: [.street, .address])
|
||||
number = ApiService.decodeFlexibleString(from: container, keys: [.number])
|
||||
neighborhood = ApiService.decodeFlexibleString(from: container, keys: [.neighborhood, .district])
|
||||
city = ApiService.decodeFlexibleString(from: container, keys: [.city])
|
||||
state = ApiService.decodeFlexibleString(from: container, keys: [.state])
|
||||
zip = ApiService.decodeFlexibleString(from: container, keys: [.zip, .zipCode, .zipcode])
|
||||
complement = ApiService.decodeFlexibleString(from: container, keys: [.complement])
|
||||
}
|
||||
|
||||
func encode(to encoder: Encoder) throws {
|
||||
var container = encoder.container(keyedBy: CodingKeys.self)
|
||||
try container.encodeIfPresent(label, forKey: .label)
|
||||
try container.encodeIfPresent(street, forKey: .street)
|
||||
try container.encodeIfPresent(number, forKey: .number)
|
||||
try container.encodeIfPresent(neighborhood, forKey: .neighborhood)
|
||||
try container.encodeIfPresent(city, forKey: .city)
|
||||
try container.encodeIfPresent(state, forKey: .state)
|
||||
try container.encodeIfPresent(zip, forKey: .zip)
|
||||
try container.encodeIfPresent(complement, forKey: .complement)
|
||||
}
|
||||
}
|
||||
|
||||
struct PublicOrderReview: Codable {
|
||||
let id: String?
|
||||
let orderId: String?
|
||||
let rate: Int?
|
||||
let message: String?
|
||||
let orderRate: Int?
|
||||
let orderComment: String?
|
||||
let orderPositiveTags: [String]?
|
||||
let orderImprovementTags: [String]?
|
||||
let deliverySentiment: String?
|
||||
let deliveryPositiveTags: [String]?
|
||||
let deliveryNegativeTags: [String]?
|
||||
let appNps: Int?
|
||||
let platform: String?
|
||||
let date: String?
|
||||
|
||||
enum CodingKeys: String, CodingKey {
|
||||
case id
|
||||
case orderId
|
||||
case rate
|
||||
case message
|
||||
case orderRate
|
||||
case orderComment
|
||||
case orderPositiveTags
|
||||
case orderImprovementTags
|
||||
case itemFeedback
|
||||
case improvementFeedback
|
||||
case deliverySentiment
|
||||
case deliveryFeedback
|
||||
case deliveryPositiveTags
|
||||
case deliveryNegativeTags
|
||||
case appNps
|
||||
case app_nps
|
||||
case platform
|
||||
case date
|
||||
}
|
||||
|
||||
init(from decoder: Decoder) throws {
|
||||
let container = try decoder.container(keyedBy: CodingKeys.self)
|
||||
id = ApiService.decodeFlexibleString(from: container, keys: [.id])
|
||||
orderId = ApiService.decodeFlexibleString(from: container, keys: [.orderId])
|
||||
rate = ApiService.decodeFlexibleInt(from: container, keys: [.rate])
|
||||
message = ApiService.decodeFlexibleString(from: container, keys: [.message])
|
||||
orderRate = ApiService.decodeFlexibleInt(from: container, keys: [.orderRate, .rate])
|
||||
orderComment = ApiService.decodeFlexibleString(from: container, keys: [.orderComment, .message])
|
||||
orderPositiveTags = Self.decodeStringList(
|
||||
from: container,
|
||||
keys: [.orderPositiveTags, .itemFeedback]
|
||||
)
|
||||
orderImprovementTags = Self.decodeStringList(
|
||||
from: container,
|
||||
keys: [.orderImprovementTags, .improvementFeedback]
|
||||
)
|
||||
deliverySentiment = ApiService.decodeFlexibleString(from: container, keys: [.deliverySentiment, .deliveryFeedback])
|
||||
deliveryPositiveTags = Self.decodeStringList(from: container, keys: [.deliveryPositiveTags])
|
||||
deliveryNegativeTags = Self.decodeStringList(from: container, keys: [.deliveryNegativeTags])
|
||||
appNps = Self.decodeNps(from: container, keys: [.appNps, .app_nps])
|
||||
platform = ApiService.decodeFlexibleString(from: container, keys: [.platform])
|
||||
date = ApiService.decodeFlexibleString(from: container, keys: [.date])
|
||||
}
|
||||
|
||||
private static func decodeStringList(
|
||||
from container: KeyedDecodingContainer<CodingKeys>,
|
||||
keys: [CodingKeys]
|
||||
) -> [String]? {
|
||||
for key in keys {
|
||||
if let list = try? container.decode([String].self, forKey: key) {
|
||||
return list
|
||||
}
|
||||
if let single = try? container.decode(String.self, forKey: key) {
|
||||
let normalized = single.trimmingCharacters(in: .whitespacesAndNewlines)
|
||||
if normalized.isEmpty == false {
|
||||
return [normalized]
|
||||
}
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
private static func decodeNps(
|
||||
from container: KeyedDecodingContainer<CodingKeys>,
|
||||
keys: [CodingKeys]
|
||||
) -> Int? {
|
||||
for key in keys {
|
||||
if let value = try? container.decode(Int.self, forKey: key) {
|
||||
return value
|
||||
}
|
||||
if let value = try? container.decode(Double.self, forKey: key) {
|
||||
return Int(value.rounded())
|
||||
}
|
||||
if let raw = try? container.decode(String.self, forKey: key) {
|
||||
let trimmed = raw.trimmingCharacters(in: .whitespacesAndNewlines)
|
||||
if trimmed.isEmpty { continue }
|
||||
if let asInt = Int(trimmed) {
|
||||
return asInt
|
||||
}
|
||||
let normalized = trimmed.replacingOccurrences(of: ",", with: ".")
|
||||
if let asDouble = Double(normalized) {
|
||||
return Int(asDouble.rounded())
|
||||
}
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func encode(to encoder: Encoder) throws {
|
||||
var container = encoder.container(keyedBy: CodingKeys.self)
|
||||
try container.encodeIfPresent(id, forKey: .id)
|
||||
try container.encodeIfPresent(orderId, forKey: .orderId)
|
||||
try container.encodeIfPresent(rate, forKey: .rate)
|
||||
try container.encodeIfPresent(message, forKey: .message)
|
||||
try container.encodeIfPresent(orderRate, forKey: .orderRate)
|
||||
try container.encodeIfPresent(orderComment, forKey: .orderComment)
|
||||
try container.encodeIfPresent(orderPositiveTags, forKey: .orderPositiveTags)
|
||||
try container.encodeIfPresent(orderImprovementTags, forKey: .orderImprovementTags)
|
||||
try container.encodeIfPresent(deliverySentiment, forKey: .deliverySentiment)
|
||||
try container.encodeIfPresent(deliveryPositiveTags, forKey: .deliveryPositiveTags)
|
||||
try container.encodeIfPresent(deliveryNegativeTags, forKey: .deliveryNegativeTags)
|
||||
try container.encodeIfPresent(appNps, forKey: .appNps)
|
||||
try container.encodeIfPresent(platform, forKey: .platform)
|
||||
try container.encodeIfPresent(date, forKey: .date)
|
||||
}
|
||||
}
|
||||
|
||||
struct PublicOrderItem: Codable, Identifiable {
|
||||
let id: String
|
||||
let name: String?
|
||||
|
||||
Reference in New Issue
Block a user