Merge pull request #3394 from mkllnk/3021-update-soft-delete

[Spree upgrade] 3021 update soft delete

app/controllers/spree/admin/products_controller_decorator.rb

@@ -78,8 +78,13 @@ Spree::Admin::ProductsController.class_eval do
     params[:q][:deleted_at_null] ||= "1"
 
     params[:q][:s] ||= "name asc"
-
-    @search = Spree::Product.ransack(params[:q]) # this line is modified - hit Spree::Product instead of super, avoiding cancan error for fetching records with block permissions via accessible_by
+    # The next line is modified.
+    # Hit Spree::Product instead of super, avoiding cancan error for fetching
+    # records with block permissions via accessible_by.
+    @collection = Spree::Product
+    @collection = @collection.with_deleted if params[:q].delete(:deleted_at_null).blank?
+    # @search needs to be defined as this is passed to search_form_for
+    @search = @collection.ransack(params[:q])
     @collection = @search.result.
       managed_by(spree_current_user). # this line is added to the original spree code!!!!!
       group_by_products_id.

app/controllers/spree/admin/variants_controller_decorator.rb

@@ -10,8 +10,11 @@ Spree::Admin::VariantsController.class_eval do
 
   def destroy
     @variant = Spree::Variant.find(params[:id])
-    @variant.delete # This line changed, as well as removal of following conditional
-    flash[:success] = I18n.t('notice_messages.variant_deleted')
+    if VariantDeleter.new.delete(@variant) # This line changed
+      flash[:success] = Spree.t('notice_messages.variant_deleted')
+    else
+      flash[:success] = Spree.t('notice_messages.variant_not_deleted')
+    end
 
     respond_with(@variant) do |format|
       format.html { redirect_to admin_product_variants_url(params[:product_id]) }

app/controllers/spree/api/products_controller_decorator.rb

@@ -33,7 +33,7 @@ Spree::Api::ProductsController.class_eval do
     authorize! :delete, Spree::Product
     @product = find_product(params[:product_id])
     authorize! :delete, @product
-    @product.delete
+    @product.destroy
     respond_with(@product, :status => 204)
   end
 
@@ -56,8 +56,8 @@ Spree::Api::ProductsController.class_eval do
   def product_scope
     if current_api_user.has_spree_role?("admin") || current_api_user.enterprises.present? # This line modified
       scope = Spree::Product
-      unless params[:show_deleted]
-        scope = scope.not_deleted
+      if params[:show_deleted]
+        scope = scope.with_deleted
       end
     else
       scope = Spree::Product.active

app/controllers/spree/api/variants_controller_decorator.rb

@@ -3,7 +3,7 @@ Spree::Api::VariantsController.class_eval do
     @variant = scope.find(params[:variant_id])
     authorize! :delete, @variant
 
-    @variant.delete
+    VariantDeleter.new.delete(@variant)
     respond_with @variant, status: 204
   end
 end

app/models/order_cycle.rb

@@ -146,7 +146,6 @@ class OrderCycle < ActiveRecord::Base
     Spree::Variant.
       joins(:exchanges).
       merge(Exchange.in_order_cycle(self)).
-      not_deleted.
       select('DISTINCT spree_variants.*').
       to_a # http://stackoverflow.com/q/15110166
   end
@@ -163,9 +162,8 @@ class OrderCycle < ActiveRecord::Base
   def variants_distributed_by(distributor)
     return Spree::Variant.where("1=0") unless distributor.present?
     Spree::Variant.
-      not_deleted.
-      merge(distributor.inventory_variants).
       joins(:exchanges).
+      merge(distributor.inventory_variants).
       merge(Exchange.in_order_cycle(self)).
       merge(Exchange.outgoing).
       merge(Exchange.to_enterprise(distributor))

app/models/product_import/entry_processor.rb

@@ -49,7 +49,6 @@ module ProductImport
             VariantOverride.for_hubs([enterprise_id]).count
           else
             Spree::Variant.
-              not_deleted.
               not_master.
               joins(:product).
               where('spree_products.supplier_id IN (?)', enterprise_id).

app/models/spree/product_decorator.rb

@@ -202,20 +202,18 @@ Spree::Product.class_eval do
     end
   end
 
-  def delete_with_delete_from_order_cycles
+  def destroy_with_delete_from_order_cycles
     transaction do
       OpenFoodNetwork::ProductsCache.product_deleted(self) do
-        # Touch supplier and distributors as we would on #destroy
-        self.supplier.touch
         touch_distributors
 
         ExchangeVariant.where('exchange_variants.variant_id IN (?)', self.variants_including_master.with_deleted).destroy_all
 
-        delete_without_delete_from_order_cycles
+        destroy_without_delete_from_order_cycles
       end
     end
   end
-  alias_method_chain :delete, :delete_from_order_cycles
+  alias_method_chain :destroy, :delete_from_order_cycles
 
 
   def refresh_products_cache

app/models/spree/variant_decorator.rb

@@ -35,7 +35,6 @@ Spree::Variant.class_eval do
 
   scope :with_order_cycles_inner, joins(exchanges: :order_cycle)
 
-  scope :not_deleted, where(deleted_at: nil)
   scope :not_master, where(is_master: false)
   scope :in_order_cycle, lambda { |order_cycle|
     with_order_cycles_inner.
@@ -105,19 +104,6 @@ Spree::Variant.class_eval do
     OpenFoodNetwork::EnterpriseFeeCalculator.new(distributor, order_cycle).fees_by_type_for self
   end
 
-  def delete
-    if product.variants == [self] # Only variant left on product
-      errors.add :product, I18n.t(:spree_variant_product_error)
-      false
-    else
-      transaction do
-        self.update_column(:deleted_at, Time.zone.now)
-        ExchangeVariant.where(variant_id: self).destroy_all
-        self
-      end
-    end
-  end
-
   def refresh_products_cache
     if is_master?
       product.refresh_products_cache

app/serializers/api/admin/for_order_cycle/enterprise_serializer.rb

@@ -31,9 +31,9 @@ class Api::Admin::ForOrderCycle::EnterpriseSerializer < ActiveModel::Serializer
   def products
     return @products unless @products.nil?
     @products = if order_cycle.prefers_product_selection_from_coordinator_inventory_only?
-      object.supplied_products.not_deleted.visible_for(order_cycle.coordinator)
+      object.supplied_products.visible_for(order_cycle.coordinator)
     else
-      object.supplied_products.not_deleted
+      object.supplied_products
     end
   end
 

app/services/variant_deleter.rb

@@ -0,0 +1,17 @@
+# Checks the validity of a soft-delete call.
+class VariantDeleter
+  def delete(variant)
+    if only_variant_on_product?(variant)
+      variant.errors.add :product, I18n.t(:spree_variant_product_error)
+      return false
+    end
+
+    variant.destroy
+  end
+
+  private
+
+  def only_variant_on_product?(variant)
+    variant.product.variants == [variant]
+  end
+end