dscf-marketplace 0.6.6 → 0.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d0f78e9cfd2adb46ce72ab1d71b252f60772eb6d39959d0a57e6933634a17e7
-  data.tar.gz: 49ca7b0c4269f56334d512367b17506400471e19aa51c23091355462c2c352c6
+  metadata.gz: d5c7c73ea6cec6c7ccf420d5b1135cfb72d9005d2332b93d3d25624acf5d65dd
+  data.tar.gz: fdad55c6a9c19cd93a5b521cfd01dfa48d537075661441711af9d91ca8901367
 SHA512:
-  metadata.gz: cde8adac032f3c223bb5f47be1b294371358d43c188a49e83d0e70401cfc5c0a0c64b79179d9edbe0d273dfe0883b48a51fb6a08b44d0982fb365c7455f50f72
-  data.tar.gz: eba932ec412071d52e7cb1c25a7bab4a400709cf66e3164bf71dbfea5bb31ddf643fc2b188c5eb9d78b6a9b5fc5a5a6733db84b269318c489ba3ed2775b13c54
+  metadata.gz: 8dc578eafea5853c5716d11f6c94c24a6e9fca176a77a96a6902e77cc10cdf59b5bf5197bf5b937f195aa6212e9bf2fb1f28a73f3b231c63d27adcf346a9ee13
+  data.tar.gz: 299083cbc869839bf0b74f7c59689edc88a60011c705e661ab87b8d331ab40ae7ac24bae8f6e029e981d1368fbed9b1e1b2402f442abd43d1797046522488ef1

data/app/controllers/dscf/marketplace/delivery_orders_controller.rb

@@ -227,7 +227,7 @@ module Dscf
       end
 
       def eager_loaded_associations
-        [ :driver, :pickup_address, :delivery_vehicle, :delivery_order_items ]
+        [ :driver, :pickup_address, :delivery_vehicle, :delivery_order_items, :delivery_stops ]
       end
 
       def default_serializer_includes
@@ -236,6 +236,7 @@ module Dscf
             :driver,
             :pickup_address,
             :delivery_vehicle,
+            :delivery_stops,
             {
               delivery_order_items: [ :dropoff_address ]
             }
@@ -245,9 +246,11 @@ module Dscf
             :pickup_address,
             :delivery_vehicle,
             :marketplace_orders,
+            :delivery_stops,
             {
               delivery_order_items: [ :dropoff_address ],
-              marketplace_orders: [ :ordered_by, :ordered_to ]
+              marketplace_orders: [ :ordered_by, :ordered_to ],
+              delivery_stops: [ :dropoff_address ]
             }
           ],
           create: [ :driver, :pickup_address, :delivery_vehicle ],

data/app/models/dscf/marketplace/delivery_order.rb

@@ -52,7 +52,7 @@ module Dscf::Marketplace
     end
 
     def self.ransackable_associations(_auth_object = nil)
-      %w[driver pickup_address delivery_vehicle delivery_order_items marketplace_orders]
+      %w[driver pickup_address delivery_vehicle delivery_order_items marketplace_orders delivery_stops]
     end
 
     def pickup!

data/app/serializers/dscf/marketplace/delivery_order_serializer.rb

@@ -5,7 +5,7 @@ module Dscf
         :vehicle_type, :estimated_delivery_price, :actual_delivery_price,
         :estimated_delivery_time, :actual_delivery_time, :delivery_notes,
         :created_at, :updated_at, :total_items, :total_orders, :delivery_duration,
-        :on_time?, :all_handoffs_confirmed?, :total_stops
+        :on_time?, :all_handoffs_confirmed?, :total_stops, :optimized_route
 
       belongs_to :driver
       belongs_to :pickup_address

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

@@ -8,7 +8,15 @@ module Dscf
       debug_output $stdout if Rails.env.development?
 
       def initialize(api_key: ENV["GEBETA_MAPS_API_KEY"])
-        @api_key = api_key
+        # Sanitize the key: strip whitespace and remove surrounding quotes if any
+        @api_key = api_key.to_s.strip.gsub(/\A['"]+|['"]+\z/, "")
+        
+        if @api_key.blank?
+          Rails.logger.error "[GebetaService] GEBETA_MAPS_API_KEY is missing or blank"
+        else
+          masked_key = "#{@api_key[0...4]}...#{@api_key[-4..-1]}" if @api_key.length > 8
+          Rails.logger.info "[GebetaService] Initialized with key: #{masked_key || 'too short'}, length: #{@api_key.length}"
+        end
       end
 
       # Traveling Salesperson Solver

data/lib/dscf/marketplace/version.rb

@@ -1,5 +1,5 @@
 module Dscf
   module Marketplace
-    VERSION = "0.6.6".freeze
+    VERSION = "0.6.8".freeze
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: dscf-marketplace
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.6.8
 platform: ruby
 authors:
 - Asrat
 bindir: bin
 cert_chain: []
-date: 2025-12-20 00:00:00.000000000 Z
+date: 2025-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails