Handle deleting appointments; fixes #2929:

Author: cbeer

app/components/aeon/appointment_component.html.erb

@@ -4,9 +4,11 @@
     <%= link_to edit_aeon_appointment_path(appointment.id), data: { action: 'modal#open' } do %>
       <i class="bi bi-pencil-fill me-1"></i>Edit appointment
     <% end %>
-    <%= link_to aeon_appointment_path(appointment.id), data: { turbo_method: :delete }, aria: { label: 'Delete'} do %>
-      <i class="bi bi-trash"></i>
-    <% end %>
+      <% if helpers.can? :destroy, appointment %>
+        <button class="btn btn-link su-underline p-0" data-bs-toggle="modal" data-bs-target="#delete-appointment-<%= @appointment.id %>">
+          <i class="bi bi-trash align-middle"></i><span class="visually-hidden">Delete appointment</span>
+        </button>
+      <% end %>
   </div>
   <div class="card-body">
     <% if appointment.requests.present? %>
@@ -40,4 +42,31 @@
       </div>
     <% end %>
   </div>
+  <!-- Delete modal -->
+  <div class="modal fade" id="delete-appointment-<%= appointment.id %>" tabindex="-1" aria-labelledby="title-appointment-<%= appointment.id %>" aria-hidden="true">
+    <div class="modal-dialog modal-dialog-centered">
+      <div class="modal-content">
+        <div class="modal-header">
+          <h2 class="modal-title" id="title-appointment-<%= appointment.id %>">Delete appointment?</h2>
+          <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+        </div>
+        <div class="modal-body fw-normal">
+          <div class="mb-2"><%= appointment.reading_room.name %></div>
+          <div class="my-2"><i class="bi bi-calendar me-2"></i><%= appointment_date %><i class="bi bi-clock mx-2"></i><%= appointment_time_range %></div>
+          <% if appointment.requests.any? %>
+            <p class="mb-0">
+              <%= pluralize(appointment.requests.length, 'requested item') %> are assigned to this appointment. If you cancel or delete the appointment, the items will not be deleted.
+              Instead, they will be moved to <strong>Draft requests</strong>.
+            </p>
+          <% end %>
+        </div>
+        <div class="modal-footer">
+          <button type="button" class="btn btn-outline-primary" data-bs-dismiss="modal">No</button>
+          <%= form_with url: aeon_appointment_path(appointment.id), method: 'delete' do %>
+            <button type="submit" class="btn btn-primary" data-bs-dismiss="modal">Yes - Delete</button>
+          <% end %>
+        </div>
+      </div>
+    </div>
+  </div>
 </div>

app/components/aeon/appointment_component.rb

@@ -16,5 +16,9 @@ def appointment_time_range
 
       "#{start} - #{stop} (#{appointment.start_time.zone})"
     end
+
+    def appointment_date
+      appointment.start_time.strftime('%b %-d, %Y')
+    end
   end
 end

app/components/aeon/request_actions_component.html.erb

@@ -10,7 +10,7 @@
           <% end %>
         <% end %>
         <% if helpers.can? :destroy, request %>
-          <button class="btn btn-link su-underline p-0" type="submit" data-bs-toggle="modal" data-bs-target="#delete-<%= transaction_number %>">
+          <button class="btn btn-link su-underline p-0" data-bs-toggle="modal" data-bs-target="#delete-<%= transaction_number %>">
             <i class="bi bi-trash align-middle"></i><span class="visually-hidden">Delete <%= title %> request</span>
           </button>
         <% end %>

app/controllers/aeon_appointments_controller.rb

@@ -81,9 +81,15 @@ def update # rubocop:disable Metrics/AbcSize
     redirect_to aeon_appointments_path, notice: 'Appointment created successfully'
   end
 
-  def destroy
+  def destroy # rubocop:disable Metrics/AbcSize
     authorize! :delete, @appointment
-    AeonClient.new.cancel_appointment(params[:id])
+
+    @appointment.requests.each do |request|
+      aeon_client.update_request(request.transaction_number, AeonClient::DeleteAppointmentRequestData.new)
+      aeon_client.update_request_route(transaction_number: request.transaction_number,
+                                       status: Settings.aeon.queue_names.draft.transaction.first)
+    end
+    aeon_client.cancel_appointment(params[:id])
 
     redirect_to aeon_appointments_path, notice: 'Appointment cancelled successfully'
   end

app/controllers/aeon_requests_controller.rb

@@ -31,7 +31,7 @@ def submitted
   def resubmit
     authorize! :update, @aeon_request
 
-    AeonClient.new.update_request_route(transaction_number: params[:id], status: 'Submitted by User')
+    aeon_client.update_request_route(transaction_number: params[:id], status: 'Submitted by User')
     respond_to do |format|
       format.turbo_stream { render turbo_stream: turbo_stream.remove("request-#{params[:id]}") }
     end
@@ -46,7 +46,7 @@ def edit
   def update # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
     authorize! :update, @aeon_request
 
-    new_request = AeonClient.new.update_request(
+    new_request = aeon_client.update_request(
       @aeon_request.transaction_number,
       AeonClient::RequestData.with_defaults.with(
         appointment_id: aeon_request_params[:appointment_id]&.to_i,
@@ -68,7 +68,7 @@ def update # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
   def destroy
     authorize! :destroy, @aeon_request
 
-    AeonClient.new.update_request_route(transaction_number: params[:id], status: 'Cancelled by User')
+    aeon_client.update_request_route(transaction_number: params[:id], status: 'Cancelled by User')
     respond_to do |format|
       format.turbo_stream { render turbo_stream: turbo_stream.remove(@aeon_request) }
     end

app/controllers/concerns/aeon_controller.rb

@@ -11,4 +11,8 @@ module AeonController
   def current_ability
     @current_ability ||= SiteAbility.new(current_user).merge(AeonAbility.new(current_user.aeon))
   end
+
+  def aeon_client
+    @aeon_client ||= AeonClient.new
+  end
 end

app/services/aeon_client.rb

@@ -188,6 +188,15 @@ def self.with_defaults
     end
   end
 
+  # Special payload for removing an appointment from a request
+  class DeleteAppointmentRequestData
+    def as_patch_json
+      [
+        { op: 'remove', path: '/appointmentId' }
+      ]
+    end
+  end
+
   private
 
   def get(path, params: nil)