Merge branch 'nz-justice-development' into master

Author: tmfrnz

Gemfile

@@ -23,6 +23,7 @@ gem "rack-cors", require: "rack/cors"
 gem "rails", "~> 6.0"
 gem "sass-rails", "~> 6.0"
 gem "secure_headers", ">= 3.0"
+gem "with_advisory_lock"
 
 group :production, :staging do
   gem "net-pop"

Gemfile.lock

@@ -446,6 +446,9 @@ GEM
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
+    with_advisory_lock (5.1.0)
+      activerecord (>= 6.1)
+      zeitwerk (>= 2.6)
     xpath (3.2.0)
       nokogiri (~> 1.8)
     zeitwerk (2.7.1)
@@ -502,6 +505,7 @@ DEPENDENCIES
   standard
   timecop
   web-console (~> 4.1)
+  with_advisory_lock
 
 RUBY VERSION
    ruby 3.3.1p55

app/controllers/measure_categories_controller.rb

@@ -20,7 +20,7 @@ def create
     @measure_category.assign_attributes(permitted_attributes(@measure_category))
     authorize @measure_category
 
-    if @measure_category.save
+    if @measure_category.save_with_cleanup
       render json: serialize(@measure_category), status: :created, location: @measure_category
     else
       render json: @measure_category.errors, status: :unprocessable_entity
@@ -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

@@ -20,7 +20,7 @@ def create
     @recommendation_category.assign_attributes(permitted_attributes(@recommendation_category))
     authorize @recommendation_category
 
-    if @recommendation_category.save
+    if @recommendation_category.save_with_cleanup
       render json: serialize(@recommendation_category), status: :created, location: @recommendation_category
     else
       render json: @recommendation_category.errors, status: :unprocessable_entity
@@ -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/sdgtarget_categories_controller.rb

@@ -20,7 +20,7 @@ def create
     @user_category.assign_attributes(permitted_attributes(@user_category))
     authorize @user_category
 
-    if @user_category.save
+    if @user_category.save_with_cleanup
       render json: serialize(@user_category), status: :created, location: @user_category
     else
       render json: @user_category.errors, status: :unprocessable_entity
@@ -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