dscf-marketplace 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 860d3ddc901bb2ca30262a59e16a674179bfa0dc7e349d23bc59e07488a0ccd3
-  data.tar.gz: 6e8e95bd3ab0eff86e29a61f62fbbd031c22b17aaff6267f51b215d2171fc2f4
+  metadata.gz: 1453b148008e135853ee34ec3c11a3e4ae92d1a63d692c46de443a2c65789f2a
+  data.tar.gz: 102476ba6b33b913f846a3ea25fe52728d3b1a5875fe18b98bcb20dadc39faa5
 SHA512:
-  metadata.gz: 8581bfb7f3cb8cc254dc446f3577c33564b25f26ae88a0346249c51f4a38fa49c477c13c443d9e577c05a2cf3d4c4dd583c2fc387170b918a51d89a63cbab4e6
-  data.tar.gz: f77483ec6c62d315d34e691bbd4903aefca0cbf7ca34978ee2c42348a3c2e4f84473051e6e60687bf2ccbe95dbcafef92544c8781bd1b5c927d5a72ca6fb5bca
+  metadata.gz: a554fc5405b2a480cfc488ba0d5266b8219343549c6c873892d0b122f425e8643adeb27aaa4a056faa864cdb7af1d6562dcd125923cd1530812998242b8a7886
+  data.tar.gz: fe584405ecbfa49efd3a7c3de767d9c795c3dab1bc17342d5e422d8b986a56eaced5771729e7412636104ab9b793803106aa97437e95d74f0008d0bea1445c63

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

@@ -105,6 +105,21 @@ module Dscf
         end
       end
 
+      def accept
+        @obj = find_record
+        service = Dscf::Marketplace::DeliveryOrderService.new
+        begin
+          service.assign_driver(@obj, current_user)
+          render_success("delivery_orders.success.accepted", data: @obj)
+        rescue Dscf::Marketplace::DeliveryOrderService::InvalidStatusTransitionError => e
+          render_error("delivery_orders.errors.invalid_status_transition", message: e.message)
+        rescue Dscf::Marketplace::DeliveryOrderService::AssignmentError => e
+          render_error("delivery_orders.errors.assignment_failed", message: e.message)
+        rescue => e
+          render_error("delivery_orders.errors.accept_failed", message: e.message)
+        end
+      end
+
       private
 
       def model_params

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

@@ -3,13 +3,13 @@ module Dscf::Marketplace
     enum :status, {draft: 0, assigned: 1, picked_up: 2, in_transit: 3, delivered: 4, failed: 5}, default: :draft
     enum :vehicle_type, {motorcycle: 0, car: 1, van: 2, truck: 3}
 
-    belongs_to :driver, class_name: "Dscf::Core::User"
+    belongs_to :driver, class_name: "Dscf::Core::User", optional: true
     belongs_to :pickup_address, class_name: "Dscf::Core::Address"
     belongs_to :delivery_vehicle, optional: true
     has_many :delivery_order_items, dependent: :destroy
     has_many :marketplace_orders, class_name: "Dscf::Marketplace::Order", dependent: :nullify
 
-    validates :driver_id, presence: true
+    validates :driver_id, presence: true, unless: :draft?
     validates :pickup_address_id, presence: true
     validates :status, presence: true
     validates :vehicle_type, presence: true

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

@@ -0,0 +1,25 @@
+module Dscf::Marketplace
+  class DeliveryOrderService
+    class InvalidStatusTransitionError < StandardError; end
+
+    class AssignmentError < StandardError; end
+
+    def assign_driver(delivery_order, driver)
+      raise ArgumentError, "Delivery order is required" unless delivery_order
+      raise ArgumentError, "Driver is required" unless driver
+
+      unless delivery_order.draft?
+        raise InvalidStatusTransitionError, "Can only assign driver to draft delivery orders"
+      end
+
+      delivery_order.driver_id = driver.id
+      delivery_order.status = :assigned
+
+      unless delivery_order.save
+        raise AssignmentError, "Failed to assign driver: #{delivery_order.errors.full_messages.join(", ")}"
+      end
+
+      delivery_order
+    end
+  end
+end

data/config/locales/en.yml

@@ -270,15 +270,19 @@ en:
       marked_failed: "Delivery marked as failed"
       index.success: "Delivery orders retrieved successfully"
     errors:
-      index: "Failed to retrieve delivery orders"
-      show: "Failed to retrieve delivery order details"
-      create: "Failed to create delivery order"
-      update: "Failed to update delivery order"
-      destroy: "Failed to delete delivery order"
-      picked_up: "Failed to pickup delivery order"
-      delivery_started: "Failed to start delivery"
-      delivery_completed: "Failed to complete delivery"
-      marked_failed: "Failed to mark delivery as failed"
+       index: "Failed to retrieve delivery orders"
+       show: "Failed to retrieve delivery order details"
+       create: "Failed to create delivery order"
+       update: "Failed to update delivery order"
+       destroy: "Failed to delete delivery order"
+       picked_up: "Failed to pickup delivery order"
+       delivery_started: "Failed to start delivery"
+       delivery_completed: "Failed to complete delivery"
+       marked_failed: "Failed to mark delivery as failed"
+       pickup_failed: "Failed to pickup delivery order"
+       start_delivery_failed: "Failed to start delivery"
+       complete_delivery_failed: "Failed to complete delivery"
+       mark_failed_failed: "Failed to mark delivery as failed"
 
   delivery_order_item:
     success:

data/config/routes.rb

@@ -102,6 +102,7 @@ Dscf::Marketplace::Engine.routes.draw do
       post "start_delivery"
       post "complete_delivery"
       post "mark_failed"
+      post "accept"
     end
     collection do
       get "filter"

data/db/migrate/20250916083536_make_driver_id_nullable_in_delivery_orders.rb

@@ -0,0 +1,5 @@
+class MakeDriverIdNullableInDeliveryOrders < ActiveRecord::Migration[8.0]
+  def change
+    change_column_null :dscf_marketplace_delivery_orders, :driver_id, true
+  end
+end

data/lib/dscf/marketplace/version.rb

@@ -1,5 +1,5 @@
 module Dscf
   module Marketplace
-    VERSION = "0.3.3".freeze
+    VERSION = "0.3.4".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dscf-marketplace
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Asrat
@@ -469,6 +469,7 @@ files:
 - app/serializers/dscf/marketplace/unit_conversion_serializer.rb
 - app/serializers/dscf/marketplace/unit_serializer.rb
 - app/serializers/dscf/marketplace/user_serializer.rb
+- app/services/dscf/marketplace/delivery_order_service.rb
 - app/services/dscf/marketplace/my_resource_service.rb
 - app/services/dscf/marketplace/rfq_response_service.rb
 - config/environments/production.rb
@@ -499,6 +500,7 @@ files:
 - db/migrate/20250903061154_add_ordered_fields_to_orders.rb
 - db/migrate/20250903061306_populate_ordered_fields_for_existing_orders.rb
 - db/migrate/20250909092700_add_notes_to_dscf_marketplace_quotation_items.rb
+- db/migrate/20250916083536_make_driver_id_nullable_in_delivery_orders.rb
 - lib/dscf/marketplace.rb
 - lib/dscf/marketplace/engine.rb
 - lib/dscf/marketplace/version.rb