dscf-marketplace 0.1.7 → 0.1.9

data/config/routes.rb

@@ -1,2 +1,87 @@
 Dscf::Marketplace::Engine.routes.draw do
+  # Core Models
+  resources :categories do
+    resources :products, only: [ :index ]
+    get "subcategories", on: :member
+  end
+
+  resources :products do
+    resources :listings, only: [ :index ]
+    get "supplier_products", on: :member
+  end
+
+  resources :units do
+    resources :unit_conversions, only: [ :index ]
+  end
+
+  resources :unit_conversions
+
+  # Trading Models
+  resources :supplier_products do
+    resources :listings, only: [ :index ]
+  end
+
+  resources :listings do
+    member do
+      post "activate"
+      post "pause"
+      post "sold_out"
+    end
+  end
+
+  # RFQ System
+  resources :request_for_quotations do
+    resources :rfq_items, only: [ :index, :create ]
+    resources :quotations, only: [ :index ]
+    member do
+      post "send_rfq"
+      post "close"
+    end
+  end
+
+  resources :rfq_items, only: [ :show, :update, :destroy ]
+
+  resources :quotations do
+    resources :quotation_items, only: [ :index, :create ]
+    member do
+      post "accept"
+      post "reject"
+      post "send_quotation"
+    end
+  end
+
+  resources :quotation_items, only: [ :show, :update, :destroy ]
+
+  # Order Management
+  resources :orders do
+    resources :order_items, only: [ :index ]
+    member do
+      post "confirm"
+      post "cancel"
+      post "complete"
+    end
+  end
+
+  resources :order_items, only: [ :show, :update ]
+
+  # Delivery System
+  resources :delivery_orders do
+    resources :delivery_order_items, only: [ :index ]
+    member do
+      post "pickup"
+      post "start_delivery"
+      post "complete_delivery"
+      post "mark_failed"
+    end
+  end
+
+  resources :delivery_order_items, only: [ :show, :update ] do
+    member do
+      post "receiver_confirm"
+      post "report_issue"
+      post "dispute_delivery"
+    end
+  end
+
+  resources :delivery_vehicles
 end

data/db/migrate/20250831110907_create_dscf_marketplace_delivery_orders.rb

@@ -0,0 +1,21 @@
+class CreateDscfMarketplaceDeliveryOrders < ActiveRecord::Migration[8.0]
+  def change
+    create_table :dscf_marketplace_delivery_orders do |t|
+      t.bigint :driver_id, null: false
+      t.bigint :pickup_address_id, null: false
+      t.integer :status
+      t.text :delivery_notes
+      t.datetime :estimated_delivery_time
+      t.datetime :actual_delivery_time
+      t.decimal :estimated_delivery_price
+      t.decimal :actual_delivery_price
+      t.json :optimized_route
+      t.integer :vehicle_type
+
+      t.timestamps
+    end
+
+    add_foreign_key :dscf_marketplace_delivery_orders, :dscf_core_users, column: :driver_id
+    add_foreign_key :dscf_marketplace_delivery_orders, :dscf_core_addresses, column: :pickup_address_id
+  end
+end

data/db/migrate/20250831110921_create_dscf_marketplace_delivery_order_items.rb

@@ -0,0 +1,27 @@
+class CreateDscfMarketplaceDeliveryOrderItems < ActiveRecord::Migration[8.0]
+  def change
+    create_table :dscf_marketplace_delivery_order_items do |t|
+      t.bigint :delivery_order_id, null: false
+      t.bigint :order_item_id, null: false
+      t.bigint :pickup_address_id, null: false
+      t.bigint :dropoff_address_id, null: false
+      t.decimal :quantity
+      t.integer :status
+      t.text :notes
+      t.decimal :pickup_verified_quantity
+      t.decimal :dropoff_verified_quantity
+      t.decimal :damaged_quantity
+      t.decimal :missing_quantity
+      t.text :pickup_notes
+      t.text :dropoff_notes
+      t.integer :position
+
+      t.timestamps
+    end
+
+    add_foreign_key :dscf_marketplace_delivery_order_items, :dscf_marketplace_delivery_orders, column: :delivery_order_id
+    add_foreign_key :dscf_marketplace_delivery_order_items, :dscf_marketplace_order_items, column: :order_item_id
+    add_foreign_key :dscf_marketplace_delivery_order_items, :dscf_core_addresses, column: :pickup_address_id
+    add_foreign_key :dscf_marketplace_delivery_order_items, :dscf_core_addresses, column: :dropoff_address_id
+  end
+end

data/db/migrate/20250831110933_create_dscf_marketplace_delivery_vehicles.rb

@@ -0,0 +1,17 @@
+class CreateDscfMarketplaceDeliveryVehicles < ActiveRecord::Migration[8.0]
+  def change
+    create_table :dscf_marketplace_delivery_vehicles do |t|
+      t.bigint :driver_id, null: false
+      t.string :plate_number
+      t.integer :vehicle_type
+      t.string :brand
+      t.string :model
+      t.integer :year
+      t.string :color
+
+      t.timestamps
+    end
+
+    add_foreign_key :dscf_marketplace_delivery_vehicles, :dscf_core_users, column: :driver_id
+  end
+end

data/db/migrate/20250901074509_add_delivery_handoff_fields_to_delivery_order_items.rb

@@ -0,0 +1,16 @@
+class AddDeliveryHandoffFieldsToDeliveryOrderItems < ActiveRecord::Migration[8.0]
+  def change
+    # Add new handoff fields
+    add_column :dscf_marketplace_delivery_order_items, :receiver_confirmed_at, :datetime
+    add_column :dscf_marketplace_delivery_order_items, :receiver_confirmed_by, :integer
+    add_column :dscf_marketplace_delivery_order_items, :receiver_notes, :text
+    add_column :dscf_marketplace_delivery_order_items, :handoff_checklist_completed, :boolean, default: false
+
+    # Add indexes for performance
+    add_index :dscf_marketplace_delivery_order_items, :receiver_confirmed_by
+    add_index :dscf_marketplace_delivery_order_items, :handoff_checklist_completed
+
+    # Note: Status enum migration handled separately to avoid data loss
+    # The status values will be updated in the model after this migration
+  end
+end

data/db/migrate/20250901074746_add_delivery_order_to_orders.rb

@@ -0,0 +1,7 @@
+class AddDeliveryOrderToOrders < ActiveRecord::Migration[8.0]
+  def change
+    add_column :dscf_marketplace_orders, :delivery_order_id, :bigint
+    add_foreign_key :dscf_marketplace_orders, :dscf_marketplace_delivery_orders, column: :delivery_order_id
+    add_index :dscf_marketplace_orders, :delivery_order_id
+  end
+end

data/db/migrate/20250901075511_add_delivery_vehicle_to_delivery_orders.rb

@@ -0,0 +1,7 @@
+class AddDeliveryVehicleToDeliveryOrders < ActiveRecord::Migration[8.0]
+  def change
+    add_column :dscf_marketplace_delivery_orders, :delivery_vehicle_id, :bigint
+    add_foreign_key :dscf_marketplace_delivery_orders, :dscf_marketplace_delivery_vehicles, column: :delivery_vehicle_id
+    add_index :dscf_marketplace_delivery_orders, :delivery_vehicle_id
+  end
+end

data/db/migrate/20250901080134_add_fulfillment_type_to_orders.rb

@@ -0,0 +1,6 @@
+class AddFulfillmentTypeToOrders < ActiveRecord::Migration[8.0]
+  def change
+    add_column :dscf_marketplace_orders, :fulfillment_type, :integer, default: 0
+    add_index :dscf_marketplace_orders, :fulfillment_type
+  end
+end

data/lib/dscf/marketplace/version.rb

@@ -1,5 +1,5 @@
 module Dscf
   module Marketplace
-    VERSION = "0.1.7".freeze
+    VERSION = "0.1.9".freeze
   end
 end

data/spec/factories/dscf/core/addresses.rb

@@ -0,0 +1,15 @@
+FactoryBot.define do
+  factory :dscf_core_address, class: "Dscf::Core::Address" do
+    user
+    address_type { 0 } # home
+    country { "Ethiopia" }
+    city { "Addis Ababa" }
+    sub_city { "Bole" }
+    woreda { "03" }
+    kebele { "07" }
+    house_numbers { "123" }
+    po_box { "1234" }
+    latitude { 9.1450 }
+    longitude { 38.7525 }
+  end
+end

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

@@ -0,0 +1,46 @@
+FactoryBot.define do
+  factory :dscf_marketplace_delivery_order_item, class: "Dscf::Marketplace::DeliveryOrderItem" do
+    association :delivery_order, factory: :dscf_marketplace_delivery_order
+    association :order_item, factory: :dscf_marketplace_order_item
+    pickup_address { create(:dscf_core_address) }
+    dropoff_address { create(:dscf_core_address) }
+    quantity { 10.0 }
+    status { :pending }
+    notes { "Test delivery item" }
+    pickup_verified_quantity { nil }
+    dropoff_verified_quantity { nil }
+    damaged_quantity { nil }
+    missing_quantity { nil }
+    pickup_notes { nil }
+    dropoff_notes { nil }
+    position { 1 }
+
+    trait :picked_up do
+      status { :picked_up }
+      pickup_verified_quantity { 10.0 }
+    end
+
+    trait :delivered do
+      status { :delivered }
+      pickup_verified_quantity { 10.0 }
+      dropoff_verified_quantity { 10.0 }
+    end
+
+    trait :receiver_confirmed do
+      status { :receiver_confirmed }
+      pickup_verified_quantity { 10.0 }
+      dropoff_verified_quantity { 10.0 }
+      receiver_confirmed_at { Time.current }
+      receiver_confirmed_by { create(:dscf_core_user).id }
+      handoff_checklist_completed { true }
+    end
+
+    trait :with_damage do
+      status { :damaged }
+      pickup_verified_quantity { 10.0 }
+      dropoff_verified_quantity { 8.0 }
+      damaged_quantity { 2.0 }
+      receiver_notes { "Package damaged during transport" }
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+FactoryBot.define do
+  factory :dscf_marketplace_delivery_order, class: "Dscf::Marketplace::DeliveryOrder" do
+    association :driver, factory: :dscf_core_user
+    association :pickup_address, factory: :dscf_core_address
+    status { :assigned }
+    delivery_notes { "Test delivery order" }
+    estimated_delivery_time { 2.hours.from_now }
+    actual_delivery_time { nil }
+    estimated_delivery_price { 50.0 }
+    actual_delivery_price { nil }
+    optimized_route { {} }
+    vehicle_type { :motorcycle }
+  end
+end

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

@@ -0,0 +1,37 @@
+FactoryBot.define do
+  factory :dscf_marketplace_delivery_vehicle, class: "Dscf::Marketplace::DeliveryVehicle" do
+    association :driver, factory: :dscf_core_user
+    sequence(:plate_number) { |n| "ABC#{n.to_s.rjust(3, "0")}" }
+    vehicle_type { :motorcycle }
+    brand { "Honda" }
+    model { "CBR" }
+    year { 2020 }
+    color { "Red" }
+
+    trait :car do
+      vehicle_type { :car }
+      brand { "Toyota" }
+      model { "Corolla" }
+    end
+
+    trait :van do
+      vehicle_type { :van }
+      brand { "Ford" }
+      model { "Transit" }
+    end
+
+    trait :truck do
+      vehicle_type { :truck }
+      brand { "Volvo" }
+      model { "FH16" }
+    end
+
+    trait :old_vehicle do
+      year { 2010 }
+    end
+
+    trait :future_vehicle do
+      year { Time.current.year + 2 }
+    end
+  end
+end

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

@@ -1,6 +1,6 @@
 FactoryBot.define do
   factory :dscf_marketplace_order_item, class: "Dscf::Marketplace::OrderItem" do
-    # Don't create order by default, let tests specify
+    association :order, factory: :dscf_marketplace_order
     quantity { 5 }
     unit_price { 10.0 }
     status { :pending }

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

@@ -2,8 +2,9 @@ FactoryBot.define do
   factory :dscf_marketplace_order, class: "Dscf::Marketplace::Order" do
     order_type { :rfq_based }
     status { :pending }
+    fulfillment_type { :self_pickup }
     association :user, factory: :dscf_core_user
-    quotation { nil }
+    association :quotation, factory: :dscf_marketplace_quotation
     listing { nil }
 
     trait :rfq_based do
@@ -17,6 +18,14 @@ FactoryBot.define do
       quotation { nil }
     end
 
+    trait :self_pickup do
+      fulfillment_type { :self_pickup }
+    end
+
+    trait :delivery do
+      fulfillment_type { :delivery }
+    end
+
     trait :confirmed do
       status { :confirmed }
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: dscf-marketplace
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.9
 platform: ruby
 authors:
 - Asrat
 bindir: bin
 cert_chain: []
-date: 2025-08-31 00:00:00.000000000 Z
+date: 2025-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -415,13 +415,21 @@ extensions: []
 extra_rdoc_files: []
 files:
 - MIT-LICENSE
-- README.md
 - Rakefile
 - app/controllers/dscf/marketplace/application_controller.rb
+- app/controllers/dscf/marketplace/categories_controller.rb
+- app/controllers/dscf/marketplace/listings_controller.rb
+- app/controllers/dscf/marketplace/orders_controller.rb
+- app/controllers/dscf/marketplace/products_controller.rb
+- app/controllers/dscf/marketplace/quotations_controller.rb
+- app/controllers/dscf/marketplace/request_for_quotations_controller.rb
 - app/jobs/dscf/marketplace/application_job.rb
 - app/mailers/dscf/marketplace/application_mailer.rb
 - app/models/dscf/marketplace/application_record.rb
 - 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_vehicle.rb
 - app/models/dscf/marketplace/listing.rb
 - app/models/dscf/marketplace/order.rb
 - app/models/dscf/marketplace/order_item.rb
@@ -433,6 +441,13 @@ files:
 - app/models/dscf/marketplace/supplier_product.rb
 - app/models/dscf/marketplace/unit.rb
 - app/models/dscf/marketplace/unit_conversion.rb
+- app/serializers/dscf/marketplace/category_serializer.rb
+- app/serializers/dscf/marketplace/listing_serializer.rb
+- app/serializers/dscf/marketplace/order_serializer.rb
+- app/serializers/dscf/marketplace/product_serializer.rb
+- app/serializers/dscf/marketplace/quotation_serializer.rb
+- app/serializers/dscf/marketplace/request_for_quotation_serializer.rb
+- config/locales/en.yml
 - config/routes.rb
 - db/migrate/20250827172043_create_dscf_marketplace_categories.rb
 - db/migrate/20250827173526_update_dscf_marketplace_categories_indexes.rb
@@ -449,14 +464,25 @@ files:
 - db/migrate/20250828090500_change_quotation_status_to_integer.rb
 - db/migrate/20250828115509_create_dscf_marketplace_orders.rb
 - db/migrate/20250828115525_create_dscf_marketplace_order_items.rb
+- db/migrate/20250831110907_create_dscf_marketplace_delivery_orders.rb
+- db/migrate/20250831110921_create_dscf_marketplace_delivery_order_items.rb
+- db/migrate/20250831110933_create_dscf_marketplace_delivery_vehicles.rb
+- db/migrate/20250901074509_add_delivery_handoff_fields_to_delivery_order_items.rb
+- db/migrate/20250901074746_add_delivery_order_to_orders.rb
+- db/migrate/20250901075511_add_delivery_vehicle_to_delivery_orders.rb
+- db/migrate/20250901080134_add_fulfillment_type_to_orders.rb
 - lib/dscf/marketplace.rb
 - lib/dscf/marketplace/engine.rb
 - lib/dscf/marketplace/version.rb
 - lib/tasks/dscf/marketplace_tasks.rake
+- spec/factories/dscf/core/addresses.rb
 - spec/factories/dscf/core/business_types.rb
 - spec/factories/dscf/core/businesses.rb
 - spec/factories/dscf/core/users.rb
 - 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_vehicles.rb
 - spec/factories/dscf/marketplace/listings.rb
 - spec/factories/dscf/marketplace/order_items.rb
 - spec/factories/dscf/marketplace/orders.rb

data/README.md

@@ -1,28 +0,0 @@
-# Dscf::Marketplace
-Short description and motivation.
-
-## Usage
-How to use my plugin.
-
-## Installation
-Add this line to your application's Gemfile:
-
-```ruby
-gem "dscf-marketplace"
-```
-
-And then execute:
-```bash
-$ bundle
-```
-
-Or install it yourself as:
-```bash
-$ gem install dscf-marketplace
-```
-
-## Contributing
-Contribution directions go here.
-
-## License
-The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).