Make booking details content configurable after initialization

Author: RafaelKayumov

WooCommerce/Classes/ViewModels/Booking Details/AppointmentDetailsContent.swift

@@ -2,7 +2,7 @@ import Foundation
 import struct Networking.Booking
 
 extension BookingDetailsViewModel {
-    struct AppointmentDetailsContent {
+    final class AppointmentDetailsContent: ObservableObject {
         struct Row: Identifiable {
             let title: String
             let value: String
@@ -12,9 +12,14 @@ extension BookingDetailsViewModel {
             }
         }
 
-        let rows: [Row]
+        @Published var rows: [Row]
 
         init(_ booking: Booking) {
+            rows = []
+            update(with: booking)
+        }
+
+        func update(with booking: Booking) {
             let appointmentDate = booking.startDate.toString(dateStyle: .short, timeStyle: .none, timeZone: BookingListTab.utcTimeZone)
             let appointmentTimeFrame = [
                 booking.startDate.toString(dateStyle: .none, timeStyle: .short, timeZone: BookingListTab.utcTimeZone),

WooCommerce/Classes/ViewModels/Booking Details/BookingDetailsViewModel.swift

@@ -12,17 +12,28 @@ final class BookingDetailsViewModel: ObservableObject {
         }
     }
     private let headerContent: HeaderContent
-    private let customerContent = CustomerContent()
+    private let customerContent: CustomerContent
+    private let appointmentDetailsContent: AppointmentDetailsContent
+    private let attendanceContent: AttendanceContent
+    private let paymentContent: PaymentContent
 
     let navigationTitle: String
     @Published private(set) var sections: [Section] = []
 
     init(booking: Booking, stores: StoresManager = ServiceLocator.stores) {
         self.booking = booking
         self.stores = stores
-        self.resultsController = BookingDetailsResultsController(booking: booking)
-        self.headerContent = HeaderContent(booking)
+
+        resultsController = BookingDetailsResultsController(booking: booking)
+
+        customerContent = CustomerContent()
+        attendanceContent = AttendanceContent()
+        headerContent = HeaderContent(booking)
+        appointmentDetailsContent = AppointmentDetailsContent(booking)
+        paymentContent = PaymentContent(booking: booking)
+
         navigationTitle = Self.navigationTitle(for: booking)
+
         setupSections()
         configureResultsController()
         updateDisplayProperties(from: booking)
@@ -39,18 +50,18 @@ private extension BookingDetailsViewModel {
 
         let appointmentDetailsSection = Section(
             header: .title(Localization.appointmentDetailsSectionHeaderTitle.uppercased()),
-            content: .appointmentDetails(AppointmentDetailsContent(booking))
+            content: .appointmentDetails(appointmentDetailsContent)
         )
 
         let attendanceSection = Section(
             header: .title(Localization.attendanceSectionHeaderTitle.uppercased()),
             footerText: Localization.attendanceSectionFooterText,
-            content: .attendance(AttendanceContent())
+            content: .attendance(attendanceContent)
         )
 
         let paymentSection = Section(
             header: .title(Localization.paymentSectionHeaderTitle.uppercased()),
-            content: .payment(PaymentContent(booking: booking))
+            content: .payment(paymentContent)
         )
 
         let bookingNotes = Section(
@@ -79,16 +90,26 @@ private extension BookingDetailsViewModel {
     }
 
     func updateDisplayProperties(from booking: Booking) {
-        if let billingAddress = booking.orderInfo?.customerInfo?.billingAddress {
+        if let billingAddress = booking.orderInfo?.customerInfo?.billingAddress, !billingAddress.isEmpty {
             customerContent.update(with: billingAddress)
-            headerContent.update(with: billingAddress)
             insertCustomerSectionIfAbsent()
         }
+        headerContent.update(with: booking)
+        appointmentDetailsContent.update(with: booking)
+        paymentContent.update(with: booking)
     }
 
     func insertCustomerSectionIfAbsent() {
         // Avoid adding if it already exists
-        guard !sections.contains(where: { if case .customer = $0.content { return true } else { return false } }) else {
+        let customerSectionExists = sections.contains {
+            if case .customer = $0.content {
+                return true
+            }
+
+            return false
+        }
+
+        guard !customerSectionExists else {
             return
         }
 

WooCommerce/Classes/ViewModels/Booking Details/HeaderContent.swift

@@ -1,47 +1,35 @@
 import Foundation
 import struct Yosemite.Booking
+import struct Yosemite.BookingProductInfo
 import struct Yosemite.Customer
-import struct Networking.Address
+import struct Yosemite.Address
 
 extension BookingDetailsViewModel {
     final class HeaderContent: ObservableObject {
-        let bookingDate: String
-        let status: [Status]
+        @Published var bookingDate: String = ""
+        @Published var status: [Status] = []
+        @Published var serviceAndCustomerLine: String = ""
 
-        @Published var serviceAndCustomerLine: String
+        init(_ booking: Booking) {
+            update(with: booking)
+        }
 
-        init(_ booking: Booking, customerName: String? = nil) {
+        func update(with booking: Booking) {
             bookingDate = booking.startDate.toString(
                 dateStyle: .short,
                 timeStyle: .short,
                 timeZone: BookingListTab.utcTimeZone
             )
 
-            /// Temporary hardcode for service name
-            let serviceName = "Women's Haircut"
-            if let customerName = customerName, !customerName.isEmpty {
-                serviceAndCustomerLine = [
-                    serviceName,
-                    customerName
-                ].joined(separator: Constants.dotSeparator)
-            } else {
-                serviceAndCustomerLine = serviceName
-            }
-
-            status = [.booked, .payAtLocation]
-        }
-
-        func update(with address: Address) {
+            let serviceName = booking.orderInfo?.productInfo?.name ?? ""
             let customerName = [
-                address.firstName,
-                address.lastName
+                booking.orderInfo?.customerInfo?.billingAddress.firstName,
+                booking.orderInfo?.customerInfo?.billingAddress.lastName
             ]
             .compactMap { $0 }
             .filter { !$0.isEmpty }
             .joined(separator: " ")
 
-            /// Temporary hardcode for service name
-            let serviceName = "Women's Haircut"
             if !customerName.isEmpty {
                 serviceAndCustomerLine = [
                     serviceName,
@@ -50,6 +38,8 @@ extension BookingDetailsViewModel {
             } else {
                 serviceAndCustomerLine = serviceName
             }
+
+            status = [.booked, .payAtLocation]
         }
     }
 }

WooCommerce/Classes/ViewModels/Booking Details/PaymentContent.swift

@@ -3,11 +3,15 @@ import struct Networking.Booking
 import class WooFoundationCore.CurrencyFormatter
 
 extension BookingDetailsViewModel {
-    struct PaymentContent {
-        let amounts: [Amount]
-        let actions: [Action]
+    final class PaymentContent: ObservableObject {
+        @Published var amounts: [Amount] = []
+        @Published var actions: [Action] = []
 
         init(booking: Booking) {
+            update(with: booking)
+        }
+
+        func update(with booking: Booking) {
             amounts = [
                 .init(value: BookingDetailsViewModel.formatPrice(for: booking, priceString: booking.cost), type: .service),
                 .init(value: BookingDetailsViewModel.formatPrice(for: booking, priceString: "0"), type: .tax),