bscf-core 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5cadf9d1359435358250b1c677aa87661da069c1dbbc6e834e1ad0d6ce06932d
-  data.tar.gz: 6df9c4dd0160c81a63a6d37420f71ab9ab488d2d280b93b680995f95a50afd04
+  metadata.gz: 0f663a88fd05be1fcf61a27b261cf3705cf813492cf81cb5ca4b995a475335b0
+  data.tar.gz: 3027a949d685908b5fa68253b93adf3ab34d36645d643aecd7d73037a04c0bf7
 SHA512:
-  metadata.gz: a94920a7ea7dc559e2b1cc8e285c7fc82773a3f3aaf277c7d73c13f2efdd401b27c4bf5af163fdcc1c808b7a45c9d676834d61c95b3f8d5edbfdcb1b61a3ead4
-  data.tar.gz: bce2278d8ce1e265fe240500d0f3d4a0b2edbc06b58d52b9200e6050bb65bdbeca78920ed4e281ebf92bafc2aa369f2373994620c248c8a056fcf06c3c825b2e
+  metadata.gz: 1f0e784375d6ceb2d2bb801a9b89788d9c281a68e965dc3b15ba651a2a6f72dbdfc045be1bd4cc4f65450d0cb7d4e7b11e13d6dd4933b11fd750f8a0af3e7388
+  data.tar.gz: 40af2d0ffd652e1f8405533d1f8701676c372c907265f9ce6a4e6d9df43e034d27fd8538cfaeca52e5e8ebeb366605ca3aa9743ef14aec3cb0ec004b27278eab

data/app/models/bscf/core/delivery_order.rb

@@ -1,30 +1,29 @@
 module Bscf::Core
   class DeliveryOrder < ApplicationRecord
     belongs_to :order
-    belongs_to :delivery_address, class_name: "Bscf::Core::Address"
+    belongs_to :pickup_address, class_name: "Bscf::Core::Address"
+    belongs_to :dropoff_address, class_name: "Bscf::Core::Address"
+    belongs_to :driver, class_name: "Bscf::Core::User", optional: true
 
     has_many :delivery_order_items, dependent: :destroy
     has_many :order_items, through: :delivery_order_items
     has_many :products, through: :delivery_order_items
 
-    attribute :delivery_start_time, :datetime
-    attribute :delivery_end_time, :datetime
-    attribute :actual_delivery_time, :datetime
-
-    validates :contact_phone, :status, :estimated_delivery_time, presence: true
+    validates :buyer_phone, :seller_phone, :driver_phone,
+              :status, :estimated_delivery_time, presence: true
     validate :end_time_after_start_time, if: -> { delivery_start_time.present? && delivery_end_time.present? }
 
     before_save :update_delivery_times
     before_save :calculate_actual_delivery_time
-
     after_save :sync_items_status, if: :saved_change_to_status?
 
     enum :status, {
       pending: 0,
       in_transit: 1,
-      delivered: 2,
-      failed: 3,
-      cancelled: 4
+      picked_up: 2,
+      delivered: 3,
+      failed: 4,
+      cancelled: 5
     }
 
     def delivery_duration

data/app/models/bscf/core/vehicle.rb

@@ -0,0 +1,12 @@
+module Bscf::Core
+  class Vehicle < ApplicationRecord
+    belongs_to :driver, class_name: "Bscf::Core::User", optional: true
+
+    validates :plate_number, presence: true, uniqueness: { case_sensitive: false }
+    validates :vehicle_type, presence: true
+    validates :brand, presence: true
+    validates :model, presence: true
+    validates :year, presence: true, numericality: { only_integer: true, greater_than: 1900, less_than_or_equal_to: Time.current.year }
+    validates :color, presence: true
+  end
+end

data/db/migrate/20250410115524_create_bscf_core_vehicles.rb

@@ -0,0 +1,17 @@
+class CreateBscfCoreVehicles < ActiveRecord::Migration[8.0]
+  def change
+    create_table :bscf_core_vehicles do |t|
+      t.references :driver, foreign_key: { to_table: :bscf_core_users }, null: true
+      t.string :plate_number, null: false
+      t.string :vehicle_type, null: false
+      t.string :brand, null: false
+      t.string :model, null: false
+      t.integer :year, null: false
+      t.string :color, null: false
+
+      t.timestamps
+    end
+
+    add_index :bscf_core_vehicles, :plate_number, unique: true
+  end
+end

data/db/migrate/20250410181144_add_delivery_details_to_delivery_orders.rb

@@ -0,0 +1,10 @@
+class AddDeliveryDetailsToDeliveryOrders < ActiveRecord::Migration[8.0]
+  def change
+    add_reference :bscf_core_delivery_orders, :driver, foreign_key: { to_table: :bscf_core_users }
+    add_reference :bscf_core_delivery_orders, :pickup_address, null: false, foreign_key: { to_table: :bscf_core_addresses }
+    add_column :bscf_core_delivery_orders, :buyer_phone, :string, null: false
+    add_column :bscf_core_delivery_orders, :seller_phone, :string, null: false
+    rename_column :bscf_core_delivery_orders, :delivery_address_id, :dropoff_address_id
+    rename_column :bscf_core_delivery_orders, :contact_phone, :driver_phone
+  end
+end

data/db/migrate/20250410181145_add_actual_delivery_time_to_delivery_orders.rb

@@ -0,0 +1,5 @@
+class AddActualDeliveryTimeToDeliveryOrders < ActiveRecord::Migration[8.0]
+  def change
+    add_column :bscf_core_delivery_orders, :actual_delivery_time, :datetime
+  end
+end

data/lib/bscf/core/version.rb

@@ -1,5 +1,5 @@
 module Bscf
   module Core
-    VERSION = "0.3.5"
+    VERSION = "0.3.6"
   end
 end

data/spec/factories/bscf/core/delivery_orders.rb

@@ -1,11 +1,34 @@
 FactoryBot.define do
   factory :delivery_order, class: 'Bscf::Core::DeliveryOrder' do
     association :order
-    association :delivery_address, factory: :address
-    contact_phone { Faker::PhoneNumber.phone_number }
+    association :pickup_address, factory: :address
+    association :dropoff_address, factory: :address
+    driver { nil }
+
+    buyer_phone { Faker::PhoneNumber.phone_number }
+    seller_phone { Faker::PhoneNumber.phone_number }
+    driver_phone { Faker::PhoneNumber.phone_number }
     delivery_notes { Faker::Lorem.paragraph }
     estimated_delivery_time { 2.days.from_now }
-    actual_delivery_time { nil }
+    delivery_start_time { nil }
+    delivery_end_time { nil }
     status { :pending }
+
+    trait :with_driver do
+      association :driver, factory: :user
+    end
+
+    trait :in_transit do
+      with_driver
+      status { :in_transit }
+      delivery_start_time { Time.current }
+    end
+
+    trait :delivered do
+      with_driver
+      status { :delivered }
+      delivery_start_time { 2.hours.ago }
+      delivery_end_time { Time.current }
+    end
   end
 end

data/spec/factories/bscf/core/vehicles.rb

@@ -0,0 +1,11 @@
+FactoryBot.define do
+  factory :vehicle, class: 'Bscf::Core::Vehicle' do
+    association :driver, factory: :user
+    sequence(:plate_number) { |n| "ABC#{n}123" }
+    vehicle_type { [ 'Truck', 'Van', 'Pickup' ].sample }
+    brand { [ 'Toyota', 'Ford', 'Mercedes', 'Volvo' ].sample }
+    model { [ 'Hilux', 'Transit', 'Actros', 'FH16' ].sample }
+    year { rand(2015..Time.current.year) }
+    color { [ 'White', 'Black', 'Silver', 'Blue' ].sample }
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: bscf-core
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Asrat
 bindir: bin
 cert_chain: []
-date: 2025-04-07 00:00:00.000000000 Z
+date: 2025-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -305,6 +305,7 @@ files:
 - app/models/bscf/core/user.rb
 - app/models/bscf/core/user_profile.rb
 - app/models/bscf/core/user_role.rb
+- app/models/bscf/core/vehicle.rb
 - app/models/bscf/core/virtual_account.rb
 - app/models/bscf/core/virtual_account_transaction.rb
 - app/models/bscf/core/wholesaler_product.rb
@@ -333,6 +334,9 @@ files:
 - db/migrate/20250402120554_create_bscf_core_wholesaler_products.rb
 - db/migrate/20250403190620_create_bscf_core_business_documents.rb
 - db/migrate/20250403194629_create_active_storage_tables.active_storage.rb
+- db/migrate/20250410115524_create_bscf_core_vehicles.rb
+- db/migrate/20250410181144_add_delivery_details_to_delivery_orders.rb
+- db/migrate/20250410181145_add_actual_delivery_time_to_delivery_orders.rb
 - lib/bscf/core.rb
 - lib/bscf/core/engine.rb
 - lib/bscf/core/version.rb
@@ -357,6 +361,7 @@ files:
 - spec/factories/bscf/core/user_profiles.rb
 - spec/factories/bscf/core/user_roles.rb
 - spec/factories/bscf/core/users.rb
+- spec/factories/bscf/core/vehicles.rb
 - spec/factories/bscf/core/virtual_account_transactions.rb
 - spec/factories/bscf/core/virtual_accounts.rb
 - spec/factories/bscf/core/wholesaler_products.rb
@@ -381,7 +386,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.5
+rubygems_version: 3.6.2
 specification_version: 4
 summary: An Engine for Supply Chain Financing
 test_files: []