dscf-marketplace 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87c9e26ee1a03d60a892a9959d1beefd2287039c433c173bf896ea0e9a44a409
-  data.tar.gz: 6da6652ed712f8e1d5c617e61ff95c72c181148fbb219f800da503dc12a4f645
+  metadata.gz: 594b8a0c6b3e5d673cc49e5b9fed9944ed8741a9e060878b7db0faf18b425316
+  data.tar.gz: 3a4ae57c850ebc4f616def389b9b66d3d1aebe75eed35a0920fac405bcd34789
 SHA512:
-  metadata.gz: d39c8853dc117c49f980f458e4b25d6e9666f6a51ce6894d5078bb27133569fbf0cf3abd84ce76f977d4df6a6b81762073e77e0edb2acfac694eca3c53cfcc79
-  data.tar.gz: 92d80800e80f81ea590c8c4cd4c2ca0d64e43540c2f7d12a7796e6891d359cd74e25b5266fcbadd7f3511a6a5aa723a88cee64c0706b305f5c0a71b2199cd139
+  metadata.gz: 25512776a17bd4984353716c8020a13d3ce77b510c68cc7b8b139bc19f4c3b3145ee55cd61a788c1a21e96f3d121cd5dddfe12a62f2359a01d1a5b3d008400d1
+  data.tar.gz: 2b0e4ed3a9fc273e0cfee298f8fcd59f714494dd85cbf818d5ba9dd6ff124270ee200724e53be170f1af5fb9f0ffc71dffa97cdfc680aee10a1b1926c617a82d

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

@@ -68,6 +68,11 @@ module Dscf
         render_success(data: delivery_orders, serializer_options: options)
       end
 
+      def summary
+        @delivery_order = find_record
+        render_success(data: @delivery_order.generate_handoff_summary_report)
+      end
+
       def pickup
         @obj = find_record
         if @obj.pickup!

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

@@ -0,0 +1,57 @@
+module Dscf
+  module Marketplace
+    class DeliveryStopsController < ApplicationController
+      include Dscf::Core::Common
+
+      def index
+        super do
+          if params[:delivery_order_id]
+            stops = DeliveryStop.where(delivery_order_id: params[:delivery_order_id])
+            options = { include: [:dropoff_address, :delivery_order_items] }
+            [stops, options]
+          else
+             # Fallback or standard index if needed, though mostly used nested
+             [DeliveryStop.all, {}]
+          end
+        end
+      end
+
+      def verify
+        @delivery_stop = DeliveryStop.find(params[:id])
+        if @delivery_stop.verify!(verified_by: current_user.id)
+          render_success(
+            data: @delivery_stop, 
+            serializer_options: { include: [:dropoff_address, :delivery_order_items] }
+          )
+        else
+          render_error(
+            errors: @delivery_stop.errors.full_messages,
+            status: :unprocessable_entity
+          )
+        end
+      end
+
+      private
+
+      def model_params
+        params.require(:delivery_stop).permit(:notes, :status)
+      end
+
+      def eager_loaded_associations
+        [:dropoff_address, :delivery_order_items]
+      end
+
+      def allowed_order_columns
+        %w[id status sequence_number created_at updated_at]
+      end
+
+      def default_serializer_includes
+        {
+          index: [:dropoff_address, :delivery_order_items],
+          show: [:dropoff_address, :delivery_order_items],
+          verify: [:dropoff_address, :delivery_order_items]
+        }
+      end
+    end
+  end
+end

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

@@ -7,6 +7,7 @@ module Dscf::Marketplace
     belongs_to :pickup_address, class_name: "Dscf::Core::Address"
     belongs_to :delivery_vehicle, optional: true
     has_many :delivery_order_items, dependent: :destroy
+    has_many :delivery_stops, class_name: "Dscf::Marketplace::DeliveryStop", dependent: :destroy
     has_many :marketplace_orders, class_name: "Dscf::Marketplace::Order", dependent: :nullify
 
     validates :driver_id, presence: true, unless: :draft?
@@ -100,7 +101,6 @@ module Dscf::Marketplace
       actual_delivery_time <= estimated_delivery_time
     end
 
-    # Handoff tracking methods
     def handoff_completion_status
       items = delivery_order_items
       {
@@ -123,15 +123,40 @@ module Dscf::Marketplace
     def generate_handoff_summary_report
       {
         delivery_order_id: id,
-        driver: driver&.name,
+        driver: [driver&.user_profile&.first_name, driver&.user_profile&.last_name].compact.join(" "),
         vehicle: vehicle_type,
-        total_destinations: delivery_order_items.distinct.pluck(:dropoff_address_id).count,
-        handoff_status: handoff_completion_status,
-        issues: items_requiring_attention.map(&:comprehensive_damage_report),
+        
+        # Financials & Metrics
+        delivery_price: actual_delivery_price || estimated_delivery_price,
+        time_taken: formatted_delivery_duration,
+        distance_covered: 0, # Placeholder until distance tracking is implemented
+
+        stops: delivery_stops.order(:sequence_number).map do |stop|
+          {
+            id: stop.id,
+            address: [stop.dropoff_address&.city, stop.dropoff_address&.sub_city].compact.join(", ").presence || "Unknown Address",
+            city: stop.dropoff_address&.city,
+            status: stop.status&.titleize
+          }
+        end,
+        
         generated_at: Time.current
       }
     end
 
+    def formatted_delivery_duration
+      return "N/A" unless delivery_duration
+      
+      hours = delivery_duration / 3600
+      minutes = (delivery_duration % 3600) / 60
+      
+      if hours > 0
+        "#{hours}h #{minutes}m"
+      else
+        "#{minutes}m"
+      end
+    end
+
     private
 
     def calculate_actual_delivery_price

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

@@ -3,6 +3,7 @@ module Dscf::Marketplace
     enum :status, {pending: 0, picked_up: 1, delivered: 2, receiver_confirmed: 3, damaged: 4, missing: 5, disputed: 6, wrong_item: 7, missing: 8}
 
     belongs_to :delivery_order
+    belongs_to :delivery_stop, class_name: "Dscf::Marketplace::DeliveryStop", optional: true
     belongs_to :order_item, class_name: "Dscf::Marketplace::OrderItem"
     belongs_to :pickup_address, class_name: "Dscf::Core::Address"
     belongs_to :dropoff_address, class_name: "Dscf::Core::Address"
@@ -71,7 +72,7 @@ module Dscf::Marketplace
 
     # Handoff workflow methods
     def receiver_confirm!(confirmed_quantity, notes = nil, confirmed_by = nil)
-      return false unless picked_up? || pending?
+      return false unless picked_up? || pending? || delivered?
 
       update!(
         status: :receiver_confirmed,

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

@@ -0,0 +1,47 @@
+module Dscf::Marketplace
+  class DeliveryStop < ApplicationRecord
+    enum :status, { pending: 0, arrived: 1, completed: 2, failed: 3 }, default: :pending
+
+    belongs_to :delivery_order, class_name: "Dscf::Marketplace::DeliveryOrder"
+    belongs_to :dropoff_address, class_name: "Dscf::Core::Address"
+    has_many :delivery_order_items, class_name: "Dscf::Marketplace::DeliveryOrderItem", dependent: :nullify
+
+    validates :delivery_order, presence: true
+    validates :dropoff_address, presence: true
+    validates :status, presence: true
+    validates :sequence_number, numericality: { greater_than: 0 }, allow_nil: true
+
+    def self.ransackable_attributes(auth_object = nil)
+      %w[id status sequence_number notes created_at updated_at]
+    end
+
+    def self.ransackable_associations(auth_object = nil)
+      %w[delivery_order dropoff_address delivery_order_items]
+    end
+
+    def verify!(verified_by: nil)
+      return false unless pending? || arrived?
+
+      update!(
+        status: :completed
+      )
+      
+      # Auto-confirm items
+      delivery_order_items.each do |item|
+        item.receiver_confirm!(item.quantity, "Auto-confirmed via stop verification", verified_by)
+      end
+
+      check_for_completion
+      
+      true
+    end
+
+    private
+
+    def check_for_completion
+      if delivery_order.delivery_stops.all?(&:completed?)
+        delivery_order.complete_delivery!
+      end
+    end
+  end
+end

data/app/serializers/dscf/marketplace/delivery_order_serializer.rb

@@ -12,6 +12,7 @@ module Dscf
       belongs_to :delivery_vehicle
       has_many :delivery_order_items
       has_many :marketplace_orders
+      has_many :delivery_stops
     end
   end
 end

data/app/serializers/dscf/marketplace/delivery_stop_serializer.rb

@@ -0,0 +1,10 @@
+module Dscf
+  module Marketplace
+    class DeliveryStopSerializer < ActiveModel::Serializer
+      attributes :id, :status, :sequence_number, :notes, :created_at, :updated_at
+
+      belongs_to :dropoff_address
+      has_many :delivery_order_items
+    end
+  end
+end

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

@@ -9,16 +9,14 @@ module Dscf::Marketplace
     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
+      
+      validate_assignment(delivery_order)
 
       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(", ")}"
+        raise AssignmentError, "Failed to assign driver: #{delivery_order.errors.full_messages.join(', ')}"
       end
 
       delivery_order
@@ -35,8 +33,11 @@ module Dscf::Marketplace
       # 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)
+        create_delivery_stops_and_items(delivery_order, orders, pickup_address)
         associate_orders_with_delivery(delivery_order, orders)
+        
+        # Optimize route - Removed as per requirement
+        # RouteOptimizationService.new.optimize_route(delivery_order)
 
         delivery_order
       end
@@ -60,6 +61,12 @@ module Dscf::Marketplace
       end
     end
 
+    def validate_assignment(delivery_order)
+      unless delivery_order.draft?
+        raise InvalidStatusTransitionError, "Can only assign driver to draft delivery orders"
+      end
+    end
+
     def create_delivery_order(vehicle_type, pickup_address, delivery_notes)
       DeliveryOrder.create!(
         vehicle_type: vehicle_type,
@@ -69,20 +76,31 @@ module Dscf::Marketplace
       )
     end
 
-    def create_delivery_order_items(delivery_order, orders, pickup_address)
-      orders.each do |order|
-        order.order_items.each do |order_item|
-          # Use the order's dropoff address for delivery orders
-          dropoff_address = order.dropoff_address
-
-          DeliveryOrderItem.create!(
-            delivery_order: delivery_order,
-            order_item: order_item,
-            quantity: order_item.quantity,
-            pickup_address: pickup_address,
-            dropoff_address: dropoff_address,
-            status: :pending
-          )
+    def create_delivery_stops_and_items(delivery_order, orders, pickup_address)
+      # Group orders by dropoff address to create stops
+      orders_by_address = orders.group_by(&:dropoff_address_id)
+      
+      orders_by_address.each do |dropoff_address_id, address_orders|
+        # Create stop
+        stop = DeliveryStop.create!(
+          delivery_order: delivery_order,
+          dropoff_address_id: dropoff_address_id,
+          status: :pending
+        )
+        
+        # Create items for this stop
+        address_orders.each do |order|
+          order.order_items.reload.each do |order_item|
+            DeliveryOrderItem.create!(
+              delivery_order: delivery_order,
+              delivery_stop: stop,
+              order_item: order_item,
+              quantity: order_item.quantity,
+              pickup_address: pickup_address,
+              dropoff_address_id: dropoff_address_id,
+              status: :pending
+            )
+          end
         end
       end
     end

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

@@ -0,0 +1,17 @@
+module Dscf::Marketplace
+  class DisputeService
+    def raise_dispute(delivery_stop, reason, reported_by)
+      return false unless delivery_stop
+      
+      delivery_stop.update!(status: :failed, notes: reason)
+      
+      delivery_stop.delivery_order_items.each do |item|
+        item.dispute_delivery!(reason, reported_by)
+      end
+      
+      DeliveryNotificationService.new.notify_dispute(delivery_stop)
+      
+      true
+    end
+  end
+end

data/config/routes.rb

@@ -90,12 +90,14 @@ Dscf::Marketplace::Engine.routes.draw do
   # Delivery System
   resources :delivery_orders do
     resources :delivery_order_items, only: [ :index ]
+    resources :delivery_stops, only: [ :index ]
     member do
       post "pickup"
       post "start_delivery"
       post "complete_delivery"
       post "mark_failed"
       post "accept"
+      get "summary"
     end
     collection do
       get "my_driver_deliveries"
@@ -104,6 +106,12 @@ Dscf::Marketplace::Engine.routes.draw do
     end
   end
 
+  resources :delivery_stops, only: [ :show ] do
+    member do
+      post "verify"
+    end
+  end
+
   resources :delivery_order_items, only: [ :index, :show, :update, :create ] do
     member do
       post "receiver_confirm"

data/db/migrate/20251130143731_create_dscf_marketplace_delivery_stops.rb

@@ -0,0 +1,13 @@
+class CreateDscfMarketplaceDeliveryStops < ActiveRecord::Migration[8.1]
+  def change
+    create_table :dscf_marketplace_delivery_stops do |t|
+      t.references :delivery_order, null: false, foreign_key: { to_table: :dscf_marketplace_delivery_orders }
+      t.references :dropoff_address, null: false, foreign_key: { to_table: :dscf_core_addresses }
+      t.integer :status, default: 0
+      t.integer :sequence_number
+      t.text :notes
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20251130144500_add_delivery_stop_to_delivery_order_items.rb

@@ -0,0 +1,5 @@
+class AddDeliveryStopToDeliveryOrderItems < ActiveRecord::Migration[8.1]
+  def change
+    add_reference :dscf_marketplace_delivery_order_items, :delivery_stop, null: true, foreign_key: { to_table: :dscf_marketplace_delivery_stops }
+  end
+end

data/lib/dscf/marketplace/version.rb

@@ -1,5 +1,5 @@
 module Dscf
   module Marketplace
-    VERSION = "0.6.3".freeze
+    VERSION = "0.6.4".freeze
   end
 end

data/spec/factories/dscf/marketplace/delivery_stops.rb

@@ -0,0 +1,8 @@
+FactoryBot.define do
+  factory :dscf_marketplace_delivery_stop, class: 'Dscf::Marketplace::DeliveryStop' do
+    association :delivery_order, factory: :dscf_marketplace_delivery_order
+    association :dropoff_address, factory: :dscf_core_address
+    status { :pending }
+    sequence_number { 1 }
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: dscf-marketplace
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Asrat
 bindir: bin
 cert_chain: []
-date: 2025-11-28 00:00:00.000000000 Z
+date: 2025-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -420,6 +420,7 @@ files:
 - app/controllers/dscf/marketplace/categories_controller.rb
 - app/controllers/dscf/marketplace/delivery_order_items_controller.rb
 - app/controllers/dscf/marketplace/delivery_orders_controller.rb
+- app/controllers/dscf/marketplace/delivery_stops_controller.rb
 - app/controllers/dscf/marketplace/delivery_vehicles_controller.rb
 - app/controllers/dscf/marketplace/listings_controller.rb
 - app/controllers/dscf/marketplace/order_items_controller.rb
@@ -438,6 +439,7 @@ files:
 - app/models/dscf/marketplace/category.rb
 - app/models/dscf/marketplace/delivery_order.rb
 - app/models/dscf/marketplace/delivery_order_item.rb
+- app/models/dscf/marketplace/delivery_stop.rb
 - app/models/dscf/marketplace/delivery_vehicle.rb
 - app/models/dscf/marketplace/listing.rb
 - app/models/dscf/marketplace/order.rb
@@ -453,6 +455,7 @@ files:
 - app/serializers/dscf/marketplace/category_serializer.rb
 - app/serializers/dscf/marketplace/delivery_order_item_serializer.rb
 - app/serializers/dscf/marketplace/delivery_order_serializer.rb
+- app/serializers/dscf/marketplace/delivery_stop_serializer.rb
 - app/serializers/dscf/marketplace/delivery_vehicle_serializer.rb
 - app/serializers/dscf/marketplace/document_serializer.rb
 - app/serializers/dscf/marketplace/listing_serializer.rb
@@ -468,6 +471,7 @@ files:
 - 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/dispute_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
@@ -504,6 +508,8 @@ files:
 - db/migrate/20250917110618_add_dropoff_address_to_dscf_marketplace_orders.rb
 - db/migrate/20251006055550_add_payment_method_to_dscf_marketplace_orders.rb
 - db/migrate/20251006055948_change_default_payment_method_on_orders.rb
+- db/migrate/20251130143731_create_dscf_marketplace_delivery_stops.rb
+- db/migrate/20251130144500_add_delivery_stop_to_delivery_order_items.rb
 - db/seeds.rb
 - lib/dscf/marketplace.rb
 - lib/dscf/marketplace/engine.rb
@@ -518,6 +524,7 @@ files:
 - spec/factories/dscf/marketplace/categories.rb
 - spec/factories/dscf/marketplace/delivery_order_items.rb
 - spec/factories/dscf/marketplace/delivery_orders.rb
+- spec/factories/dscf/marketplace/delivery_stops.rb
 - spec/factories/dscf/marketplace/delivery_vehicles.rb
 - spec/factories/dscf/marketplace/listings.rb
 - spec/factories/dscf/marketplace/order_items.rb