dscf-marketplace 0.6.0 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94ef418a66a854b9de0a65de1f6a80c74df2bd68405f8f740b2932fcfcafd0d9
-  data.tar.gz: d2f34207221866d38ab5731c747020ef5a872d9629bf917b253a0ac8bc6ba052
+  metadata.gz: bfa46fc885aefb7b4b067535f283dbb08cad16dcab9af6d93efce72ea1e9603f
+  data.tar.gz: 49af3e8d2cabaaa5df1b6e86d5c6da015fbc7c2c64a66a72a3685ba990aceeae
 SHA512:
-  metadata.gz: 5440a9b49a77d92affca53ab2de03fe1e8dc208102c06a624f81b6e0f85ca34fe834d17cdcd98ad5d39e6d425eaea4e56b0d1a7c512e47cbe12893a1df861c53
-  data.tar.gz: 1d2b12caeab32c53195b3d72b50d193ae22a66d2b99d71cd0ae05187e5ec374baf22ed655a9e12b4b74f4bfff7299452bfd7da288d704caf5a2b4cabc2bc5f21
+  metadata.gz: d43a1e2332f25519099b776a4eb38b794f796cf1849045d14427c01f83f3e5cd6c40f9773e923039b0a603dd07ff9ad9f726ed95b2debe6bb7c79261cdbd6e24
+  data.tar.gz: 145b811fbedc48519fd7e5ce9146075f1bff70f30ec6579e1f4dff0f2733f8f9afa8184bd6e38c7b9fbe9cdec4e381cee0d052d0cc23481a534b03c6275c0620

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

@@ -15,7 +15,7 @@ module Dscf
               documentable: vehicle,
               document_type: :business_license
             )
-            document.file.attach(params[:delivery_vehicle][:vehicle_license])
+            document.files.attach(params[:delivery_vehicle][:vehicle_license])
             document.save!
           end
 
@@ -25,7 +25,7 @@ module Dscf
               documentable: vehicle.driver,
               document_type: :drivers_license
             )
-            driver_document.file.attach(params[:delivery_vehicle][:driver_license])
+            driver_document.files.attach(params[:delivery_vehicle][:driver_license])
             driver_document.save!
           end
 
@@ -53,7 +53,7 @@ module Dscf
               documentable: vehicle,
               document_type: :business_license
             )
-            document.file.attach(params[:delivery_vehicle][:vehicle_license])
+            document.files.attach(params[:delivery_vehicle][:vehicle_license])
             document.save!
           end
 
@@ -67,7 +67,7 @@ module Dscf
               documentable: vehicle.driver,
               document_type: :drivers_license
             )
-            driver_document.file.attach(params[:delivery_vehicle][:driver_license])
+            driver_document.files.attach(params[:delivery_vehicle][:driver_license])
             driver_document.save!
           end
 

data/app/services/dscf/marketplace/my_resource_service.rb

@@ -27,10 +27,6 @@ module Dscf
         apply_filters(quotes, params)
       end
 
-      def my_businesses(params = {})
-        @current_user.businesses.includes(:business_type, :user, :documents, reviews: :reviewed_by)
-      end
-
       def my_listings(params = {})
         listings = Dscf::Marketplace::Listing.joins(:business)
           .where(dscf_core_businesses: {user_id: @current_user.id})

data/app/services/dscf/marketplace/rfq_response_service.rb

@@ -6,7 +6,7 @@ module Dscf
       end
 
       def respond_to_rfq(rfq, params = {})
-        return {success: false, errors: [ "RFQ not found or invalid" ]} unless rfq.present? && rfq.sent?
+        return {success: false, errors: [ "RFQ not found or invalid" ]}  unless rfq.present? && (rfq.draft? || rfq.sent?)
 
         business = Dscf::Core::Business.find_by(user: @current_user)
         return {success: false, errors: [ "No business associated with user" ]} unless business.present?

data/config/routes.rb

@@ -19,19 +19,6 @@ Dscf::Marketplace::Engine.routes.draw do
 
   resources :unit_conversions
 
-  resources :businesses do
-    collection do
-      get "has_business"
-      get "my_businesses"
-    end
-    member do
-      patch :approve
-      patch :reject
-      patch :request_modification
-      patch :resubmit
-    end
-  end
-
   # Trading Models
   resources :supplier_products do
     resources :listings, only: [ :index ]

data/lib/dscf/marketplace/engine.rb

@@ -20,11 +20,6 @@ module Dscf
       end
 
       require "active_storage/engine"
-
-      # Extend core Business model with ReviewableModel for review workflow
-      config.to_prepare do
-        Dscf::Core::Business.include Dscf::Core::ReviewableModel if defined?(Dscf::Core::Business)
-      end
     end
   end
 end

data/lib/dscf/marketplace/version.rb

@@ -1,5 +1,5 @@
 module Dscf
   module Marketplace
-    VERSION = "0.6.0".freeze
+    VERSION = "0.6.2".freeze
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: dscf-marketplace
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.2
 platform: ruby
 authors:
 - Asrat
 bindir: bin
 cert_chain: []
-date: 2025-10-13 00:00:00.000000000 Z
+date: 2025-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -417,7 +417,6 @@ files:
 - MIT-LICENSE
 - Rakefile
 - app/controllers/dscf/marketplace/application_controller.rb
-- app/controllers/dscf/marketplace/businesses_controller.rb
 - app/controllers/dscf/marketplace/categories_controller.rb
 - app/controllers/dscf/marketplace/delivery_order_items_controller.rb
 - app/controllers/dscf/marketplace/delivery_orders_controller.rb

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

@@ -1,110 +0,0 @@
-module Dscf
-  module Marketplace
-    class BusinessesController < ApplicationController
-      include Dscf::Core::Common
-      include Dscf::Core::ReviewableController
-
-      reviewable_model Dscf::Core::Business
-
-      def has_business
-        has_business = current_user&.businesses&.exists? || false
-        render_success("business.success.has_business_check", data: {has_business: has_business})
-      end
-
-      def create
-        business = @clazz.new(model_params.except(:business_license))
-        if business.save
-          # Add document upload after save
-          if params[:business][:business_license].present?
-            document = Dscf::Core::Document.new(
-              documentable: business,
-              document_type: :business_license
-            )
-            document.file.attach(params[:business][:business_license])
-            document.save!
-          end
-
-          # Create pending review
-          business.reviews.create!
-
-          business = @clazz.includes(eager_loaded_associations).find(business.id) if eager_loaded_associations.present?
-          includes = serializer_includes_for_action(:create)
-          options = {include: includes} if includes.present?
-          render_success(data: business, serializer_options: options, status: :created)
-        else
-          render_error(errors: business.errors.full_messages[0], status: :unprocessable_entity)
-        end
-      rescue => e
-        render_error(error: e.message)
-      end
-
-      def my_businesses
-        service = MyResourceService.new(current_user)
-        businesses = service.my_businesses(params)
-
-        # Ensure reviewed_by is loaded for reviews
-        businesses.each do |business|
-          business.reviews.each do |review|
-            review.reviewed_by
-          end
-        end
-
-        options = {
-          include: [ :business_type, :user, :documents, {reviews: :reviewed_by} ],
-          meta: {resource_type: "my_businesses"}
-        }
-
-        # Manually serialize to ensure reviews are included
-        serialized = businesses.map do |business|
-          Dscf::Core::BusinessSerializer.new(business, options).as_json
-        end
-
-        render_success(data: serialized, meta: {resource_type: "my_businesses"})
-      end
-
-      private
-
-      def model_params
-        params.require(:business).permit(
-          :name, :description, :contact_email, :contact_phone, :tin_number,
-          :business_type_id, :user_id, business_license: :file
-        )
-      end
-
-      def eager_loaded_associations
-        [
-          :business_type, :user, :documents,
-          reviews: :reviewed_by
-        ]
-      end
-
-      def default_serializer_includes
-        {
-          index: [
-            :business_type, :user, :documents,
-            {
-              reviews: :reviewed_by
-            }
-          ],
-          show: [
-            :business_type, :user, :documents,
-            {
-              reviews: :reviewed_by
-            }
-          ],
-          create: [ :business_type, :user, :documents, :reviews ],
-          update: [
-            :business_type, :user, :documents,
-            {
-              reviews: :reviewed_by
-            }
-          ]
-        }
-      end
-
-      def allowed_order_columns
-        %w[id name description contact_email contact_phone tin_number created_at updated_at]
-      end
-    end
-  end
-end