dscf-marketplace 0.3.3 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 860d3ddc901bb2ca30262a59e16a674179bfa0dc7e349d23bc59e07488a0ccd3
-  data.tar.gz: 6e8e95bd3ab0eff86e29a61f62fbbd031c22b17aaff6267f51b215d2171fc2f4
+  metadata.gz: ed0561954d684647c338a26994cf4b58d0671024866a05dfa897352e4e827e65
+  data.tar.gz: b959f769320523fdadcdb69e58664b9879fed6ec36b563b8155363ec0cb5856e
 SHA512:
-  metadata.gz: 8581bfb7f3cb8cc254dc446f3577c33564b25f26ae88a0346249c51f4a38fa49c477c13c443d9e577c05a2cf3d4c4dd583c2fc387170b918a51d89a63cbab4e6
-  data.tar.gz: f77483ec6c62d315d34e691bbd4903aefca0cbf7ca34978ee2c42348a3c2e4f84473051e6e60687bf2ccbe95dbcafef92544c8781bd1b5c927d5a72ca6fb5bca
+  metadata.gz: 8fbb075febd4bbbec9813858f235ad9b8be64d9e2df0a1adc16fdab225dc96295e4201d5d72d73e6fc18373e66341d075b42e3a026a819b850a6a3476d52466f
+  data.tar.gz: 247a76932d2cf383f5b3d6767899f2c96e5908f88198b50f041c31bd9cdbce81de49f1da2d3517947c8f348a3a5c56618832f04cd7b467e21653c4acef9f17b7

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

@@ -105,6 +105,60 @@ 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
+
+      def convert_orders
+        order_ids = params[:order_ids]
+        vehicle_type = params[:vehicle_type]
+        pickup_address_id = params[:pickup_address_id]
+        delivery_notes = params[:delivery_notes]
+
+        # Validate required parameters
+        unless order_ids.present? && vehicle_type.present? && pickup_address_id.present?
+          render_error("delivery_orders.errors.convert_orders_missing_params")
+          return
+        end
+
+        # Find orders and pickup address
+        orders = Dscf::Marketplace::Order.where(id: order_ids)
+        pickup_address = Dscf::Core::Address.find_by(id: pickup_address_id)
+
+        unless pickup_address
+          render_error("delivery_orders.errors.pickup_address_not_found")
+          return
+        end
+
+        # Check if all orders exist
+        if orders.count != order_ids.length
+          missing_ids = order_ids - orders.pluck(:id)
+          render_error("delivery_orders.errors.orders_not_found", message: "Orders not found: #{missing_ids.join(", ")}")
+          return
+        end
+
+        service = Dscf::Marketplace::DeliveryOrderService.new
+        begin
+          delivery_order = service.convert_orders_to_delivery(orders, vehicle_type, pickup_address, delivery_notes)
+          render_success("delivery_orders.success.orders_converted", data: delivery_order)
+        rescue Dscf::Marketplace::DeliveryOrderService::ConversionError => e
+          render_error("delivery_orders.errors.orders_conversion_failed", message: e.message)
+        rescue => e
+          render_error("delivery_orders.errors.convert_orders_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,97 @@
+module Dscf::Marketplace
+  class DeliveryOrderService
+    class InvalidStatusTransitionError < StandardError; end
+
+    class AssignmentError < StandardError; end
+
+    class ConversionError < 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
+
+    def convert_orders_to_delivery(orders, vehicle_type, pickup_address, delivery_notes = nil)
+      raise ArgumentError, "Orders array is required" unless orders.present?
+      raise ArgumentError, "Vehicle type is required" unless vehicle_type.present?
+      raise ArgumentError, "Pickup address is required" unless pickup_address.present?
+
+      # Validate all orders can be converted
+      validate_orders_for_conversion(orders)
+
+      # Create delivery order in a transaction
+      DeliveryOrder.transaction do
+        delivery_order = create_delivery_order(vehicle_type, pickup_address, delivery_notes)
+        create_delivery_order_items(delivery_order, orders, pickup_address)
+        associate_orders_with_delivery(delivery_order, orders)
+
+        delivery_order
+      end
+    end
+
+    private
+
+    def validate_orders_for_conversion(orders)
+      orders.each do |order|
+        unless order.delivery?
+          raise ConversionError, "Order #{order.id} is not a delivery order"
+        end
+
+        unless order.confirmed? || order.processing?
+          raise ConversionError, "Order #{order.id} must be confirmed or processing to be converted"
+        end
+
+        if order.delivery_order.present?
+          raise ConversionError, "Order #{order.id} is already associated with a delivery order"
+        end
+      end
+    end
+
+    def create_delivery_order(vehicle_type, pickup_address, delivery_notes)
+      DeliveryOrder.create!(
+        vehicle_type: vehicle_type,
+        pickup_address: pickup_address,
+        delivery_notes: delivery_notes,
+        status: :draft
+      )
+    end
+
+    def create_delivery_order_items(delivery_order, orders, pickup_address)
+      orders.each do |order|
+        order.order_items.each do |order_item|
+          # For now, use the pickup address as both pickup and dropoff
+          # In a real implementation, you'd need to get the buyer's delivery address
+          dropoff_address = pickup_address # Temporary fallback
+
+          DeliveryOrderItem.create!(
+            delivery_order: delivery_order,
+            order_item: order_item,
+            quantity: order_item.quantity,
+            pickup_address: pickup_address,
+            dropoff_address: dropoff_address,
+            status: :pending
+          )
+        end
+      end
+    end
+
+    def associate_orders_with_delivery(delivery_order, orders)
+      orders.each do |order|
+        order.update!(delivery_order: delivery_order)
+      end
+    end
+  end
+end

data/config/locales/en.yml

@@ -4,7 +4,7 @@
 # Pattern: {model_name}.{success|errors}.{action_name} - using plural for controller consistency
 
 en:
-  # Core Models
+# Core Models
   category:
     success:
       index: "Categories retrieved successfully"
@@ -234,28 +234,28 @@ en:
       update: "Failed to update order item"
       destroy: "Failed to delete order item"
 
-  # Delivery Models
+   # Delivery Models
   delivery_order:
-    success:
-      index: "Delivery orders retrieved successfully"
-      show: "Delivery order details retrieved successfully"
-      create: "Delivery order created successfully"
-      update: "Delivery order updated successfully"
-      destroy: "Delivery order deleted successfully"
-      pickup: "Delivery order picked up successfully"
-      start_delivery: "Delivery started successfully"
-      complete_delivery: "Delivery completed successfully"
-      mark_failed: "Delivery marked as failed"
-    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"
-      pickup: "Failed to pickup delivery order"
-      start_delivery: "Failed to start delivery"
-      complete_delivery: "Failed to complete delivery"
-      mark_failed: "Failed to mark delivery as failed"
+     success:
+     index: "Delivery orders retrieved successfully"
+     show: "Delivery order details retrieved successfully"
+     create: "Delivery order created successfully"
+     update: "Delivery order updated successfully"
+     destroy: "Delivery order deleted successfully"
+     pickup: "Delivery order picked up successfully"
+     start_delivery: "Delivery started successfully"
+     complete_delivery: "Delivery completed successfully"
+     mark_failed: "Delivery marked as failed"
+     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"
+     pickup: "Failed to pickup delivery order"
+     start_delivery: "Failed to start delivery"
+     complete_delivery: "Failed to complete delivery"
+     mark_failed: "Failed to mark delivery as failed"
 
   delivery_orders:
     success:
@@ -268,7 +268,7 @@ en:
       delivery_started: "Delivery started successfully"
       delivery_completed: "Delivery completed successfully"
       marked_failed: "Delivery marked as failed"
-      index.success: "Delivery orders retrieved successfully"
+      orders_converted: "Orders converted to delivery successfully"
     errors:
       index: "Failed to retrieve delivery orders"
       show: "Failed to retrieve delivery order details"
@@ -279,6 +279,15 @@ en:
       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"
+      convert_orders_missing_params: "Missing required parameters: order_ids, vehicle_type, and pickup_address_id"
+      pickup_address_not_found: "Pickup address not found"
+      orders_not_found: "Some orders were not found"
+      orders_conversion_failed: "Failed to convert orders to delivery"
+      convert_orders_failed: "Unexpected error during order conversion"
 
   delivery_order_item:
     success:

data/config/routes.rb

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

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.5".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.5
 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