dscf-marketplace 0.1.8 → 0.2.0

data/app/models/dscf/marketplace/delivery_order_item.rb

@@ -20,6 +20,15 @@ module Dscf::Marketplace
 
     before_save :calculate_verification_totals
 
+    # Ransack configuration for secure filtering
+    def self.ransackable_attributes(_auth_object = nil)
+      %w[id delivery_order_id order_item_id pickup_address_id dropoff_address_id quantity status pickup_verified_quantity dropoff_verified_quantity damaged_quantity missing_quantity receiver_confirmed_by receiver_confirmed_at receiver_notes handoff_checklist_completed created_at updated_at]
+    end
+
+    def self.ransackable_associations(_auth_object = nil)
+      %w[delivery_order order_item pickup_address dropoff_address]
+    end
+
     def pending?
       status == "pending"
     end

data/app/models/dscf/marketplace/delivery_vehicle.rb

@@ -14,6 +14,15 @@ module Dscf
       validates :model, length: {maximum: 50}, allow_blank: true
       validates :color, length: {maximum: 30}, allow_blank: true
 
+      # Ransack configuration for secure filtering
+      def self.ransackable_attributes(_auth_object = nil)
+        %w[id driver_id plate_number vehicle_type year brand model color created_at updated_at]
+      end
+
+      def self.ransackable_associations(_auth_object = nil)
+        %w[driver delivery_orders]
+      end
+
       def motorcycle?
         vehicle_type == "motorcycle"
       end

data/app/models/dscf/marketplace/listing.rb

@@ -21,6 +21,15 @@ module Dscf::Marketplace
     scope :by_business, ->(business_id) { where(business_id: business_id) }
     scope :owned_by, ->(business) { where(business: business) }
 
+    # Ransack configuration for secure filtering
+    def self.ransackable_attributes(_auth_object = nil)
+      %w[id business_id supplier_product_id price quantity status created_at updated_at]
+    end
+
+    def self.ransackable_associations(_auth_object = nil)
+      %w[business supplier_product order_items]
+    end
+
     # Custom methods
     def total_value
       price * quantity

data/app/models/dscf/marketplace/order.rb

@@ -18,6 +18,15 @@ module Dscf::Marketplace
 
     before_save :calculate_total_amount
 
+    # Ransack configuration for secure filtering
+    def self.ransackable_attributes(_auth_object = nil)
+      %w[id quotation_id listing_id user_id delivery_order_id order_type status fulfillment_type total_amount created_at updated_at]
+    end
+
+    def self.ransackable_associations(_auth_object = nil)
+      %w[quotation listing user delivery_order order_items]
+    end
+
     def self.create_from_quotation(quotation)
       return nil unless quotation.accepted?
 

data/app/models/dscf/marketplace/order_item.rb

@@ -15,6 +15,15 @@ module Dscf::Marketplace
     validates :unit, presence: true
     validate :quotation_item_or_listing_present
 
+    # Ransack configuration for secure filtering
+    def self.ransackable_attributes(_auth_object = nil)
+      %w[id order_id quotation_item_id listing_id product_id unit_id quantity unit_price status created_at updated_at]
+    end
+
+    def self.ransackable_associations(_auth_object = nil)
+      %w[order quotation_item listing product unit]
+    end
+
     def subtotal
       quantity * unit_price
     end

data/app/models/dscf/marketplace/product.rb

@@ -27,6 +27,15 @@ module Dscf
       scope :by_category, ->(category_id) { where(category_id: category_id) }
       scope :by_unit, ->(unit_id) { where(unit_id: unit_id) }
 
+      # Ransack configuration for secure filtering
+      def self.ransackable_attributes(_auth_object = nil)
+        %w[id sku name description category_id unit_id base_price base_quantity business_only created_at updated_at]
+      end
+
+      def self.ransackable_associations(_auth_object = nil)
+        %w[category unit supplier_products listings order_items rfq_items quotation_items]
+      end
+
       def display_name
         "#{name} (#{sku})"
       end

data/app/models/dscf/marketplace/quotation.rb

@@ -22,6 +22,15 @@ module Dscf
       scope :valid_quotations, -> { where("valid_until > ?", Time.current) }
       scope :expired_quotations, -> { where("valid_until <= ?", Time.current) }
 
+      # Ransack configuration for secure filtering
+      def self.ransackable_attributes(_auth_object = nil)
+        %w[id request_for_quotation_id business_id total_price delivery_date valid_until status notes created_at updated_at]
+      end
+
+      def self.ransackable_associations(_auth_object = nil)
+        %w[request_for_quotation business quotation_items order]
+      end
+
       def calculate_total_price
         self.total_price = quotation_items.sum(&:subtotal).to_f
       end

data/app/models/dscf/marketplace/quotation_item.rb

@@ -6,8 +6,6 @@ module Dscf
       belongs_to :product, class_name: "Dscf::Marketplace::Product"
       belongs_to :unit, class_name: "Dscf::Marketplace::Unit"
 
-
-
       validates :quotation_id, presence: true
       validates :rfq_item_id, presence: true
       validates :product_id, presence: true
@@ -15,19 +13,25 @@ module Dscf
       validates :unit_id, presence: true
       validates :unit_price, numericality: {greater_than: 0}, allow_nil: true
       validates :subtotal, numericality: {greater_than_or_equal_to: 0}, allow_nil: true
-
       validate :product_matches_rfq_item
       validate :unit_compatible_with_product
-      before_save :calculate_subtotal, if: :unit_price_changed?
-
-      # Only validate subtotal calculation if both unit_price and quantity are present
       validate :subtotal_matches_calculation, if: :should_validate_subtotal?
+      before_save :calculate_subtotal, if: :should_recalculate_subtotal?
 
       scope :priced, -> { where.not(unit_price: nil) }
       scope :unpriced, -> { where(unit_price: nil) }
       scope :by_product, ->(product_id) { where(product_id: product_id) }
       scope :by_unit, ->(unit_id) { where(unit_id: unit_id) }
 
+      # Ransack configuration for secure filtering
+      def self.ransackable_attributes(_auth_object = nil)
+        %w[id quotation_id rfq_item_id product_id unit_id quantity unit_price subtotal created_at updated_at]
+      end
+
+      def self.ransackable_associations(_auth_object = nil)
+        %w[quotation rfq_item product unit]
+      end
+
       def product_name
         product&.name
       end
@@ -69,8 +73,7 @@ module Dscf
       def matches_rfq_request?
         return false unless rfq_item
 
-        product_id == rfq_item.product_id &&
-        unit_id == rfq_item.unit_id
+        product_id == rfq_item.product_id && unit_id == rfq_item.unit_id
       end
 
       def can_create_order?
@@ -82,9 +85,36 @@ module Dscf
       def calculate_subtotal
         return unless unit_price && quantity
 
-        self.subtotal = unit_price * quantity
+        self.subtotal = (unit_price * quantity).round(2)
       end
 
+      # Calculate subtotal automatically if not set
+      def calculated_subtotal
+        return subtotal if subtotal.present?
+        return nil unless unit_price && quantity
+
+        (unit_price * quantity).round(2)
+      end
+
+      # Override subtotal setter to allow validation to work
+      def subtotal=(value)
+        # Allow any value to be set for validation purposes
+        super
+      end
+      public :subtotal=
+
+      # Override subtotal getter to calculate if not set
+      def subtotal
+        stored_value = super
+        # If we have a stored value (including 0), return it
+        # Only calculate if it's nil and we have the required fields
+        return stored_value unless stored_value.nil?
+        return nil unless unit_price && quantity
+
+        (unit_price * quantity).round(2)
+      end
+      public :subtotal
+
       def product_matches_rfq_item
         return unless rfq_item_id && product_id
 
@@ -104,14 +134,23 @@ module Dscf
       def subtotal_matches_calculation
         return unless should_validate_subtotal?
 
-        expected_subtotal = unit_price * quantity
-        unless subtotal == expected_subtotal
+        # Calculate what the subtotal should be based on current unit_price and quantity
+        expected_subtotal = (unit_price * quantity).round(2)
+
+        # If subtotal is stored and doesn't match, that's an error
+        # If subtotal is nil, we'll let the before_save callback handle it
+        if subtotal.present? && subtotal.round(2) != expected_subtotal
           errors.add(:subtotal, "must equal unit_price * quantity")
         end
       end
 
       def should_validate_subtotal?
-        unit_price.present? && quantity.present? && subtotal.present?
+        # Only validate if subtotal is explicitly set and we have unit_price and quantity
+        unit_price.present? && quantity.present? && subtotal.present? && subtotal_changed?
+      end
+
+      def should_recalculate_subtotal?
+        unit_price_changed? || quantity_changed?
       end
     end
   end

data/app/models/dscf/marketplace/request_for_quotation.rb

@@ -14,6 +14,15 @@ module Dscf
       validate :selected_quotation_belongs_to_this_rfq
       scope :by_user, ->(user_id) { where(user_id: user_id) }
 
+      # Ransack configuration for secure filtering
+      def self.ransackable_attributes(_auth_object = nil)
+        %w[id user_id selected_quotation_id status notes created_at updated_at]
+      end
+
+      def self.ransackable_associations(_auth_object = nil)
+        %w[user selected_quotation rfq_items quotations]
+      end
+
       def draft?
         status == "draft"
       end

data/app/models/dscf/marketplace/rfq_item.rb

@@ -18,6 +18,15 @@ module Dscf
       scope :by_product, ->(product_id) { where(product_id: product_id) }
       scope :by_unit, ->(unit_id) { where(unit_id: unit_id) }
 
+      # Ransack configuration for secure filtering
+      def self.ransackable_attributes(_auth_object = nil)
+        %w[id request_for_quotation_id product_id unit_id quantity notes created_at updated_at]
+      end
+
+      def self.ransackable_associations(_auth_object = nil)
+        %w[request_for_quotation product unit quotation_items]
+      end
+
       def product_name
         product&.name
       end

data/app/models/dscf/marketplace/supplier_product.rb

@@ -22,6 +22,15 @@ module Dscf::Marketplace
     scope :by_business, ->(business_id) { where(business_id: business_id) }
     scope :by_product, ->(product_id) { where(product_id: product_id) }
 
+    # Ransack configuration for secure filtering
+    def self.ransackable_attributes(_auth_object = nil)
+      %w[id business_id product_id supplier_price available_quantity minimum_order_quantity status created_at updated_at]
+    end
+
+    def self.ransackable_associations(_auth_object = nil)
+      %w[business product listings order_items]
+    end
+
     # Custom methods
     def in_stock?
       available_quantity > 0

data/app/models/dscf/marketplace/unit.rb

@@ -24,6 +24,15 @@ module Dscf
 
       scope :by_type, ->(type) { where(unit_type: unit_types[type]) }
 
+      # Ransack configuration for secure filtering
+      def self.ransackable_attributes(_auth_object = nil)
+        %w[id code name unit_type created_at updated_at]
+      end
+
+      def self.ransackable_associations(_auth_object = nil)
+        %w[unit_conversions products supplier_products listings order_items rfq_items quotation_items]
+      end
+
       def display_name
         "#{name} (#{code})"
       end

data/app/models/dscf/marketplace/unit_conversion.rb

@@ -11,6 +11,15 @@ module Dscf
 
       validate :units_must_be_different
 
+      # Ransack configuration for secure filtering
+      def self.ransackable_attributes(_auth_object = nil)
+        %w[id from_unit_id to_unit_id conversion_factor notes created_at updated_at]
+      end
+
+      def self.ransackable_associations(_auth_object = nil)
+        %w[from_unit to_unit]
+      end
+
       def units_must_be_different
         return unless from_unit_id && to_unit_id
 

data/app/serializers/dscf/marketplace/category_serializer.rb

@@ -0,0 +1,11 @@
+module Dscf
+  module Marketplace
+    class CategorySerializer < ActiveModel::Serializer
+      attributes :id, :name, :description, :parent_id, :created_at, :updated_at
+
+      belongs_to :parent, serializer: CategorySerializer
+      has_many :subcategories, serializer: CategorySerializer
+      has_many :products
+    end
+  end
+end

data/app/serializers/dscf/marketplace/delivery_order_item_serializer.rb

@@ -0,0 +1,17 @@
+module Dscf
+  module Marketplace
+    class DeliveryOrderItemSerializer < ActiveModel::Serializer
+      attributes :id, :delivery_order_id, :order_item_id, :pickup_address_id, :dropoff_address_id,
+        :quantity, :status, :pickup_verified_quantity, :dropoff_verified_quantity,
+        :damaged_quantity, :missing_quantity, :receiver_confirmed_by,
+        :receiver_confirmed_at, :receiver_notes, :handoff_checklist_completed,
+        :created_at, :updated_at, :product_name, :unit_name, :verification_complete?,
+        :has_discrepancy?, :discrepancy_amount, :requires_resolution?
+
+      belongs_to :delivery_order
+      belongs_to :order_item
+      belongs_to :pickup_address
+      belongs_to :dropoff_address
+    end
+  end
+end

data/app/serializers/dscf/marketplace/delivery_order_serializer.rb

@@ -0,0 +1,17 @@
+module Dscf
+  module Marketplace
+    class DeliveryOrderSerializer < ActiveModel::Serializer
+      attributes :id, :driver_id, :pickup_address_id, :delivery_vehicle_id, :status,
+        :vehicle_type, :estimated_delivery_price, :actual_delivery_price,
+        :estimated_delivery_time, :actual_delivery_time, :delivery_notes,
+        :created_at, :updated_at, :total_items, :total_orders, :delivery_duration,
+        :on_time?, :all_handoffs_confirmed?
+
+      belongs_to :driver
+      belongs_to :pickup_address
+      belongs_to :delivery_vehicle
+      has_many :delivery_order_items
+      has_many :marketplace_orders
+    end
+  end
+end

data/app/serializers/dscf/marketplace/delivery_vehicle_serializer.rb

@@ -0,0 +1,12 @@
+module Dscf
+  module Marketplace
+    class DeliveryVehicleSerializer < ActiveModel::Serializer
+      attributes :id, :driver_id, :plate_number, :vehicle_type, :year, :brand,
+        :model, :color, :created_at, :updated_at, :display_name,
+        :total_deliveries, :success_rate
+
+      belongs_to :driver
+      has_many :delivery_orders
+    end
+  end
+end

data/app/serializers/dscf/marketplace/listing_serializer.rb

@@ -0,0 +1,13 @@
+module Dscf
+  module Marketplace
+    class ListingSerializer < ActiveModel::Serializer
+      attributes :id, :business_id, :supplier_product_id, :price, :quantity,
+        :status, :created_at, :updated_at, :total_value, :margin,
+        :margin_percentage, :available?
+
+      belongs_to :business
+      belongs_to :supplier_product
+      has_many :order_items
+    end
+  end
+end

data/app/serializers/dscf/marketplace/order_item_serializer.rb

@@ -0,0 +1,16 @@
+module Dscf
+  module Marketplace
+    class OrderItemSerializer < ActiveModel::Serializer
+      attributes :id, :order_id, :quotation_item_id, :listing_id,
+        :product_id, :unit_id, :quantity, :unit_price,
+        :status, :created_at, :updated_at,
+        :subtotal, :product_name, :unit_name
+
+      belongs_to :order
+      belongs_to :quotation_item
+      belongs_to :listing
+      belongs_to :product
+      belongs_to :unit
+    end
+  end
+end

data/app/serializers/dscf/marketplace/order_serializer.rb

@@ -0,0 +1,15 @@
+module Dscf
+  module Marketplace
+    class OrderSerializer < ActiveModel::Serializer
+      attributes :id, :quotation_id, :listing_id, :user_id, :delivery_order_id,
+        :order_type, :status, :fulfillment_type, :total_amount,
+        :created_at, :updated_at
+
+      belongs_to :quotation
+      belongs_to :listing
+      belongs_to :user
+      belongs_to :delivery_order
+      has_many :order_items
+    end
+  end
+end

data/app/serializers/dscf/marketplace/product_serializer.rb

@@ -0,0 +1,13 @@
+module Dscf
+  module Marketplace
+    class ProductSerializer < ActiveModel::Serializer
+      attributes :id, :sku, :name, :description, :category_id, :unit_id,
+        :base_price, :base_quantity, :business_only, :created_at, :updated_at,
+        :display_name, :price_per_unit, :thumbnail_url, :images_urls
+
+      belongs_to :category
+      belongs_to :unit
+      has_many :supplier_products
+    end
+  end
+end

data/app/serializers/dscf/marketplace/quotation_item_serializer.rb

@@ -0,0 +1,16 @@
+module Dscf
+  module Marketplace
+    class QuotationItemSerializer < ActiveModel::Serializer
+      attributes :id, :quotation_id, :rfq_item_id, :product_id, :unit_id, :quantity,
+        :unit_price, :subtotal, :created_at, :updated_at, :product_name,
+        :product_sku, :unit_name, :unit_code, :rfq_requested_quantity,
+        :quantity_difference, :quantity_difference_percentage, :price_per_base_unit,
+        :matches_rfq_request?, :can_create_order?
+
+      belongs_to :quotation
+      belongs_to :rfq_item
+      belongs_to :product
+      belongs_to :unit
+    end
+  end
+end

data/app/serializers/dscf/marketplace/quotation_serializer.rb

@@ -0,0 +1,14 @@
+module Dscf
+  module Marketplace
+    class QuotationSerializer < ActiveModel::Serializer
+      attributes :id, :request_for_quotation_id, :business_id, :total_price,
+        :delivery_date, :valid_until, :status, :notes, :created_at,
+        :updated_at, :days_until_expiry, :delivery_in_days, :complete?
+
+      belongs_to :request_for_quotation
+      belongs_to :business
+      has_many :quotation_items
+      has_one :order
+    end
+  end
+end

data/app/serializers/dscf/marketplace/request_for_quotation_serializer.rb

@@ -0,0 +1,13 @@
+module Dscf
+  module Marketplace
+    class RequestForQuotationSerializer < ActiveModel::Serializer
+      attributes :id, :user_id, :selected_quotation_id, :status, :notes,
+        :created_at, :updated_at, :total_items, :has_responses?
+
+      belongs_to :user
+      belongs_to :selected_quotation
+      has_many :rfq_items
+      has_many :quotations
+    end
+  end
+end

data/app/serializers/dscf/marketplace/rfq_item_serializer.rb

@@ -0,0 +1,14 @@
+module Dscf
+  module Marketplace
+    class RfqItemSerializer < ActiveModel::Serializer
+      attributes :id, :request_for_quotation_id, :product_id, :unit_id, :quantity, :notes,
+        :created_at, :updated_at, :product_name, :product_sku, :unit_name,
+        :unit_code, :quotation_count, :has_quotations?, :quoted_price_range
+
+      belongs_to :request_for_quotation
+      belongs_to :product
+      belongs_to :unit
+      has_many :quotation_items
+    end
+  end
+end

data/app/serializers/dscf/marketplace/supplier_product_serializer.rb

@@ -0,0 +1,13 @@
+module Dscf
+  module Marketplace
+    class SupplierProductSerializer < ActiveModel::Serializer
+      attributes :id, :business_id, :product_id, :supplier_price, :available_quantity,
+        :minimum_order_quantity, :status, :created_at, :updated_at,
+        :in_stock?, :price_per_unit, :display_name
+
+      belongs_to :business
+      belongs_to :product
+      has_many :listings
+    end
+  end
+end

data/app/serializers/dscf/marketplace/unit_conversion_serializer.rb

@@ -0,0 +1,11 @@
+module Dscf
+  module Marketplace
+    class UnitConversionSerializer < ActiveModel::Serializer
+      attributes :id, :from_unit_id, :to_unit_id, :conversion_factor, :notes,
+        :created_at, :updated_at, :reverse_conversion_factor, :description
+
+      belongs_to :from_unit
+      belongs_to :to_unit
+    end
+  end
+end

data/app/serializers/dscf/marketplace/unit_serializer.rb

@@ -0,0 +1,9 @@
+module Dscf
+  module Marketplace
+    class UnitSerializer < ActiveModel::Serializer
+      attributes :id, :code, :name, :unit_type, :created_at, :updated_at, :display_name
+
+      has_many :unit_conversions
+    end
+  end
+end