bscf-core 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: edbe11919e64a7d36377d85759973899a2407eb6417e7d070eb78ee9c2062bf6
-  data.tar.gz: 37375af1d5dfdf4f4703540d8e3c6d7c2d7496026421b8ae8e4c5c412cb23fd2
+  metadata.gz: ac477439e787a6451f0b7d5a92ac75e430ac8b0ddcd7a04bb5f8e57c4bd086dc
+  data.tar.gz: 4bd37eaa9562180049efec4028c438404bce7f08661c27c2c9e4018ba88a724a
 SHA512:
-  metadata.gz: 2de3ef4fe24d2536031b4f527a5d7ed90f958f736d255157a9e17836c50e8587d00fa06ed2128e14b35102af7b81a9ba74bcc6994047f755e728e9e6cf1d1b9c
-  data.tar.gz: 80a64d9c90c60baaf9966dee56261e41675a9fcf8e3091059b994e8fa2af36bc607caf192a22504fa74cff29b7d7fca4bc8e6061918c0db991e3556f739c590b
+  metadata.gz: 37282dd5fdd0974155a6d4f05000fca63f94d897a61d16d764e3dc047a769957ec7927f99924852e7b6f12e425e71689b18f59a987e984a88d21b31d9fe6ba12
+  data.tar.gz: 7c5d5491af64a7f91ed9a951fa04358e74a7e124d6e3f4fd232c9a8ef1461be00aaa11fc296c0fdf673145618f15035756927e6ee75b1a0e2c83f80a9879ada9

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

@@ -2,6 +2,31 @@ module Bscf
   module Core
     class Address < ApplicationRecord
       has_many :user_profiles
+
+      # Add associations for delivery orders and items
+      has_many :delivery_order_pickups, class_name: "Bscf::Core::DeliveryOrder", foreign_key: "pickup_address_id"
+      has_many :delivery_order_dropoffs, class_name: "Bscf::Core::DeliveryOrder", foreign_key: "dropoff_address_id"
+      has_many :delivery_order_item_pickups, class_name: "Bscf::Core::DeliveryOrderItem", foreign_key: "pickup_address_id"
+      has_many :delivery_order_item_dropoffs, class_name: "Bscf::Core::DeliveryOrderItem", foreign_key: "dropoff_address_id"
+
+      validates :latitude, :longitude, presence: true, if: :requires_coordinates?
+
+      def coordinates
+        %i[latitude longitude] if latitude.present? && longitude.present?
+      end
+
+      def full_address
+        %i[house_number woreda sub_city city].compact.join(", ")
+      end
+
+      private
+
+      def requires_coordinates?
+        # Determine when coordinates are required
+        # For delivery addresses, they should always be required
+        delivery_order_pickups.any? || delivery_order_dropoffs.any? ||
+        delivery_order_item_pickups.any? || delivery_order_item_dropoffs.any?
+      end
     end
   end
 end

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

@@ -1,62 +1,139 @@
-module Bscf::Core
-  class DeliveryOrder < ApplicationRecord
-    has_many :orders
-    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
-
-    validates :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,
-      picked_up: 2,
-      delivered: 3,
-      received: 4,
-      paid: 5,
-      failed: 6,
-      cancelled: 7
-    }
-
-    def delivery_duration
-      return nil unless delivery_start_time && delivery_end_time
-      ((delivery_end_time - delivery_start_time) / 1.hour).round(2)
-    end
+module Bscf
+  module Core
+    class DeliveryOrder < ApplicationRecord
+      has_many :orders
+      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
+
+      validates :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?
 
-    private
+      enum :status, {
+        pending: 0,
+        in_transit: 1,
+        picked_up: 2,
+        delivered: 3,
+        received: 4,
+        paid: 5,
+        failed: 6,
+        cancelled: 7
+      }
 
-    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?
+      def delivery_duration
+        return nil unless delivery_start_time && delivery_end_time
+        ((delivery_end_time - delivery_start_time) / 1.hour).round(2)
       end
-    end
 
-    def calculate_actual_delivery_time
-      self.actual_delivery_time = delivery_end_time if status == "delivered"
-    end
+      def optimized_route
+        return nil unless pickup_address&.coordinates.present?
+
+        # Get all delivery order items with dropoff addresses
+        items_with_dropoffs = delivery_order_items.includes(:dropoff_address)
+                                                  .where.not(dropoff_address: nil)
+
+        dropoff_addresses = items_with_dropoffs.map(&:dropoff_address).compact.uniq
+        return nil if dropoff_addresses.empty?
 
-    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")
+        # Check if all dropoff addresses have coordinates
+        return nil if dropoff_addresses.any? { |addr| addr.coordinates.blank? }
+
+        # Call Gebeta Maps service
+        gebeta_service = Bscf::Core::GebetaMapsService.new
+        route_data = gebeta_service.optimize_route(pickup_address, dropoff_addresses)
+
+        # Return nil if route_data is empty or doesn't have waypoints
+        return nil if route_data.blank? || !route_data.key?("waypoints")
+
+        # Cache the result if needed
+        # Rails.cache.write("delivery_order_route_#{id}", route_data, expires_in: 1.hour)
+        route_data
       end
-    end
 
-    def sync_items_status
-      delivery_order_items.update_all(status: status)
+      # Reorder delivery items based on optimized route or provided positions
+      def reorder_items_by_route(positions = nil)
+        if positions.is_a?(Hash)
+          # Use provided positions
+          positions.each do |item_id, position|
+            if item = delivery_order_items.find_by(id: item_id)
+              item.update(position: position)
+            end
+          end
+          true
+        else
+          return false if positions && !positions.is_a?(Hash)
+
+          # Use optimized route
+          route_data = optimized_route
+
+          return false unless route_data.present? && route_data["waypoints"].present?
+
+          # Get the optimized order of waypoints
+          waypoint_order = route_data["waypoints"].map { |wp| wp["waypoint_index"] }
+
+          # Get all delivery order items with dropoff addresses
+          items_with_dropoffs = delivery_order_items.includes(:dropoff_address)
+                                                    .where.not(dropoff_address: nil)
+                                                    .to_a
+
+          # Skip if we don't have the same number of items as waypoints
+          return false if items_with_dropoffs.size != waypoint_order.size
+
+          # Reorder items based on waypoint order
+          waypoint_order.each_with_index do |original_index, new_position|
+            if item = items_with_dropoffs[original_index]
+              item.update(position: new_position + 1)
+            end
+          end
+
+          true
+        end
+      end
+
+      # Add this method to the DeliveryOrder class
+      def dropoff_addresses
+        delivery_order_items.includes(:dropoff_address)
+                            .where.not(dropoff_address: nil)
+                            .map(&:dropoff_address)
+                            .compact
+                            .uniq
+      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
 end

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

@@ -11,6 +11,9 @@ module Bscf::Core
 
     after_save :update_delivery_order_status
     before_save :sync_status_with_delivery_order
+    before_save :set_default_pickup_address, if: -> { pickup_address.nil? && delivery_order.present? }
+    # Add default scope for ordering by position
+    default_scope { order(position: :asc) }
 
     enum :status, {
       pending: 0,
@@ -22,6 +25,10 @@ module Bscf::Core
 
     private
 
+    def set_default_pickup_address
+      self.pickup_address = delivery_order.pickup_address
+    end
+
     def quantity_not_exceeding_order_item
       return unless quantity && order_item&.quantity
       if quantity > order_item.quantity

data/app/services/bscf/core/gebeta_maps_service.rb

@@ -0,0 +1,59 @@
+  require "httparty"
+
+  module Bscf
+    module Core
+      class GebetaMapsService
+        include HTTParty
+        base_uri "https://api.gebeta.app/api/v1"
+
+        def initialize
+          @api_key = ENV["GEBETA_API_KEY"]
+        end
+
+        # One-to-Many (ONM) API for route optimization
+        def optimize_route(origin_address, destination_addresses)
+          return {} if destination_addresses.empty?
+
+          # Extract coordinates
+          origin = origin_address.coordinates
+          destinations = destination_addresses.map(&:coordinates).compact
+
+          return {} if origin.nil? || destinations.empty?
+
+          # Prepare destinations in the format expected by Gebeta Maps
+          destinations_json = destinations.map.with_index do |coords, index|
+            {
+              id: index,
+              point: {
+                lat: coords[0],
+                lng: coords[1]
+              }
+            }
+          end.to_json
+
+          # Make API request
+          response = self.class.get(
+            "/direction/onm",
+            query: {
+              origin: "#{origin[0]},#{origin[1]}",
+              json: destinations_json,
+              key: @api_key
+            }
+          )
+
+          handle_response(response)
+        end
+
+        private
+
+        def handle_response(response)
+          if response.success?
+            JSON.parse(response.body)
+          else
+            Rails.logger.error("Gebeta Maps API error: #{response.code} - #{response.body}")
+            {}
+          end
+        end
+      end
+    end
+  end

data/config/master.key

@@ -0,0 +1 @@
+3009aef5af3ca1ddb654f74ad2ac7d5a

data/db/migrate/20250616134209_update_address_coordinates_type.rb

@@ -0,0 +1,6 @@
+class UpdateAddressCoordinatesType < ActiveRecord::Migration[8.0]
+  def change
+    change_column :bscf_core_addresses, :latitude, :decimal, precision: 10, scale: 6, using: 'latitude::numeric(10,6)'
+    change_column :bscf_core_addresses, :longitude, :decimal, precision: 10, scale: 6, using: 'longitude::numeric(10,6)'
+   end
+end

data/db/migrate/20250616145522_add_position_to_delivery_order_items.rb

@@ -0,0 +1,6 @@
+class AddPositionToDeliveryOrderItems < ActiveRecord::Migration[8.0]
+  def change
+    add_column :bscf_core_delivery_order_items, :position, :integer
+    add_index :bscf_core_delivery_order_items, :position
+  end
+end

data/lib/bscf/core/version.rb

@@ -1,5 +1,5 @@
 module Bscf
   module Core
-    VERSION = "0.4.0"
+    VERSION = "0.4.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bscf-core
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Asrat
@@ -310,9 +310,11 @@ files:
 - app/models/bscf/core/virtual_account_transaction.rb
 - app/models/bscf/core/voucher.rb
 - app/models/bscf/core/wholesaler_product.rb
+- app/services/bscf/core/gebeta_maps_service.rb
 - app/services/bscf/core/token_service.rb
 - app/services/bscf/core/transaction_service.rb
 - config/database.yml
+- config/master.key
 - config/routes.rb
 - db/migrate/20250326065606_create_bscf_core_users.rb
 - db/migrate/20250326075111_create_bscf_core_roles.rb
@@ -348,6 +350,8 @@ files:
 - db/migrate/20250606100158_add_product_to_market_place_listings.rb
 - db/migrate/20250609180530_add_accounting_fields_to_virtual_account_transactions.rb
 - db/migrate/20250610120351_update_delivery_tables.rb
+- db/migrate/20250616134209_update_address_coordinates_type.rb
+- db/migrate/20250616145522_add_position_to_delivery_order_items.rb
 - lib/bscf/core.rb
 - lib/bscf/core/engine.rb
 - lib/bscf/core/version.rb