dscf-marketplace 0.2.93 → 0.2.94

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40d81c92e7033ba2d583bca456a9fa0114795f713c118e92c1b70d2141c1c3ac
-  data.tar.gz: e8f5cca804a50156aff124176f482980628a069a3961c295d0480c395607fbc8
+  metadata.gz: b3d9e2b9c6d302c05aba856c7add2d572e6c48c763b29022c165c32fb0ae6d39
+  data.tar.gz: c1a4ed98de21d1ae80ce116f9db768e24e43baa4785896c9bcbb62bfcfb604e3
 SHA512:
-  metadata.gz: 75ba3df20836f6e89c20b2a35a01822f132f13fec48c2604807e96ad5b75f675bc6cbf0f72d65acbf40492e4d03d80d8e28532ac1941d6cde80779f4611e208b
-  data.tar.gz: 1e3620e360ec311517da1ff4955960a301523b0375801b236b9c3f518dc70ddf97daa7bd576068f9955eed2658f72619ffad90cbca02a13dcccf5e62ffa85fbd
+  metadata.gz: f88c9ecdd32d85066805cb205d3eb7e28df0f540d27ab6c9ecdfada565b3b068f3bb9ded7bdaae8c3d7f73581c4684633579da25b606c8460cf068c0075a26b3
+  data.tar.gz: ae10f6ddcdb722a28ecf61d00152984cbf20523bbf23fc33c385ea5378e1e22935304c636ff18e86e7f6fec2f33704def9a92087b43b33a71c809d5728660a57

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

@@ -2,7 +2,6 @@ module Dscf
   module Marketplace
     class OrdersController < ApplicationController
       include Dscf::Core::Common
-      include Dscf::Marketplace::NestedCreatable
 
       def confirm
         @obj = find_record
@@ -63,8 +62,8 @@ module Dscf
         {
           index: [ :user, :ordered_by, :ordered_to, :quotation, order_items: [ :product ] ],
           show: [ :user, :ordered_by, :ordered_to, :quotation, :listing, :delivery_order, :order_items ],
-          create: [ :user, :ordered_by, :ordered_to, :quotation, :listing ],
-          update: [ :user, :ordered_by, :ordered_to, :quotation, :listing ]
+          create: [ :user, :ordered_by, :ordered_to, :quotation, :listing, :order_items ],
+          update: [ :user, :ordered_by, :ordered_to, :quotation, :listing, :order_items ]
         }
       end
     end

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

@@ -2,7 +2,6 @@ module Dscf
   module Marketplace
     class QuotationsController < ApplicationController
       include Dscf::Core::Common
-      include Dscf::Marketplace::NestedCreatable
 
       def accept
         @obj = find_record

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

@@ -2,7 +2,6 @@ module Dscf
   module Marketplace
     class RequestForQuotationsController < ApplicationController
       include Dscf::Core::Common
-      include Dscf::Marketplace::NestedCreatable
 
       def send_rfq
         @obj = find_record

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
+    has_many :order_items, dependent: :destroy, inverse_of: :order
     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
+    belongs_to :order, optional: true, inverse_of: :order_items
     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
+      has_many :quotation_items, class_name: "Dscf::Marketplace::QuotationItem", dependent: :destroy, inverse_of: :quotation
       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,7 +1,7 @@
 module Dscf
   module Marketplace
     class QuotationItem < ApplicationRecord
-      belongs_to :quotation, class_name: "Dscf::Marketplace::Quotation"
+      belongs_to :quotation, class_name: "Dscf::Marketplace::Quotation", inverse_of: :quotation_items
       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"

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

@@ -4,7 +4,7 @@ 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
+      has_many :rfq_items, class_name: "Dscf::Marketplace::RfqItem", dependent: :destroy, inverse_of: :request_for_quotation
       has_many :quotations, class_name: "Dscf::Marketplace::Quotation", dependent: :destroy
       accepts_nested_attributes_for :rfq_items, allow_destroy: true
 

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

@@ -1,7 +1,7 @@
 module Dscf
   module Marketplace
     class RfqItem < ApplicationRecord
-      belongs_to :request_for_quotation, class_name: "Dscf::Marketplace::RequestForQuotation"
+      belongs_to :request_for_quotation, class_name: "Dscf::Marketplace::RequestForQuotation", inverse_of: :rfq_items
       belongs_to :product, class_name: "Dscf::Marketplace::Product"
       belongs_to :unit, class_name: "Dscf::Marketplace::Unit"
 

data/lib/dscf/marketplace/version.rb

@@ -1,5 +1,5 @@
 module Dscf
   module Marketplace
-    VERSION = "0.2.93".freeze
+    VERSION = "0.2.94".freeze
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: dscf-marketplace
 version: !ruby/object:Gem::Version
-  version: 0.2.93
+  version: 0.2.94
 platform: ruby
 authors:
 - Asrat
 bindir: bin
 cert_chain: []
-date: 2025-09-11 00:00:00.000000000 Z
+date: 2025-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -416,7 +416,6 @@ extra_rdoc_files: []
 files:
 - MIT-LICENSE
 - Rakefile
-- app/controllers/concerns/dscf/marketplace/nested_creatable.rb
 - app/controllers/dscf/marketplace/application_controller.rb
 - app/controllers/dscf/marketplace/businesses_controller.rb
 - app/controllers/dscf/marketplace/categories_controller.rb

data/app/controllers/concerns/dscf/marketplace/nested_creatable.rb

@@ -1,47 +0,0 @@
-module Dscf::Marketplace::NestedCreatable
-  extend ActiveSupport::Concern
-
-  included do
-    # Override the create method from Dscf::Core::Common
-    def create
-      obj = @clazz.new(model_params)
-      assign_current_user(obj) if respond_to?(:assign_current_user)
-
-      if obj.save
-        obj = @clazz.includes(eager_loaded_associations).find(obj.id) if eager_loaded_associations.present?
-
-        includes = serializer_includes_for_action(:create)
-        options = {include: includes} if includes.present?
-
-        # Get success message from locales
-        model_name = @clazz.name.demodulize.underscore
-        message_key = "#{model_name}.success.create"
-        message = I18n.t(message_key, default: "#{model_name.titleize} created successfully")
-
-        # Include associated items in response for orders
-        if model_name == "order" && obj.respond_to?(:order_items)
-          render_success(message, data: obj, order_items: obj.order_items, serializer_options: options, status: :created)
-        else
-          render_success(message, data: obj, serializer_options: options, status: :created)
-        end
-      else
-        Rails.logger.error("#{model_name} save failed: #{obj.errors.full_messages}")
-
-        # Get error message from locales
-        error_key = "#{model_name}.errors.create"
-        error_message = I18n.t(error_key, default: "Failed to create #{model_name}")
-
-        render_error(error_message, status: :unprocessable_entity)
-      end
-    rescue => e
-      render_error(e.message)
-    end
-  end
-
-  private
-
-  def assign_current_user(obj)
-    obj.user = current_user if obj.respond_to?(:user=)
-    obj.ordered_by = current_user if obj.respond_to?(:ordered_by=)
-  end
-end