Make network call

Author: adborbas

Modules/Sources/Networking/Remote/BookingsRemote.swift

@@ -20,7 +20,8 @@ public protocol BookingsRemoteProtocol {
         from siteID: Int64,
         bookingID: Int64,
         attendanceStatus: BookingAttendanceStatus?,
-        bookingStatus: BookingStatus?
+        bookingStatus: BookingStatus?,
+        note: String?
     ) async throws -> Booking?
 
     func fetchResource(resourceID: Int64,
@@ -152,7 +153,8 @@ public final class BookingsRemote: Remote, BookingsRemoteProtocol {
         from siteID: Int64,
         bookingID: Int64,
         attendanceStatus: BookingAttendanceStatus?,
-        bookingStatus: BookingStatus?
+        bookingStatus: BookingStatus?,
+        note: String?
     ) async throws -> Booking? {
         let path = "\(Path.bookings)/\(bookingID)"
         var parameters: [String: String] = [:]
@@ -165,6 +167,10 @@ public final class BookingsRemote: Remote, BookingsRemoteProtocol {
             parameters[ParameterKey.status] = bookingStatus.rawValue
         }
 
+        if let note {
+            parameters[ParameterKey.note] = note
+        }
+
         let request = JetpackRequest(
             wooApiVersion: .wcBookings,
             method: .put,
@@ -259,5 +265,6 @@ public extension BookingsRemote {
         static let attendanceStatus        = "attendance_status"
         static let paymentStatus           = "booking_status" // to be updated later when payment filtering is supported
         static let status: String          = "status"
+        static let note: String          = "note"
     }
 }

Modules/Sources/WooFoundationCore/Analytics/WooAnalyticsStat.swift

@@ -617,7 +617,6 @@ public enum WooAnalyticsStat: String {
     case interacRefundCanceled = "interac_refund_cancelled"
 
     // MARK: Push Notifications Events
-    //
     case pushNotificationReceived = "push_notification_received"
     case pushNotificationAlertPressed = "push_notification_alert_pressed"
     case pushNotificationOSAlertAllowed = "push_notification_os_alert_allowed"

Modules/Sources/Yosemite/Actions/BookingAction.swift

@@ -91,4 +91,16 @@ public enum BookingAction: Action {
     case markBookingAsPaid(siteID: Int64,
                            bookingID: Int64,
                            onCompletion: (Error?) -> Void)
+
+    /// Updates a booking attendance status.
+    ///
+    /// - Parameter siteID: The site ID of the booking.
+    /// - Parameter bookingID: The ID of the booking to be updated.
+    /// - Parameter note: The new note.
+    /// - Parameter onCompletion: called when update completes, returns an error in case of a failure.
+    ///
+    case updateBookingNote(siteID: Int64,
+                           bookingID: Int64,
+                           note: String,
+                           onCompletion: (Error?) -> Void)
 }

Modules/Sources/Yosemite/Stores/BookingStore.swift

@@ -82,6 +82,13 @@ public class BookingStore: Store {
                 bookingID: bookingID,
                 onCompletion: onCompletion
             )
+        case .updateBookingNote(let siteID, let bookingID, let note, let onCompletion):
+            updateBookingNote(
+                siteID: siteID,
+                bookingID: bookingID,
+                note: note,
+                onCompletion: onCompletion
+            )
         }
     }
 }
@@ -308,6 +315,7 @@ private extension BookingStore {
                         bookingID: bookingID,
                         attendanceStatus: status,
                         bookingStatus: nil,
+                        note: nil,
                     ) {
                         await self.upsertStoredBookingsInBackground(
                             readOnlyBookings: [remoteBooking],
@@ -333,6 +341,54 @@ private extension BookingStore {
         }
     }
 
+    func updateBookingNote(
+        siteID: Int64,
+        bookingID: Int64,
+        note: String,
+        onCompletion: @escaping (Error?) -> Void
+    ) {
+        updateBookingNoteLocally(
+            siteID: siteID,
+            bookingID: bookingID,
+            note: note
+        ) { [weak self] previousNote in
+            guard let self else {
+                return onCompletion(UpdateBookingStatusError.undefinedState)
+            }
+
+            Task { @MainActor in
+                do {
+                    if let remoteBooking = try await self.remote.updateBooking(
+                        from: siteID,
+                        bookingID: bookingID,
+                        attendanceStatus: nil,
+                        bookingStatus: nil,
+                        note: note,
+                    ) {
+                        await self.upsertStoredBookingsInBackground(
+                            readOnlyBookings: [remoteBooking],
+                            readOnlyOrders: [],
+                            siteID: siteID
+                        )
+
+                        onCompletion(nil)
+                    } else {
+                        return onCompletion(UpdateBookingStatusError.missingRemoteBooking)
+                    }
+                } catch {
+                    /// Revert Optimistic Update
+                    self.updateBookingNoteLocally(
+                        siteID: siteID,
+                        bookingID: bookingID,
+                        note: note
+                    ) { _ in
+                        onCompletion(error)
+                    }
+                }
+            }
+        }
+    }
+
     /// Updates local (Storage) Booking attendance status
     func updateBookingAttendanceStatusLocally(
         siteID: Int64,
@@ -361,6 +417,33 @@ private extension BookingStore {
         }, on: .main)
     }
 
+    func updateBookingNoteLocally(
+        siteID: Int64,
+        bookingID: Int64,
+        note: String?,
+        onCompletion: @escaping (String?) -> Void
+    ) {
+        storageManager.performAndSave({ storage -> String? in
+            guard let booking = storage.loadBooking(
+                siteID: siteID,
+                bookingID: bookingID
+            ) else {
+                return note
+            }
+
+            let oldNote = booking.note
+            booking.note = note
+            return oldNote
+        }, completion: { result in
+            switch result {
+            case .success(let status):
+                onCompletion(status)
+            case .failure:
+                onCompletion(note)
+            }
+        }, on: .main)
+    }
+
     /// Cancels a booking by updating its status to cancelled.
     func cancelBooking(
         siteID: Int64,
@@ -373,7 +456,8 @@ private extension BookingStore {
                     from: siteID,
                     bookingID: bookingID,
                     attendanceStatus: nil,
-                    bookingStatus: .cancelled
+                    bookingStatus: .cancelled,
+                    note: nil,
                 ) {
                     await upsertStoredBookingsInBackground(
                         readOnlyBookings: [remoteBooking],
@@ -403,7 +487,8 @@ private extension BookingStore {
                     from: siteID,
                     bookingID: bookingID,
                     attendanceStatus: nil,
-                    bookingStatus: .paid
+                    bookingStatus: .paid,
+                    note: nil,
                 ) {
                     await upsertStoredBookingsInBackground(
                         readOnlyBookings: [remoteBooking],

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

@@ -248,6 +248,20 @@ extension BookingDetailsViewModel {
         stores.dispatch(action)
     }
 
+    func updateNote(to newNote: String) {
+        let action = BookingAction.updateBookingNote(
+            siteID: booking.siteID,
+            bookingID: booking.bookingID,
+            note: newNote
+        ) { [weak self] error in
+            if let error, let self {
+                DDLogError("⛔️ Error updating booking note: \(error)")
+//                displayAttendanceStatusUpdatedErrorNotice(status: newStatus)
+            }
+        }
+        stores.dispatch(action)
+    }
+
     private func displayAttendanceStatusUpdatedErrorNotice(status: BookingAttendanceStatus) {
         let text = String.localizedStringWithFormat(
             Localization.bookingAttendanceStatusUpdateFailedMessage,

WooCommerce/Classes/ViewRelated/Bookings/Booking Details/BookingDetailsView.swift

@@ -244,7 +244,9 @@ private extension BookingDetailsView {
     func bookingNotesView() -> some View {
         MultilineEditableTextRow(value: viewModel.note,
                                  placeholder: Localization.bookingNotesRowText,
-                                 detailTitle: Localization.bookingNoteNavbarText)
+                                 detailTitle: Localization.bookingNoteNavbarText) { newNote in
+            viewModel.updateNote(to: newNote)
+        }
     }
 }
 

WooCommerce/Classes/ViewRelated/ReusableViews/SwiftUI Components/MultilineEditableTextRow/MultilineEditableTextDetailView.swift

@@ -9,11 +9,13 @@ struct MultilineEditableTextDetailView: View {
     @FocusState private var isFocused: Bool
 
     let title: String?
+    let onCommit: ((String) -> Void)?
 
-    init(text: Binding<String>, title: String? = nil) {
+    init(text: Binding<String>, title: String? = nil, onCommit: ((String) -> Void)? = nil) {
         self._text = text
         self._editedText = State(initialValue: text.wrappedValue)
         self.title = title
+        self.onCommit = onCommit
     }
 
     var body: some View {
@@ -54,6 +56,7 @@ struct MultilineEditableTextDetailView: View {
                 ToolbarItem(placement: .primaryAction) {
                     Button(Localization.doneButtonTitle) {
                         text = editedText
+                        onCommit?(editedText)
                         dismiss()
                     }
                     .fontWeight(.medium)

WooCommerce/Classes/ViewRelated/ReusableViews/SwiftUI Components/MultilineEditableTextRow/MultilineEditableTextRow.swift

@@ -4,16 +4,22 @@ struct MultilineEditableTextRow: View {
     @State var value: String
     let placeholder: String
     let detailTitle: String?
+    let onCommit: ((String) -> Void)?
 
-    init(value: String, placeholder: String, detailTitle: String? = nil) {
-        self.value = value
+    init(value: String,
+         placeholder: String,
+         detailTitle: String? = nil,
+         onCommit: ((String) -> Void)? = nil
+    ) {
+        self._value = State(initialValue: value)
         self.placeholder = placeholder
         self.detailTitle = detailTitle
+        self.onCommit = onCommit
     }
 
     var body: some View {
         NavigationLink {
-            MultilineEditableTextDetailView(text: $value, title: detailTitle)
+            MultilineEditableTextDetailView(text: $value, title: detailTitle, onCommit: onCommit)
         } label: {
             content
         }