Prevent errors when destroying not-found records

Author: lukearndt

app/controllers/measure_categories_controller.rb

@@ -46,6 +46,9 @@ def destroy
   def set_and_authorize_measure_category
     @measure_category = policy_scope(base_object).find(params[:id])
     authorize @measure_category
+  rescue ActiveRecord::RecordNotFound
+    raise unless action_name == "destroy"
+    head :no_content
   end
 
   def base_object

app/controllers/recommendation_categories_controller.rb

@@ -45,6 +45,9 @@ def destroy
   def set_and_authorize_recommendation_category
     @recommendation_category = policy_scope(base_object).find(params[:id])
     authorize @recommendation_category
+  rescue ActiveRecord::RecordNotFound
+    raise unless action_name == "destroy"
+    head :no_content
   end
 
   def base_object

app/controllers/user_categories_controller.rb

@@ -45,6 +45,9 @@ def destroy
   def set_and_authorize_user_category
     @user_category = policy_scope(base_object).find(params[:id])
     authorize @user_category
+  rescue ActiveRecord::RecordNotFound
+    raise unless action_name == "destroy"
+    head :no_content
   end
 
   def base_object

spec/controllers/measure_categories_controller_spec.rb

@@ -97,7 +97,7 @@
 
     context "when user signed in" do
       let(:guest) { FactoryBot.create(:user) }
-      let(:user) { FactoryBot.create(:user, :manager) }
+      let(:manager) { FactoryBot.create(:user, :manager) }
       let(:contributor) { FactoryBot.create(:user, :contributor) }
 
       it "will not allow a guest to delete a measure_category" do
@@ -111,9 +111,20 @@
       end
 
       it "will allow a manager to delete a measure_category" do
-        sign_in user
+        sign_in manager
         expect(subject).to be_no_content
       end
+
+      context "when the measure_category does not exist" do
+        let(:measure_category) do
+          {id: -1}
+        end
+
+        it "returns the same response as a successful deletion" do
+          sign_in manager
+          expect(subject).to be_no_content
+        end
+      end
     end
   end
 end

spec/controllers/recommendation_categories_controller_spec.rb

@@ -96,7 +96,7 @@
 
     context "when user signed in" do
       let(:guest) { FactoryBot.create(:user) }
-      let(:user) { FactoryBot.create(:user, :manager) }
+      let(:manager) { FactoryBot.create(:user, :manager) }
       let(:contributor) { FactoryBot.create(:user, :contributor) }
 
       it "will not allow a guest to delete a recommendation_category" do
@@ -110,9 +110,20 @@
       end
 
       it "will allow a manager to delete a recommendation_category" do
-        sign_in user
+        sign_in manager
         expect(subject).to be_no_content
       end
+
+      context "when the recommendation_category does not exist" do
+        let(:recommendation_category) do
+          {id: -1}
+        end
+
+        it "returns the same response as a successful deletion" do
+          sign_in manager
+          expect(subject).to be_no_content
+        end
+      end
     end
   end
 end

spec/controllers/user_categories_controller_spec.rb

@@ -104,7 +104,7 @@
 
     context "when user signed in" do
       let(:guest) { FactoryBot.create(:user) }
-      let(:user) { FactoryBot.create(:user, :manager) }
+      let(:manager) { FactoryBot.create(:user, :manager) }
       let(:contributor) { FactoryBot.create(:user, :contributor) }
 
       it "will not allow a guest to delete a user_category" do
@@ -118,9 +118,20 @@
       end
 
       it "will allow a manager to delete a user_category" do
-        sign_in user
+        sign_in manager
         expect(subject).to be_no_content
       end
+
+      context "when the user_category does not exist" do
+        let(:user_category) do
+          {id: -1}
+        end
+
+        it "returns the same response as a successful deletion" do
+          sign_in manager
+          expect(subject).to be_no_content
+        end
+      end
     end
   end
 end