From 90a61f70527c96c8c96e100e85bf87c5a7eb62b3 Mon Sep 17 00:00:00 2001 From: William Le Date: Mon, 2 Nov 2026 23:22:35 +0800 Subject: [PATCH] fix(place/booking_model): Booking signals use .resource_ids but Booking model and gallagher parking approval driver use .asset_ids. Update the shared Booking model to be compatible with the Booking signal params --- drivers/gallagher/parking_approvals.cr | 1 + drivers/gallagher/parking_approvals_spec.cr | 35 ++++++++++++++++++--- drivers/place/booking_model.cr | 20 ++++++++++-- 3 files changed, 50 insertions(+), 6 deletions(-) diff --git a/drivers/gallagher/parking_approvals.cr b/drivers/gallagher/parking_approvals.cr index 94ebd142631..8682451b75d 100644 --- a/drivers/gallagher/parking_approvals.cr +++ b/drivers/gallagher/parking_approvals.cr @@ -2658,3 +2658,4 @@ class Place::Parking::Approvals < PlaceOS::Driver logger.warn(exception: error) { "failed to update process_state #{state} for booking #{booking.id}" } end end + \ No newline at end of file diff --git a/drivers/gallagher/parking_approvals_spec.cr b/drivers/gallagher/parking_approvals_spec.cr index 5efb50d994c..82c83730599 100644 --- a/drivers/gallagher/parking_approvals_spec.cr +++ b/drivers/gallagher/parking_approvals_spec.cr @@ -3732,8 +3732,8 @@ DriverSpecs.mock_driver "Place::Parking::Approvals" do booking_type: "parking", booking_start: cancel_start, booking_end: cancel_end, - asset_id: asset, - asset_ids: [asset], + resource_id: asset, + resource_ids: [asset], user_id: "user-85001", user_email: "cancel.user@example.com", user_name: "Cancel User", @@ -3772,6 +3772,33 @@ DriverSpecs.mock_driver "Place::Parking::Approvals" do sleep 100.milliseconds mailer.times_sent("cancel.user@example.com", "parking_request", "cancelled").should eq(1) + # events that only provide the plural resource_ids are handled too + mailer.reset + publish("staff/booking/changed", { + action: "cancelled", + id: 85003_i64, + booking_type: "parking", + booking_start: cancel_start, + booking_end: cancel_end, + resource_ids: ["asset-inv1"], + user_id: "user-85003", + user_email: "cancel2.user@example.com", + user_name: "Cancel User 2", + booked_by_email: "cancel2.user@example.com", + booked_by_name: "Cancel User 2", + zones: ["zone-building"], + created: now - 500_i64, + last_changed: now, + approved: true, + rejected: false, + deleted: false, + process_state: "access_granted_emailed", + extension_data: {"location" => "INV1"}, + }.to_json) + sleep 100.milliseconds + mailer.sent?("cancel2.user@example.com", "parking_request", "cancelled").should eq(true) + staff.last_state(85003_i64).should eq("cancelled_emailed") + # a cancelled booking that was only ever wait-listed -> nothing is sent mailer.reset publish("staff/booking/changed", { @@ -3780,8 +3807,8 @@ DriverSpecs.mock_driver "Place::Parking::Approvals" do booking_type: "parking", booking_start: cancel_start, booking_end: cancel_end, - asset_id: "unallocated-85002", - asset_ids: ["unallocated-85002"], + resource_id: "unallocated-85002", + resource_ids: ["unallocated-85002"], user_id: "user-85002", user_email: "waitlist.user@example.com", user_name: "Wait List User", diff --git a/drivers/place/booking_model.cr b/drivers/place/booking_model.cr index 14f6f0bb122..4e7436e63bc 100644 --- a/drivers/place/booking_model.cr +++ b/drivers/place/booking_model.cr @@ -13,13 +13,29 @@ class Place::Booking property booking_end : Int64 property timezone : String? - # events use resource_id instead of asset_id + # events use resource_id/resource_ids instead of asset_id/asset_ids property asset_id : String? property asset_ids : Array(String) = [] of String property resource_id : String? + property resource_ids : Array(String) = [] of String def asset_id : String - (@asset_id || @resource_id).as(String) + (@asset_id || @resource_id || @asset_ids.first?).as(String) + end + + # Staff booking events report the allocated resource(s) as resource_id / + # resource_ids. Normalise them onto asset_ids so callers can use the same + # accessors for API responses and events. + def after_initialize + return unless @asset_ids.empty? + + @asset_ids = if !@resource_ids.empty? + @resource_ids + elsif asset = (@asset_id || @resource_id) + [asset] + else + [] of String + end end property user_id : String