dscf-marketplace 0.2.96 → 0.2.97

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 337301146588e5fb9301adbb623f086e2cbc44ab193247ef22095868e2bcfc6e
-  data.tar.gz: 07f2f4c37075de27e77f71f09043aae1ef6e67ac0d8b9cb3ec6c13a87aad6b43
+  metadata.gz: ac33f2e1d75896ac1b646325ea4644d462a898a90faee7a2c09ac2ef3b42190b
+  data.tar.gz: a408d6430e056a6d8b0d42168b8c6f33fed208f961973efdbaca4dd4dc1c6550
 SHA512:
-  metadata.gz: 6953d8e4c94403e5856d6f6095ad6891886d186c5f69a12c86c002974fb90c07f4f21b12051aaac77443b1830334b509da64b97f712e2bd21f97c395358a2c46
-  data.tar.gz: 3e3e8c5b5d5f627a186ba00c07559c73716410bafc426f18ec140d427b5171ee39d49dc28d0914b164bd4df2dae3a173ca13e184933bc30c2a0122cd2c319232
+  metadata.gz: 9ca871053dba043306d13c00181b907f711c75063f7ddc20c0b86f97ed23bd92ce38d3c0d764fc136f2b1a2a2a6096770e13de3fd3951fa842fc0e1416182dc8
+  data.tar.gz: 7409c3056f032dc9f4e66d819c8c021431cc14f6d8b5d5708b8bfd87a688d829af5664b00697b0c0ef94f3e229bae64d8d4337f0a591f8ad4b9aa0b0b3cb4b7e

data/app/controllers/dscf/marketplace/request_for_quotations_controller.rb

@@ -3,6 +3,23 @@ module Dscf
     class RequestForQuotationsController < ApplicationController
       include Dscf::Core::Common
 
+      def create
+        obj = @clazz.new(model_params)
+        if obj.save
+          obj = @clazz.includes(eager_loaded_associations).find(obj.id) if eager_loaded_associations.present?
+          includes = default_serializer_includes[:create] || []
+          options = {include: includes} if includes.present?
+          Rails.logger.info("RFQ created with #{obj.rfq_items.count} items")
+          render_success(data: obj, serializer_options: options, status: :created)
+        else
+          Rails.logger.info("RFQ save failed: #{obj.errors.full_messages}")
+          Rails.logger.info("RFQ rfq_items errors: #{obj.rfq_items.map(&:errors).map(&:full_messages)}")
+          render_error(errors: "Validation failed: #{obj.errors.full_messages.join(", ")}", status: :unprocessable_entity)
+        end
+      rescue => e
+        render_error(error: e.message)
+      end
+
       def send_rfq
         @obj = find_record
         if @obj.draft? && @obj.update(status: :sent)

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

@@ -10,7 +10,7 @@ module Dscf::Marketplace
     belongs_to :ordered_by, class_name: "Dscf::Core::User"
     belongs_to :ordered_to, class_name: "Dscf::Core::Business"
     belongs_to :delivery_order, optional: true
-    has_many :order_items, dependent: :destroy, inverse_of: :order
+    has_many :order_items, dependent: :destroy, autosave: true
     accepts_nested_attributes_for :order_items, allow_destroy: true
 
     validates :order_type, presence: true

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

@@ -4,7 +4,7 @@ module Dscf::Marketplace
 
     delegate :name, :description, :thumbnail_url, :images_urls, to: :product, allow_nil: true
 
-    belongs_to :order, optional: true, inverse_of: :order_items
+    belongs_to :order, optional: true
     belongs_to :quotation_item, optional: true
     belongs_to :listing, optional: true
     belongs_to :product

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

@@ -4,7 +4,7 @@ module Dscf
       belongs_to :request_for_quotation, class_name: "Dscf::Marketplace::RequestForQuotation"
       belongs_to :business, class_name: "Dscf::Core::Business", optional: true if defined?(Dscf::Core)
 
-      has_many :quotation_items, class_name: "Dscf::Marketplace::QuotationItem", dependent: :destroy, inverse_of: :quotation
+      has_many :quotation_items, class_name: "Dscf::Marketplace::QuotationItem", dependent: :destroy, autosave: true
       has_one :order, class_name: "Dscf::Marketplace::Order", dependent: :destroy
       accepts_nested_attributes_for :quotation_items, allow_destroy: true
 

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

@@ -1,20 +1,18 @@
 module Dscf
   module Marketplace
     class QuotationItem < ApplicationRecord
-      belongs_to :quotation, class_name: "Dscf::Marketplace::Quotation", inverse_of: :quotation_items
+      belongs_to :quotation, class_name: "Dscf::Marketplace::Quotation"
       belongs_to :rfq_item, class_name: "Dscf::Marketplace::RfqItem"
       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
       validates :quantity, presence: true, numericality: {greater_than: 0}
       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
+      # validate :unit_compatible_with_product
       validate :subtotal_matches_calculation, if: :should_validate_subtotal?
       before_save :calculate_subtotal, if: :should_recalculate_subtotal?
 
@@ -126,8 +124,8 @@ module Dscf
       def unit_compatible_with_product
         return unless product_id && unit_id
 
-        unless product.unit_id == unit_id || product.unit.convertible_to?(unit)
-          errors.add(:unit_id, "is not compatible with the selected product")
+        unless product.unit_id == unit_id
+          errors.add(:unit_id, "must match the product's base unit")
         end
       end
 

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

@@ -4,11 +4,10 @@ module Dscf
       belongs_to :user, class_name: "Dscf::Core::User", optional: true if defined?(Dscf::Core)
       belongs_to :selected_quotation, class_name: "Dscf::Marketplace::Quotation", optional: true
 
-      has_many :rfq_items, class_name: "Dscf::Marketplace::RfqItem", dependent: :destroy, inverse_of: :request_for_quotation
+      has_many :rfq_items, class_name: "Dscf::Marketplace::RfqItem", dependent: :destroy, autosave: true
       has_many :quotations, class_name: "Dscf::Marketplace::Quotation", dependent: :destroy
       accepts_nested_attributes_for :rfq_items, allow_destroy: true
 
-      validates :user_id, presence: true
       enum :status, {draft: 0, sent: 1, responded: 2, selected: 3, closed: 4}, default: :draft
       validates :notes, length: {maximum: 2000}, allow_blank: true
 

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

@@ -1,19 +1,16 @@
 module Dscf
   module Marketplace
     class RfqItem < ApplicationRecord
-      belongs_to :request_for_quotation, class_name: "Dscf::Marketplace::RequestForQuotation", inverse_of: :rfq_items
+      belongs_to :request_for_quotation, class_name: "Dscf::Marketplace::RequestForQuotation"
       belongs_to :product, class_name: "Dscf::Marketplace::Product"
       belongs_to :unit, class_name: "Dscf::Marketplace::Unit"
 
       has_many :quotation_items, class_name: "Dscf::Marketplace::QuotationItem", dependent: :destroy
 
-      validates :request_for_quotation_id, presence: true
-      validates :product_id, presence: true
       validates :quantity, presence: true, numericality: {greater_than: 0}
-      validates :unit_id, presence: true
       validates :notes, length: {maximum: 1000}, allow_blank: true
 
-      validate :unit_compatible_with_product
+      # validate :unit_compatible_with_product
 
       scope :by_product, ->(product_id) { where(product_id: product_id) }
       scope :by_unit, ->(unit_id) { where(unit_id: unit_id) }
@@ -81,8 +78,8 @@ module Dscf
       def unit_compatible_with_product
         return unless product_id && unit_id
 
-        unless product.unit_id == unit_id || product.unit.convertible_to?(unit)
-          errors.add(:unit_id, "is not compatible with the selected product")
+        unless product.unit_id == unit_id
+          errors.add(:unit_id, "must match the product's base unit")
         end
       end
     end

data/lib/dscf/marketplace/version.rb

@@ -1,5 +1,5 @@
 module Dscf
   module Marketplace
-    VERSION = "0.2.96".freeze
+    VERSION = "0.2.97".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dscf-marketplace
 version: !ruby/object:Gem::Version
-  version: 0.2.96
+  version: 0.2.97
 platform: ruby
 authors:
 - Asrat