bscf-core 0.3.4 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8d2f8615fb86130f7abc8d3ee5f5d31bb5848dbb1e0702085137123dc497867
-  data.tar.gz: 4f139bbbc27a3657b8c0c00e39ed2045be174ff61ef4c7ac372628981e4aca47
+  metadata.gz: 0f663a88fd05be1fcf61a27b261cf3705cf813492cf81cb5ca4b995a475335b0
+  data.tar.gz: 3027a949d685908b5fa68253b93adf3ab34d36645d643aecd7d73037a04c0bf7
 SHA512:
-  metadata.gz: 8ac6729e3c83271a58c765db29ed899be2f846f7620368d52db5de17dab0b528d2a357ab0cc6d08e6e9892bf8e31f07a7b8c18b563a3dd5ef26fc8b557d2b99e
-  data.tar.gz: 50fd1d3532210e10c0c2b491a64f43d16d05624a5fc6346eb79eee330764a473be133976062b7c0fda22b26fb6ae866df1e64fd8cb4ac4030cb240d78c03f164
+  metadata.gz: 1f0e784375d6ceb2d2bb801a9b89788d9c281a68e965dc3b15ba651a2a6f72dbdfc045be1bd4cc4f65450d0cb7d4e7b11e13d6dd4933b11fd750f8a0af3e7388
+  data.tar.gz: 40af2d0ffd652e1f8405533d1f8701676c372c907265f9ce6a4e6d9df43e034d27fd8538cfaeca52e5e8ebeb366605ca3aa9743ef14aec3cb0ec004b27278eab

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

@@ -0,0 +1,40 @@
+module Bscf
+  module Core
+    class BusinessDocument < ApplicationRecord
+      belongs_to :business
+      has_one_attached :file
+
+      before_validation :format_document_name
+
+      validates :document_number, presence: true
+      validates :document_name, presence: true
+      validates :business_id, presence: true
+      validates :verified_at, presence: true, if: :is_verified?
+      validates :file, presence: true
+      validate :block_executable_files
+
+      scope :verified, -> { where(is_verified: true) }
+      scope :unverified, -> { where(is_verified: false) }
+
+      private
+
+      def format_document_name
+        self.document_name = document_name.strip.titleize if document_name.present?
+      end
+
+      def block_executable_files
+        return unless file.attached?
+
+        if file.content_type.in?(%w[
+          application/x-msdownload
+          application/x-executable
+          application/x-msdos-program
+          application/x-ms-dos-executable
+          application/x-shellscript
+        ])
+          errors.add(:file, "cannot be an executable file")
+        end
+      end
+    end
+  end
+end

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/marketplace_listing.rb

@@ -8,7 +8,6 @@ module Bscf
 
       enum :listing_type, { buy: 0, sell: 1 }
       enum :status, { open: 0, partially_matched: 1, matched: 2, completed: 3, cancelled: 4 }
-
     end
   end
 end

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

@@ -2,7 +2,12 @@ module Bscf
   module Core
     class Product < ApplicationRecord
       belongs_to :category
+      has_one_attached :thumbnail
+      has_many_attached :images
 
+      validates :sku, presence: true, uniqueness: true
+      validates :name, presence: true
+      validates :description, presence: true
       has_many :rfq_items
       has_many :request_for_quotations, through: :rfq_items
 

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/app/models/bscf/core/wholesaler_product.rb

@@ -0,0 +1,36 @@
+module Bscf::Core
+  class WholesalerProduct < ApplicationRecord
+    belongs_to :business
+    belongs_to :product
+
+    validates :minimum_order_quantity, presence: true, numericality: { greater_than: 0 }
+    validates :wholesale_price, presence: true, numericality: { greater_than: 0 }
+    validates :available_quantity, presence: true, numericality: { greater_than_or_equal_to: 0 }
+    validates :status, presence: true
+
+    validate :business_must_be_wholesaler
+    validate :unique_product_per_wholesaler
+
+    enum :status, {
+      active: 0,
+      inactive: 1,
+      out_of_stock: 2
+    }
+
+    private
+
+    def business_must_be_wholesaler
+      if business && !business.wholesaler?
+        errors.add(:business, "must be a wholesaler")
+      end
+    end
+
+    def unique_product_per_wholesaler
+      if WholesalerProduct.where(business: business, product: product)
+                         .where.not(id: id)
+                         .exists?
+        errors.add(:product, "already exists for this wholesaler")
+      end
+    end
+  end
+end

data/db/migrate/20250331113323_create_bscf_core_marketplace_listings.rb

@@ -1,14 +1,14 @@
 class CreateBscfCoreMarketplaceListings < ActiveRecord::Migration[8.0]
   def change
     create_table :bscf_core_marketplace_listings do |t|
-      t.references :user, null: false, foreign_key: {to_table: :bscf_core_users}
+      t.references :user, null: false, foreign_key: { to_table: :bscf_core_users }
       t.integer :listing_type, null: false
       t.integer :status, null: false
       t.boolean :allow_partial_match, null: false, default: false
       t.datetime :preferred_delivery_date
       t.datetime :expires_at
       t.boolean :is_active, default: true
-      t.references :address, null: false, foreign_key: {to_table: :bscf_core_addresses}
+      t.references :address, null: false, foreign_key: { to_table: :bscf_core_addresses }
 
       t.timestamps
     end

data/db/migrate/20250402120554_create_bscf_core_wholesaler_products.rb

@@ -0,0 +1,14 @@
+class CreateBscfCoreWholesalerProducts < ActiveRecord::Migration[8.0]
+  def change
+    create_table :bscf_core_wholesaler_products do |t|
+      t.references :business, null: false, foreign_key: { to_table: :bscf_core_businesses }
+      t.references :product, null: false, foreign_key: { to_table: :bscf_core_products }
+      t.integer :minimum_order_quantity, null: false, default: 1
+      t.decimal :wholesale_price
+      t.integer :available_quantity, null: false, default: 0
+      t.integer :status, null: false, default: 0
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20250403190620_create_bscf_core_business_documents.rb

@@ -0,0 +1,14 @@
+class CreateBscfCoreBusinessDocuments < ActiveRecord::Migration[8.0]
+  def change
+    create_table :bscf_core_business_documents do |t|
+      t.references :business, null: false, foreign_key: { to_table: :bscf_core_businesses }
+      t.string :document_number, null: false
+      t.string :document_name, null: false
+      t.string :document_description
+      t.datetime :verified_at
+      t.boolean :is_verified, null: false, default: false
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20250403194629_create_active_storage_tables.active_storage.rb

@@ -0,0 +1,57 @@
+# This migration comes from active_storage (originally 20170806125915)
+class CreateActiveStorageTables < ActiveRecord::Migration[7.0]
+  def change
+    # Use Active Record's configured type for primary and foreign keys
+    primary_key_type, foreign_key_type = primary_and_foreign_key_types
+
+    create_table :active_storage_blobs, id: primary_key_type do |t|
+      t.string   :key,          null: false
+      t.string   :filename,     null: false
+      t.string   :content_type
+      t.text     :metadata
+      t.string   :service_name, null: false
+      t.bigint   :byte_size,    null: false
+      t.string   :checksum
+
+      if connection.supports_datetime_with_precision?
+        t.datetime :created_at, precision: 6, null: false
+      else
+        t.datetime :created_at, null: false
+      end
+
+      t.index [ :key ], unique: true
+    end
+
+    create_table :active_storage_attachments, id: primary_key_type do |t|
+      t.string     :name,     null: false
+      t.references :record,   null: false, polymorphic: true, index: false, type: foreign_key_type
+      t.references :blob,     null: false, type: foreign_key_type
+
+      if connection.supports_datetime_with_precision?
+        t.datetime :created_at, precision: 6, null: false
+      else
+        t.datetime :created_at, null: false
+      end
+
+      t.index [ :record_type, :record_id, :name, :blob_id ], name: :index_active_storage_attachments_uniqueness, unique: true
+      t.foreign_key :active_storage_blobs, column: :blob_id
+    end
+
+    create_table :active_storage_variant_records, id: primary_key_type do |t|
+      t.belongs_to :blob, null: false, index: false, type: foreign_key_type
+      t.string :variation_digest, null: false
+
+      t.index [ :blob_id, :variation_digest ], name: :index_active_storage_variant_records_uniqueness, unique: true
+      t.foreign_key :active_storage_blobs, column: :blob_id
+    end
+  end
+
+  private
+    def primary_and_foreign_key_types
+      config = Rails.configuration.generators
+      setting = config.options[config.orm][:primary_key_type]
+      primary_key_type = setting || :primary_key
+      foreign_key_type = setting || :bigint
+      [ primary_key_type, foreign_key_type ]
+    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.4"
+    VERSION = "0.3.6"
   end
 end

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

@@ -0,0 +1,23 @@
+FactoryBot.define do
+  factory :business_document, class: 'Bscf::Core::BusinessDocument' do
+    association :business, factory: :business
+    document_number { "DOC-#{SecureRandom.hex(4).upcase}" }
+    document_name { "Business License" }
+    document_description { "Official business license document" }
+    is_verified { false }
+
+    after(:build) do |document|
+      document.file.attach(
+        io: StringIO.new("test content"),
+        filename: 'sample.pdf',
+        content_type: 'application/pdf'
+      )
+    end
+
+    trait :verified do
+      is_verified { true }
+      verified_at { Time.current }
+      association :business, factory: :business
+    end
+  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/products.rb

@@ -1,8 +1,28 @@
 FactoryBot.define do
   factory :product, class: 'Bscf::Core::Product' do
+    category
+    sequence(:sku) { |n| "SKU-#{n}" }
     name { Faker::Commerce.product_name }
     description { Faker::Lorem.paragraph }
-    association :category, factory: :category
-    base_price { Faker::Commerce.price(range: 0..1000.0) }
+
+    after(:build) do |product|
+      product.thumbnail.attach(
+        io: StringIO.new("test image"),
+        filename: 'thumbnail.jpg',
+        content_type: 'image/jpeg'
+      )
+    end
+
+    trait :with_images do
+      after(:build) do |product|
+        2.times do |i|
+          product.images.attach(
+            io: StringIO.new("test image #{i}"),
+            filename: "image_#{i}.jpg",
+            content_type: 'image/jpeg'
+          )
+        end
+      end
+    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

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

@@ -0,0 +1,19 @@
+FactoryBot.define do
+  factory :wholesaler_product, class: 'Bscf::Core::WholesalerProduct' do
+    association :business, :wholesaler
+    association :product
+    minimum_order_quantity { Faker::Number.between(from: 5, to: 100) }
+    wholesale_price { Faker::Commerce.price(range: 50..1000.0) }
+    available_quantity { Faker::Number.between(from: 100, to: 1000) }
+    status { :active }
+  end
+
+  trait :inactive do
+    status { :inactive }
+  end
+
+  trait :out_of_stock do
+    status { :out_of_stock }
+    available_quantity { 0 }
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: bscf-core
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  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
@@ -289,6 +289,7 @@ files:
 - app/models/bscf/core/address.rb
 - app/models/bscf/core/application_record.rb
 - app/models/bscf/core/business.rb
+- app/models/bscf/core/business_document.rb
 - app/models/bscf/core/category.rb
 - app/models/bscf/core/delivery_order.rb
 - app/models/bscf/core/delivery_order_item.rb
@@ -304,9 +305,11 @@ 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/services/token_service.rb
+- app/models/bscf/core/wholesaler_product.rb
+- app/services/bscf/core/token_service.rb
 - config/database.yml
 - config/routes.rb
 - db/migrate/20250326065606_create_bscf_core_users.rb
@@ -328,6 +331,12 @@ files:
 - db/migrate/20250330181143_create_bscf_core_delivery_orders.rb
 - db/migrate/20250330190145_create_bscf_core_delivery_order_items.rb
 - db/migrate/20250331113323_create_bscf_core_marketplace_listings.rb
+- 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
@@ -335,6 +344,7 @@ files:
 - lib/tasks/bscf/core_tasks.rake
 - lib/tasks/release.rake
 - spec/factories/bscf/core/addresses.rb
+- spec/factories/bscf/core/business_documents.rb
 - spec/factories/bscf/core/businesses.rb
 - spec/factories/bscf/core/categories.rb
 - spec/factories/bscf/core/delivery_order_items.rb
@@ -351,8 +361,10 @@ 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
 homepage: https://mksaddis.com/
 licenses:
 - MIT
@@ -374,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: []