dscf-marketplace 0.3.92 → 0.3.93

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f9f514677184147e40e66e85e6c1454265d0af758412f5dd892247a00082b25
-  data.tar.gz: 4bd18580c906728236c541ce5970323710ab5f350e3fd2c4aed132203b5fa309
+  metadata.gz: 83b9e16160c50312669963822847e82d13756edfa0e0fd54d799bfe7130cd29a
+  data.tar.gz: e8b248ae95abd6813eb78729aad97dd5611d15f6164cfc5cecaf8e9087fd6227
 SHA512:
-  metadata.gz: 7c6773338667d90dfa39c0b711934dce4ed94545a18a70a2d9aef3648536fd775e7fccda79a62004e5d5e6a05efca986cd61337480d629a0dbf7d138f7ba4dcf
-  data.tar.gz: 06ee3fdc0bd9d2f84934188be8ea9ff44c4bd8fccf06b3381265c9b01fd58389dece18884fb3afe9eef5018852bbc122a90bcebba1200638af43dabce55e3a83
+  metadata.gz: 85f8a61f30863c23de3c0ca9e8eb1fbddbe4c5a12796c994c314e8e401931009e164bd2bd5e05fc20bed84c36e2c5c4db1f29a23db27a15d6db45046b6a22150
+  data.tar.gz: 89b3cb139f4404b538154ab6769a9fe133fc543eee181337d3be535cf6b37b5181884e2977265e368693d979d62a71af05a597324023860447495f28b51958c6

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/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.93".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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dscf-marketplace
 version: !ruby/object:Gem::Version
-  version: 0.3.92
+  version: 0.3.93
 platform: ruby
 authors:
 - Asrat
@@ -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