forest_liana 4.2.0 → 5.0.0.pre.beta.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2b30b26c3afe44df763e7bfc1bc7d0f763bf927
-  data.tar.gz: b03f1798d20593420715c03b68ff31daf39369ee
+  metadata.gz: 919b3681f70c2a7265839b6f26375c066cc04657
+  data.tar.gz: 670e5dcb4227b380f1547262d0dda5715dc7ffae
 SHA512:
-  metadata.gz: b875ee9e95450d54df04e4932b470c9f87a1165b0114a373828879ad5e026fd13182463741eda1bee0d5990e5be55fa8e41e35962358ee36a35b32bf9a1597cd
-  data.tar.gz: df637e24aa4e579bc5b2d3b30b1329b5d30ed8a938665066f2c7350731ee5462de2ac23ce84f5b4ce450fe9f73139606119eb40db81560a07e843fd26ecd03ff
+  metadata.gz: 399a95797f3649fe6f926f76b75241c58ad88f4705e1abfede85e391b08f398fe2c1c909d6451d977c5341d5070c776f81b049383fc8d812775cc20443edb2e7
+  data.tar.gz: 65432f209cc2d54976e7227aca68742093385db4bcc4d0de569c6ef9b4c93757c8cb253393afdb18c8752f3b7e00ff602e768128b76bf4d1d99bfdbc7e65b9b0

data/app/controllers/forest_liana/resources_controller.rb

@@ -137,16 +137,28 @@ module ForestLiana
     end
 
     def destroy
-      begin
-        checker = ForestLiana::PermissionsChecker.new(@resource, 'delete', @rendering_id)
-        return head :forbidden unless checker.is_authorized?
+      checker = ForestLiana::PermissionsChecker.new(@resource, 'delete', @rendering_id)
+      return head :forbidden unless checker.is_authorized?
 
-        @resource.destroy(params[:id]) if @resource.exists?(params[:id])
-        head :no_content
-      rescue => error
-        FOREST_LOGGER.error "Record Destroy error: #{error}\n#{format_stacktrace(error)}"
-        internal_server_error
-      end
+      @resource.destroy(params[:id]) if @resource.exists?(params[:id])
+
+      head :no_content
+    rescue => error
+      FOREST_LOGGER.error "Record Destroy error: #{error}\n#{format_stacktrace(error)}"
+      internal_server_error
+    end
+
+    def destroy_bulk
+      checker = ForestLiana::PermissionsChecker.new(@resource, 'delete', @rendering_id)
+      return head :forbidden unless checker.is_authorized?
+
+      ids = ForestLiana::ResourcesGetter.get_ids_from_request(params)
+      @resource.destroy(ids) if ids&.any?
+
+      head :no_content
+    rescue => error
+      FOREST_LOGGER.error "Records Destroy error: #{error}\n#{format_stacktrace(error)}"
+      internal_server_error
     end
 
     private

data/app/controllers/forest_liana/router.rb

@@ -30,7 +30,11 @@ class ForestLiana::Router
         when 'POST'
           action = 'create'
         when 'DELETE'
-          action = 'destroy'
+          if params[:id]
+            action = 'destroy'
+          else
+            action = 'destroy_bulk'
+          end
         end
 
         controller.action(action.to_sym).call(env)

data/app/services/forest_liana/has_many_dissociator.rb

@@ -14,17 +14,22 @@ module ForestLiana
 
       remove_association = !@with_deletion || @association.macro == :has_and_belongs_to_many
 
-      if remove_association
-        if @data.is_a?(Array)
-          @data.each do |record_deleted|
-            associated_records.delete(@association.klass.find(record_deleted[:id]))
+      if @data.is_a?(Array)
+        record_ids = @data.map { |record| record[:id] }
+      elsif @data.dig('attributes').present?
+        record_ids = ForestLiana::ResourcesGetter.get_ids_from_request(@params)
+      else
+        record_ids = Array.new
+      end
+
+      if !record_ids.nil? && record_ids.any?
+        if remove_association
+          record_ids.each do |id|
+            associated_records.delete(@association.klass.find(id))
           end
         end
-      end
 
-      if @with_deletion
-        if @data.is_a?(Array)
-          record_ids = @data.map { |record| record[:id] }
+        if @with_deletion
           record_ids = record_ids.select { |record_id| @association.klass.exists?(record_id) }
           @association.klass.destroy(record_ids)
         end

data/app/services/forest_liana/has_many_getter.rb

@@ -19,7 +19,7 @@ module ForestLiana
     end
 
     def perform
-      @records = @search_query_builder.perform(@records)
+      @records
     end
 
     def count
@@ -64,10 +64,12 @@ module ForestLiana
     end
 
     def prepare_query
-      @records = get_resource()
-        .find(@params[:id])
-        .send(@params[:association_name])
-        .eager_load(@includes)
+      @records = @search_query_builder.perform(
+        get_resource()
+          .find(@params[:id])
+          .send(@params[:association_name])
+          .eager_load(@includes)
+      )
     end
 
     def offset

data/app/services/forest_liana/resources_getter.rb

@@ -19,6 +19,51 @@ module ForestLiana
       prepare_query()
     end
 
+    def self.get_ids_from_request(params)
+      attributes = params.dig('data', 'attributes')
+      has_body_attributes = attributes != nil
+      is_select_all_records_query = has_body_attributes && attributes[:all_records] == true
+
+      # NOTICE: If it is not a "select all records" query and it receives a list of ID, return list of ID.
+      return attributes[:ids] if (!is_select_all_records_query && attributes[:ids])
+
+      # NOTICE: If it is a "select all records" we have to perform query to build ID list.
+      ids = Array.new
+
+      # NOTICE: Merging all_records_subset_query into attributes preserves filters in HasManyGetter and ResourcesGetter.
+      attributes = attributes.merge(attributes[:all_records_subset_query].dup.to_unsafe_h)
+
+      # NOTICE: Initialize actual resources getter (could either a HasManyGetter or a ResourcesGetter).
+      is_related_data = attributes[:parent_collection_id] &&
+        attributes[:parent_collection_name] &&
+        attributes[:parent_association_name]
+      if is_related_data
+        parent_collection_name = attributes[:parent_collection_name]
+        parent_model = ForestLiana::SchemaUtils.find_model_from_collection_name(parent_collection_name)
+        model = parent_model.reflect_on_association(attributes[:parent_association_name].try(:to_sym))
+        resources_getter = ForestLiana::HasManyGetter.new(parent_model, model, attributes.merge({
+          collection: parent_collection_name,
+          id: attributes[:parent_collection_id],
+          association_name: attributes[:parent_association_name],
+        }))
+      else
+        collection_name = attributes[:collection_name]
+        model = ForestLiana::SchemaUtils.find_model_from_collection_name(collection_name)
+        resources_getter = ForestLiana::ResourcesGetter.new(model, attributes)
+      end
+
+      # NOTICE: build IDs list.
+      resources_getter.query_for_batch.find_in_batches() do |records|
+        ids += records.map { |record| record.id }
+      end
+
+      # NOTICE: remove excluded IDs.
+      ids_excluded = (attributes[:all_records_ids_excluded]).map { |id_excluded| id_excluded.to_s }
+      return ids.select { |id| !ids_excluded.include? id.to_s } if (ids_excluded && ids_excluded.any?)
+
+      return ids
+    end
+
     def perform
       @records = @records.eager_load(@includes)
     end

data/config/routes.rb

@@ -53,6 +53,7 @@ ForestLiana::Engine.routes.draw do
   post ':collection', to: router
   put ':collection/:id', to: router
   delete ':collection/:id', to: router
+  delete ':collection', to: router
 
   # Smart Actions forms value
   post 'actions/:action_name/values' => 'actions#values'

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "4.2.0"
+  VERSION = "5.0.0-beta.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 5.0.0.pre.beta.0
 platform: ruby
 authors:
 - Sandro Munda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-22 00:00:00.000000000 Z
+date: 2020-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -453,9 +453,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.14