dscf-marketplace 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 594b8a0c6b3e5d673cc49e5b9fed9944ed8741a9e060878b7db0faf18b425316
-  data.tar.gz: 3a4ae57c850ebc4f616def389b9b66d3d1aebe75eed35a0920fac405bcd34789
+  metadata.gz: 0d395ee1a2d1134af4a10cf72e0591583e898e507cf94432d62849c992d888ec
+  data.tar.gz: 4cb118146a4759d47d069d34afd0aa4b857329c4eaa28509bb62b35301c9a7b2
 SHA512:
-  metadata.gz: 25512776a17bd4984353716c8020a13d3ce77b510c68cc7b8b139bc19f4c3b3145ee55cd61a788c1a21e96f3d121cd5dddfe12a62f2359a01d1a5b3d008400d1
-  data.tar.gz: 2b0e4ed3a9fc273e0cfee298f8fcd59f714494dd85cbf818d5ba9dd6ff124270ee200724e53be170f1af5fb9f0ffc71dffa97cdfc680aee10a1b1926c617a82d
+  metadata.gz: 7d82bd17842e98ef5880bdf7b1396722346b1cb60722ab4cb1db52e21ca1680b97b2766d24d1f8bb7c3df70c080a17dd72f2a08d8bd67e8a0ebf88bae10ebe42
+  data.tar.gz: 6d6793f1ca44cb0976147056bcfccf23c88720109f04d7590460ccf81baba4dba272bd06423f054e7a759fbc80581e2e36415a5bca853af7c27fddb750c17028

data/app/services/dscf/marketplace/delivery_order_service.rb

@@ -36,8 +36,8 @@ module Dscf::Marketplace
         create_delivery_stops_and_items(delivery_order, orders, pickup_address)
         associate_orders_with_delivery(delivery_order, orders)
         
-        # Optimize route - Removed as per requirement
-        # RouteOptimizationService.new.optimize_route(delivery_order)
+        # Optimize route using Gebeta Maps
+        RouteOptimizationService.new(delivery_order).optimize!
 
         delivery_order
       end

data/app/services/dscf/marketplace/gebeta_service.rb

@@ -0,0 +1,38 @@
+require "httparty"
+
+module Dscf
+  module Marketplace
+    class GebetaService
+      include HTTParty
+      base_uri "https://mapapi.gebeta.app/api"
+      debug_output $stdout if Rails.env.development?
+
+      def initialize(api_key: ENV["GEBETA_MAPS_API_KEY"])
+        @api_key = api_key
+      end
+
+      # Traveling Salesperson Solver
+      # @param locations [Array<Array>] Array of coordinate pairs [[lat, lng], [lat, lng], ...]
+      # Start point is assumed to be the first element.
+      def tsp(locations)
+        # Gebeta TSS API expects a custom string format: [{lat,lon},{lat,lon},...]
+        # Example: [{8.9,38.7},{9.0,38.8}] - Literal curly braces, comma sep lat/lon
+        
+        custom_payload = "[" + locations.map { |loc| "{#{loc[0]},#{loc[1]}}" }.join(",") + "]"
+        
+        # We pass this string directly to the json query param. 
+        # HTTParty will encode the characters (e.g., { becomes %7B), which is expected.
+        response = self.class.get("/route/tss", query: {
+          apiKey: @api_key,
+          json: custom_payload
+        })
+
+        if response.success?
+          response.parsed_response
+        else
+          raise StandardError, "Gebeta API Error: #{response.code} - #{response.body}"
+        end
+      end
+    end
+  end
+end

data/app/services/dscf/marketplace/route_optimization_service.rb

@@ -0,0 +1,94 @@
+module Dscf
+  module Marketplace
+    class RouteOptimizationService
+      attr_reader :delivery_order
+
+      def initialize(delivery_order)
+        @delivery_order = delivery_order
+      end
+
+      def optimize!
+        return unless delivery_order.pickup_address && delivery_order.delivery_stops.any?
+
+        # 1. Collect Coordinates
+        # Format: [[pickup_lat, pickup_lng], [stop1_lat, stop1_lng], ...]
+        pickup_coords = [delivery_order.pickup_address.latitude.to_f, delivery_order.pickup_address.longitude.to_f]
+        
+        # We map stops to their dropoff coordinates. 
+        # We need to keep track of the mapping between original index and stop ID to re-order later.
+        stops = delivery_order.delivery_stops.includes(:dropoff_address).to_a
+        stop_coords = stops.map { |stop| [stop.dropoff_address.latitude.to_f, stop.dropoff_address.longitude.to_f] }
+        
+        all_locations = [pickup_coords] + stop_coords
+
+        # 2. Call Gebeta API
+        response = GebetaService.new.tsp(all_locations)
+
+        # 3. Process Response
+        
+        # New Response Format:
+        # {
+        #   "best_order": [
+        #     {"lat":..., "lon":...},               # Start (Pickup)
+        #     {"lat":..., "original_index": 2},     # Stop A
+        #     {"lat":..., "original_index": 1}      # Stop B
+        #   ],
+        #   "total_distance": 13.474, # In KM? Diagnostic showed 13.474 for small distance. Need to verify unit.
+        #   "time_taken": 1033.263,
+        #   "Direction": [[lat,lon], ...]
+        # }
+        
+        # 'best_order' includes the start point at index 0 (usually without original_index or it's 0/1 based?)
+        # Based on diagnostic: "original_index": 2 for the 3rd point (index 2).
+        # So original_index is 0-based index from the input array.
+        
+        best_order = response["best_order"]
+        
+        # Filter out the pickup location (which should be the first one, or original_index == 0)
+        # We only want to re-sequence the STOPS.
+        # Stops in 'stops' array correspond to input indices 1..N.
+        
+        ordered_stops_data = best_order.select { |node| node["original_index"].to_i > 0 }
+        
+        ActiveRecord::Base.transaction do
+          ordered_stops_data.each_with_index do |node, seq_num|
+            original_idx = node["original_index"]
+            # stops array is 0-indexed, corresponding to input indices 1, 2, 3...
+            # If original_idx is 1, it means stops[0]. If 2, stops[1].
+            stop = stops[original_idx - 1]
+            
+            if stop
+              stop.update!(sequence_number: seq_num + 1)
+            end
+          end
+
+          # Update DeliveryOrder metrics
+          # Check units: 
+          # time_taken: 1033.263 (likely seconds ~ 17 mins for decent distance).
+          # total_distance: 13.474. If this is KM, it's reasonable. (Distance between 9.02,38.80 and 9.028,38.75 is ~ small).
+          # If meters, 13 meters is too small. 1000 seconds for 13 meters is wrong.
+          # So total_distance is likely KM.
+          
+          distance_km = response["total_distance"].to_f
+          
+          delivery_order.update!(
+            estimated_delivery_time: Time.current + response["time_taken"].to_f.seconds,
+            estimated_delivery_price: calculate_price(distance_km * 1000), # pass meters to calc
+            optimized_route: response["Direction"] 
+          )
+        end
+      end
+
+      private
+
+      # Placeholder pricing logic
+      def calculate_price(distance_meters)
+        base_rate = 50.0
+        km_rate = 10.0 # 10 ETB per km
+        distance_km = distance_meters / 1000.0
+        
+        base_rate + (distance_km * km_rate)
+      end
+    end
+  end
+end

data/lib/dscf/marketplace/version.rb

@@ -1,5 +1,5 @@
 module Dscf
   module Marketplace
-    VERSION = "0.6.4".freeze
+    VERSION = "0.6.5".freeze
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: dscf-marketplace
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - Asrat
 bindir: bin
 cert_chain: []
-date: 2025-12-12 00:00:00.000000000 Z
+date: 2025-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -472,9 +472,11 @@ files:
 - app/serializers/dscf/marketplace/user_serializer.rb
 - app/services/dscf/marketplace/delivery_order_service.rb
 - app/services/dscf/marketplace/dispute_service.rb
+- app/services/dscf/marketplace/gebeta_service.rb
 - app/services/dscf/marketplace/my_resource_service.rb
 - app/services/dscf/marketplace/rfq_response_service.rb
 - app/services/dscf/marketplace/role_service.rb
+- app/services/dscf/marketplace/route_optimization_service.rb
 - config/environments/production.rb
 - config/locales/en.yml
 - config/locales/en.yml.backup