Make room delete permanent (#2390)

app/controllers/rooms_controller.rb

@@ -137,7 +137,10 @@ class RoomsController < ApplicationController
     begin
       # Don't delete the users home room.
       raise I18n.t("room.delete.home_room") if @room == @room.owner.main_room
-      @room.destroy
+
+      # Destroy all recordings then permanently delete the room
+      delete_all_recordings(@room.bbb_id)
+      @room.destroy(true)
     rescue => e
       flash[:alert] = I18n.t("room.delete.fail", error: e)
     else

app/controllers/users_controller.rb

@@ -155,6 +155,8 @@ class UsersController < ApplicationController
         # Permanently delete the rooms under the user if they have not been reassigned
         if perm_delete
           @user.rooms.include_deleted.each do |room|
+            # Destroy all recordings then permanently delete the room
+            delete_all_recordings(room.bbb_id)
             room.destroy(true)
           end
         end

spec/controllers/users_controller_spec.rb

@@ -550,6 +550,7 @@ describe UsersController, type: :controller do
     it "allows admins to permanently delete users" do
       allow(Rails.configuration).to receive(:loadbalanced_configuration).and_return(true)
       allow_any_instance_of(User).to receive(:greenlight_account?).and_return(true)
+      allow_any_instance_of(BbbServer).to receive(:delete_all_recordings).and_return("")
       allow_any_instance_of(ApplicationController).to receive(:set_user_domain).and_return("provider1")
       controller.instance_variable_set(:@user_domain, "provider1")
 
@@ -568,6 +569,7 @@ describe UsersController, type: :controller do
     it "permanently deletes the users rooms if the user is permanently deleted" do
       allow(Rails.configuration).to receive(:loadbalanced_configuration).and_return(true)
       allow_any_instance_of(User).to receive(:greenlight_account?).and_return(true)
+      allow_any_instance_of(BbbServer).to receive(:delete_all_recordings).and_return("")
       allow_any_instance_of(ApplicationController).to receive(:set_user_domain).and_return("provider1")
       controller.instance_variable_set(:@user_domain, "provider1")