forest_liana 8.0.12 → 8.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6592c0518a6920b5890863db5cb955631b701a72945ae502c22dda2709108bb5
-  data.tar.gz: 4706528fb145a74b3baa116129e93b1be5e5f4834c04bedb697309968cea237a
+  metadata.gz: 26515d9f2fe7d7fab4a83357eb633fef70a24497248f819dc49f816376adaa66
+  data.tar.gz: 6bf44ca7efa508c656765028ce332ce7c56d104be9e7977ac5a341f91c334e67
 SHA512:
-  metadata.gz: 07d2ea92279c1e33d990a68ca9f22dbbcd072638ff70405806d2d6ebeb13666caa660f2168cf8e34646651027c5da5ba4e865b3ada9e54091ed045a3fc66fb76
-  data.tar.gz: 8edd86befccab8acd25a5b4307009899e3ec6f2fc3b76671c348caf51934308e60fbfc58bd46eea861afc7bc6a90f11c3a98719725e99de91c5298e8f5865b81
+  metadata.gz: 301867aadc94a7d2525331746d79c8464bb27c0f2009182485893671f9c0e1bddb539145d8dd55158dfa8376ac482d6c7c491916b0b5b7a8df138032b2b5b87b
+  data.tar.gz: 929e363b0e2d19fc2b2472eb54d1b82fbe30bc4966ce45f34cedd2c06163c45596692c9b253a8743aa91cef8feb603020b1fd2bab23b63069d06098868fad80d

data/app/controllers/forest_liana/resources_controller.rb

@@ -129,7 +129,7 @@ module ForestLiana
 
     def destroy
       forest_authorize!('delete', forest_user, @resource)
-        begin
+      begin
         collection_name = ForestLiana.name_for(@resource)
         scoped_records = ForestLiana::ScopeManager.apply_scopes_on_records(@resource, forest_user, collection_name, params[:timezone])
 
@@ -137,9 +137,12 @@ module ForestLiana
           return render serializer: nil, json: { status: 404 }, status: :not_found
         end
 
-        scoped_records.destroy(params[:id])
-
-        head :no_content
+        if scoped_records.destroy(params[:id])
+          head :no_content
+        else
+          restrict_error = ActiveRecord::DeleteRestrictionError.new
+          render json: { errors: [{ status: :bad_request, detail: restrict_error.message }] }, status: :bad_request
+        end
       rescue => error
         FOREST_REPORTER.report error
         FOREST_LOGGER.error "Record Destroy error: #{error}\n#{format_stacktrace(error)}"
@@ -151,9 +154,14 @@ module ForestLiana
       forest_authorize!('delete', forest_user, @resource)
       begin
         ids = ForestLiana::ResourcesGetter.get_ids_from_request(params, forest_user)
-        @resource.destroy(ids) if ids&.any?
-
-        head :no_content
+        @resource.transaction do
+          ids.each do |id|
+            record = @resource.find(id)
+            record.destroy!
+          end
+        end
+      rescue ActiveRecord::RecordNotDestroyed => error
+        render json: { errors: [{ status: :bad_request, detail: error.message }] }, status: :bad_request
       rescue => error
         FOREST_REPORTER.report error
         FOREST_LOGGER.error "Records Destroy error: #{error}\n#{format_stacktrace(error)}"

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "8.0.12"
+  VERSION = "8.0.13"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 8.0.12
+  version: 8.0.13
 platform: ruby
 authors:
 - Sandro Munda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-07 00:00:00.000000000 Z
+date: 2023-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails