dscf-marketplace 0.3.92 → 0.3.94

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f9f514677184147e40e66e85e6c1454265d0af758412f5dd892247a00082b25
-  data.tar.gz: 4bd18580c906728236c541ce5970323710ab5f350e3fd2c4aed132203b5fa309
+  metadata.gz: 000d8116a19e742c018a144b6cde46aa1a3221b95735cb78794baa9981ed5228
+  data.tar.gz: 41b84e6e4b189dbe622fecc89e8bd4aa33a605b586a82ee7baa416b92c03baec
 SHA512:
-  metadata.gz: 7c6773338667d90dfa39c0b711934dce4ed94545a18a70a2d9aef3648536fd775e7fccda79a62004e5d5e6a05efca986cd61337480d629a0dbf7d138f7ba4dcf
-  data.tar.gz: 06ee3fdc0bd9d2f84934188be8ea9ff44c4bd8fccf06b3381265c9b01fd58389dece18884fb3afe9eef5018852bbc122a90bcebba1200638af43dabce55e3a83
+  metadata.gz: 6e24ef4567ecf8373aa62fd33243f71bf9e102826dacbf9f7e9e03f66fab1c44770a71ef8e291ca42392254662d1f7c44646ba46405af12d499a354912b0a42f
+  data.tar.gz: d435066b0c124ee9a3ab0dedc1b037353f3433029dbafcf7bb38640c2c2dcbc4e43415a6d1cf323e890166edbfb9567c56f314c21289f043ccfd69d3548f4302

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

@@ -161,6 +161,10 @@ module Dscf
 
       private
 
+      def find_record
+        Dscf::Marketplace::DeliveryOrder.find(params[:id])
+      end
+
       def model_params
         params.require(:delivery_order).permit(
           :driver_id, :pickup_address_id, :delivery_vehicle_id, :status,

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

@@ -6,6 +6,9 @@ module Dscf
       def create
         vehicle = @clazz.new(model_params.except(:vehicle_license, :driver_license))
         if vehicle.save
+          # Auto-assign Driver role to the vehicle's driver
+          Dscf::Marketplace::RoleService.assign_driver_role(vehicle.driver)
+
           # Handle vehicle license upload
           if params[:delivery_vehicle][:vehicle_license].present?
             document = Dscf::Core::Document.new(

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

@@ -89,7 +89,8 @@ module Dscf::Marketplace
 
     def associate_orders_with_delivery(delivery_order, orders)
       orders.each do |order|
-        order.update!(delivery_order: delivery_order)
+        order.update!(delivery_order: delivery_order, status: :confirmed)
+        order.order_items.update_all(status: OrderItem.statuses[:confirmed])
       end
     end
   end

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

@@ -0,0 +1,28 @@
+module Dscf::Marketplace
+  class RoleService
+    DRIVER_ROLE_CODE = "driver"
+
+    def self.assign_driver_role(user)
+      return if user_has_driver_role?(user)
+
+      driver_role = find_or_create_driver_role
+      assign_role_to_user(user, driver_role)
+    end
+
+    private
+
+    def self.user_has_driver_role?(user)
+      user.roles.exists?(code: DRIVER_ROLE_CODE)
+    end
+
+    def self.find_or_create_driver_role
+      Dscf::Core::Role.find_or_create_by!(code: DRIVER_ROLE_CODE) do |role|
+        role.name = "Driver"
+      end
+    end
+
+    def self.assign_role_to_user(user, role)
+      Dscf::Core::UserRole.find_or_create_by!(user: user, role: role)
+    end
+  end
+end

data/lib/dscf/marketplace/version.rb

@@ -1,5 +1,5 @@
 module Dscf
   module Marketplace
-    VERSION = "0.3.92".freeze
+    VERSION = "0.3.94".freeze
   end
 end

data/spec/factories/dscf/core/roles.rb

@@ -0,0 +1,6 @@
+FactoryBot.define do
+  factory :dscf_core_role, class: "Dscf::Core::Role" do
+    sequence(:code) { |n| "role_#{n}" }
+    sequence(:name) { |n| "Role #{n}" }
+  end
+end

data/spec/factories/dscf/core/user_roles.rb

@@ -0,0 +1,6 @@
+FactoryBot.define do
+  factory :dscf_core_user_role, class: "Dscf::Core::UserRole" do
+    association :user, factory: :dscf_core_user
+    association :role, factory: :dscf_core_role
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: dscf-marketplace
 version: !ruby/object:Gem::Version
-  version: 0.3.92
+  version: 0.3.94
 platform: ruby
 authors:
 - Asrat
 bindir: bin
 cert_chain: []
-date: 2025-09-18 00:00:00.000000000 Z
+date: 2025-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -472,6 +472,7 @@ files:
 - app/services/dscf/marketplace/delivery_order_service.rb
 - app/services/dscf/marketplace/my_resource_service.rb
 - app/services/dscf/marketplace/rfq_response_service.rb
+- app/services/dscf/marketplace/role_service.rb
 - config/environments/production.rb
 - config/locales/en.yml
 - config/routes.rb
@@ -509,6 +510,8 @@ files:
 - spec/factories/dscf/core/addresses.rb
 - spec/factories/dscf/core/business_types.rb
 - spec/factories/dscf/core/businesses.rb
+- spec/factories/dscf/core/roles.rb
+- spec/factories/dscf/core/user_roles.rb
 - spec/factories/dscf/core/users.rb
 - spec/factories/dscf/marketplace/categories.rb
 - spec/factories/dscf/marketplace/delivery_order_items.rb