bscf-core 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3cde161c7d4c6d6ccb3959aec98e0d3a573e9bc479aad54047a83292b7153bdb
-  data.tar.gz: 58b576b12c6baae3ddb9c646f258c62207e28f214a3dbcfb7c5aef400e27f996
+  metadata.gz: 75345bb3a5869aba8be1a2a9a71d83634f0361375caa67c050f89132c80a7af7
+  data.tar.gz: 609ce23cc23a142163c6a2d12ceaea2de8315512dade8336fc3f7367b1421b9a
 SHA512:
-  metadata.gz: ae312fd7b2c3e2a44d91d1c06141d24da26063497263704a32c78b880fa4f6a53cc01999cdfba53823df5f9e88ac4dcd40a5c4deb052e0c4128663952a129409
-  data.tar.gz: ed20ab86ae39f63bb25bb0d4493d17d67a15e0db36939392f14b324d5eaf716474f2a4f03cd357f3a2ae0d6142ab0c86739882efa1abb4e48279efc23b499c97
+  metadata.gz: de59cc788cb76d57b82f19dd4628dbbd5dd4960d66fe80127a65cfe86104b3b574e7d1c348add0b4f09b31bdf27d77ff75756dde916128e02452071c2acd55a6
+  data.tar.gz: 339827dcdfed5cf99bf8e3f5f168a423f346f493ca1b0f5762df80a66a05b5441f5244da11142bb23e07ef331d0151c1cca78ae2c131619b7233c691da92d807

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

@@ -0,0 +1,61 @@
+module Bscf::Core
+  class DeliveryOrder < ApplicationRecord
+    belongs_to :order
+    belongs_to :delivery_address, class_name: "Bscf::Core::Address"
+
+    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
+    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
+    }
+
+    def delivery_duration
+      return nil unless delivery_start_time && delivery_end_time
+      ((delivery_end_time - delivery_start_time) / 1.hour).round(2)
+    end
+
+    private
+
+    def update_delivery_times
+      case status
+      when "in_transit"
+        self.delivery_start_time = Time.current if delivery_start_time.nil?
+      when "delivered", "failed"
+        self.delivery_end_time = Time.current if delivery_end_time.nil?
+      end
+    end
+
+    def calculate_actual_delivery_time
+      self.actual_delivery_time = delivery_end_time if status == "delivered"
+    end
+
+    def end_time_after_start_time
+      return unless delivery_start_time && delivery_end_time
+      if delivery_end_time <= delivery_start_time
+        errors.add(:delivery_end_time, "must be after delivery start time")
+      end
+    end
+
+    def sync_items_status
+      delivery_order_items.update_all(status: status)
+    end
+  end
+end

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

@@ -0,0 +1,51 @@
+module Bscf::Core
+  class DeliveryOrderItem < ApplicationRecord
+    belongs_to :delivery_order
+    belongs_to :order_item
+    belongs_to :product
+
+    validates :quantity, :status, presence: true
+    validate :quantity_not_exceeding_order_item
+    validate :status_matches_delivery_order
+
+    after_save :update_delivery_order_status
+    before_save :sync_status_with_delivery_order
+
+    enum :status, {
+      pending: 0,
+      in_transit: 1,
+      delivered: 2,
+      failed: 3,
+      cancelled: 4
+    }
+
+    private
+
+    def quantity_not_exceeding_order_item
+      return unless quantity && order_item&.quantity
+      if quantity > order_item.quantity
+        errors.add(:quantity, "cannot exceed order item quantity (#{order_item.quantity.to_i})")
+      end
+    end
+
+    def status_matches_delivery_order
+      return unless delivery_order && status_changed?
+      unless status.to_s == delivery_order.status
+        errors.add(:status, "must match delivery order status")
+      end
+    end
+
+    def sync_status_with_delivery_order
+      self.status = delivery_order.status if delivery_order
+    end
+
+    def update_delivery_order_status
+      return unless status_previously_changed?
+
+      all_items_status = delivery_order.delivery_order_items.pluck(:status).uniq
+      if all_items_status.size == 1
+        delivery_order.update(status: all_items_status.first)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+module Bscf
+  module Core
+    class MarketplaceListing < ApplicationRecord
+      belongs_to :user
+      belongs_to :address
+
+      validates :listing_type, :status, :is_active, presence: true
+
+      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/order.rb

@@ -4,7 +4,7 @@ module Bscf
       belongs_to :ordered_by, class_name: "Bscf::Core::User", optional: true
       belongs_to :ordered_to, class_name: "Bscf::Core::User", optional: true
       belongs_to :quotation, optional: true
-
+      has_many :order_items, dependent: :destroy
       validates :order_type, :status, presence: true
 
       enum :order_type, {

data/db/migrate/20250330181143_create_bscf_core_delivery_orders.rb

@@ -0,0 +1,16 @@
+class CreateBscfCoreDeliveryOrders < ActiveRecord::Migration[8.0]
+  def change
+    create_table :bscf_core_delivery_orders do |t|
+      t.references :order, null: false, foreign_key: { to_table: :bscf_core_orders, on_delete: :cascade, on_update: :cascade }
+      t.references :delivery_address, null: false, foreign_key: { to_table: :bscf_core_addresses }
+      t.string :contact_phone, null: false
+      t.text :delivery_notes
+      t.datetime :estimated_delivery_time, null: false
+      t.datetime :delivery_start_time
+      t.datetime :delivery_end_time
+      t.integer :status, null: false, default: 0
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20250330190145_create_bscf_core_delivery_order_items.rb

@@ -0,0 +1,14 @@
+class CreateBscfCoreDeliveryOrderItems < ActiveRecord::Migration[8.0]
+  def change
+    create_table :bscf_core_delivery_order_items do |t|
+      t.references :delivery_order, null: false, foreign_key: { to_table: :bscf_core_delivery_orders }
+      t.references :order_item, null: false, foreign_key: { to_table: :bscf_core_order_items }
+      t.references :product, null: false, foreign_key: { to_table: :bscf_core_products }
+      t.integer :quantity, null: false
+      t.integer :status, null: false, default: 0
+      t.text :notes
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20250331113323_create_bscf_core_marketplace_listings.rb

@@ -0,0 +1,16 @@
+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.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.timestamps
+    end
+  end
+end

data/lib/bscf/core/version.rb

@@ -1,5 +1,5 @@
 module Bscf
   module Core
-    VERSION = "0.2.4"
+    VERSION = "0.3.0"
   end
 end

data/lib/bscf/core.rb

@@ -1,5 +1,9 @@
 require "bscf/core/version"
 require "bscf/core/engine"
+require "jwt"
+require "active_model_serializers"
+require "ancestry"
+require "ransack"
 
 module Bscf
   module Core

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

@@ -0,0 +1,10 @@
+FactoryBot.define do
+  factory :delivery_order_item, class: 'Bscf::Core::DeliveryOrderItem' do
+    association :delivery_order
+    association :order_item
+    association :product
+    quantity { order_item.quantity }
+    status { :pending }
+    notes { Faker::Lorem.paragraph }
+  end
+end

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

@@ -0,0 +1,11 @@
+FactoryBot.define do
+  factory :delivery_order, class: 'Bscf::Core::DeliveryOrder' do
+    association :order
+    association :delivery_address, factory: :address
+    contact_phone { Faker::PhoneNumber.phone_number }
+    delivery_notes { Faker::Lorem.paragraph }
+    estimated_delivery_time { 2.days.from_now }
+    actual_delivery_time { nil }
+    status { :pending }
+  end
+end

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

@@ -0,0 +1,12 @@
+FactoryBot.define do
+  factory :marketplace_listing, class: 'Bscf::Core::MarketplaceListing' do
+    user
+    listing_type { 1 }
+    allow_partial_match { false }
+    preferred_delivery_date { DateTime.now.advance(days: 7) }
+    expires_at { DateTime.now.advance(days: 5) }
+    is_active { true }
+    status { 1 }
+    address
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bscf-core
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - Asrat
@@ -290,6 +290,9 @@ files:
 - app/models/bscf/core/application_record.rb
 - app/models/bscf/core/business.rb
 - app/models/bscf/core/category.rb
+- app/models/bscf/core/delivery_order.rb
+- app/models/bscf/core/delivery_order_item.rb
+- app/models/bscf/core/marketplace_listing.rb
 - app/models/bscf/core/order.rb
 - app/models/bscf/core/order_item.rb
 - app/models/bscf/core/product.rb
@@ -308,8 +311,8 @@ files:
 - config/routes.rb
 - db/migrate/20250326065606_create_bscf_core_users.rb
 - db/migrate/20250326075111_create_bscf_core_roles.rb
+- db/migrate/20250326080052_create_bscf_core_addresses.rb
 - db/migrate/20250326080646_create_bscf_core_user_profiles.rb
-- db/migrate/20250326081052_create_bscf_core_addresses.rb
 - db/migrate/20250326084233_create_bscf_core_user_roles.rb
 - db/migrate/20250326085741_create_bscf_core_virtual_accounts.rb
 - db/migrate/20250326103305_create_bscf_core_categories.rb
@@ -322,6 +325,9 @@ files:
 - db/migrate/20250327044020_create_bscf_core_quotation_items.rb
 - db/migrate/20250327102217_create_bscf_core_orders.rb
 - db/migrate/20250327112412_create_bscf_core_order_items.rb
+- 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
 - lib/bscf/core.rb
 - lib/bscf/core/engine.rb
 - lib/bscf/core/version.rb
@@ -330,6 +336,9 @@ files:
 - spec/factories/bscf/core/addresses.rb
 - spec/factories/bscf/core/businesses.rb
 - spec/factories/bscf/core/categories.rb
+- spec/factories/bscf/core/delivery_order_items.rb
+- spec/factories/bscf/core/delivery_orders.rb
+- spec/factories/bscf/core/marketplace_listings.rb
 - spec/factories/bscf/core/order_items.rb
 - spec/factories/bscf/core/orders.rb
 - spec/factories/bscf/core/products.rb
@@ -364,7 +373,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: []