#4739: Fix product drive delete (updated)

app/controllers/product_drives_controller.rb

@@ -1,7 +1,6 @@
 class ProductDrivesController < ApplicationController
   include Importable
   before_action :set_product_drive, only: [:show, :edit, :update, :destroy]
-  before_action only: :destroy
 
   def index
     setup_date_range_picker
@@ -79,10 +78,10 @@ def update
   def destroy
     result = ProductDriveDestroyService.call(@product_drive, current_user, current_organization)
 
-    if result[:success]
-      redirect_to product_drives_url, notice: result[:message]
+    if result.success?
+      redirect_to product_drives_url, notice: result.value
     else
-      flash[:error] = result[:message]
+      flash[:error] = result.error
       redirect_back(fallback_location: product_drives_url)
     end
   end

app/models/product_drive.rb

@@ -40,8 +40,6 @@ class ProductDrive < ApplicationRecord
 
   validate :end_date_is_bigger_of_end_date
 
-  before_destroy :validate_destroy, prepend: true
-
   def end_date_is_bigger_of_end_date
     return if start_date.nil? || end_date.nil?
 

app/services/product_drive_destroy_service.rb

@@ -1,64 +1,29 @@
 class ProductDriveDestroyService
-  attr_reader :product_drive, :user, :organization
-
-  def initialize(product_drive, user, organization)
-    @product_drive = product_drive
-    @user = user
-    @organization = organization
-  end
-
-  def self.call(product_drive, user, organization)
-    new(product_drive, user, organization).call
-  end
-
-  def self.can_destroy?(product_drive, user)
-    return false unless user.has_role?(Role::ORG_ADMIN, product_drive.organization)
-    product_drive.donations.empty?
-  end
-
-  def call
-    return unauthorized_error unless verify_role
-    return donation_error unless self.class.can_destroy?(product_drive, user)
-
-    product_drive.destroy
-
-    if product_drive.errors.any?
-      {
-        success: false,
-        message: product_drive.errors.full_messages.join("\n")
-      }
-    else
-      {
-        success: true,
-        message: "Product drive was successfully destroyed."
-      }
+  class << self
+    def call(product_drive, user, organization)
+      return Result.new(error: "You are not allowed to perform this action.") unless verify_role(user, organization)
+
+      unless can_destroy?(product_drive, user)
+        product_drive.errors.add(:base, "Cannot delete product drive with donations.")
+        raise ActiveRecord::RecordInvalid.new(product_drive)
+      end
+
+      if product_drive.destroy
+        Result.new(value: "Product drive was successfully destroyed.")
+      else
+        raise ActiveRecord::RecordNotDestroyed.new("Failed to destroy product drive", product_drive)
+      end
     end
-  end
-
-  private
-
-  def verify_role
-    return true if user.has_role?(Role::ORG_ADMIN, @organization)
-    false
-  end
 
-  # def can_destroy?(product_drive, user)
-  #   return false unless user.has_role?(Role::ORG_ADMIN, product_drive.organization)
-
-  #   if product_drive.donations.empty?
-  #     true
-  #   else
-  #     product_drive.errors.add(:base, "Cannot delete product drive with donations.")
-  #     false
-  #   end
-  # end
+    def can_destroy?(product_drive, user)
+      return false unless user.has_role?(Role::ORG_ADMIN, product_drive.organization)
+      product_drive.donations.empty?
+    end
 
-  def unauthorized_error
-    {success: false, message: "You are not allowed to perform this action."}
-  end
+    private
 
-  def donation_error
-    product_drive.errors.add(:base, "Cannot delete product drive with donations.")
-    {success: false, message: "Cannot delete product drive with donations."}
+    def verify_role(user, organization)
+      user.has_role?(Role::ORG_ADMIN, organization)
+    end
   end
 end