dscf-marketplace 0.6.7 → 0.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0fb785dc987a200c5acd58677a9ccf1f68fac21f6f675ede6e15bde883d4fcf8
-  data.tar.gz: f1042bc614f9be92b3a094498ed8ac576b83f82b14f524f21a60a79560dc6fda
+  metadata.gz: 47ccdaa6c3f673186ebd2eded4b02d820ca4a5f04c488289a7ae36fd632e86cf
+  data.tar.gz: ddc2b3716afba0714a92f9fd3814598eedffd39288a8a01e99eca5c36d320bdc
 SHA512:
-  metadata.gz: 88db2f8a555cb9b36b8f18a5b3d086ae78887be193d49875bef3a0dd72279eec23402c981320ce13f7356138b05def4190c94b2b7b5a2bcae8509315adb08fdf
-  data.tar.gz: ff4a76bfb4405405f64d389e2bfd4f1a9c297671b56b3280b948c34aab82dc50576cd30b18e0b68cf399b14bba9eea3f2ff3cd5115ac741a2eb1ed4bc2b983d8
+  metadata.gz: 3dfed84c310ca8365fb97fa54fa9dc46fa9a1603119cf2a05ed0a46c0c1de8834792ad6d03a3427feaf123ce2b0e19392f487e45a79a3c0fd00d5c1350e9d521
+  data.tar.gz: 0b68966531e15177a951d62f3737a91f1246f16ac17a3ce72b716fd7efdf1d995c1443fa594fbeea3dc508e6d5eb065d2d42d11ed18b01e639288bd7ed3d53d0

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/controllers/dscf/marketplace/locations_controller.rb

@@ -0,0 +1,28 @@
+module Dscf
+  module Marketplace
+    class LocationsController < ApplicationController
+      def get_location
+        place_name = params[:name]
+
+        if place_name.blank?
+          render_error(
+            "locations.errors.name_required",
+            status: :unprocessable_entity
+          )
+          return
+        end
+
+        service = GebetaService.new
+        locations = service.geocode(place_name)
+
+        render_success(data: locations, status: :ok)
+      rescue => e
+        render_error(
+          "locations.errors.geocoding_failed",
+          errors: [ e.message ],
+          status: :unprocessable_entity
+        )
+      end
+    end
+  end
+end

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/models/dscf/marketplace/delivery_order_item.rb

@@ -1,6 +1,6 @@
 module Dscf::Marketplace
   class DeliveryOrderItem < ApplicationRecord
-    enum :status, {pending: 0, picked_up: 1, delivered: 2, receiver_confirmed: 3, damaged: 4, missing: 5, disputed: 6, wrong_item: 7, missing: 8}
+    enum :status, {pending: 0, picked_up: 1, delivered: 2, receiver_confirmed: 3, damaged: 4, missing: 5, disputed: 6, wrong_item: 7}
 
     belongs_to :delivery_order
     belongs_to :delivery_stop, class_name: "Dscf::Marketplace::DeliveryStop", optional: true

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

@@ -4,18 +4,35 @@ 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"])
         # 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}"
+          Rails.logger.info "[GebetaService] Initialized with key: #{masked_key || "too short"}, length: #{@api_key.length}"
+        end
+      end
+
+      # Forward Geocoding
+      # @param place_name [String] The name of the place to search for
+      # @return [Array] Array of matching location objects
+      def geocode(place_name)
+        response = self.class.get("/v1/route/geocoding", query: {
+          name: place_name,
+          apiKey: @api_key
+        })
+
+        if response.success?
+          response.parsed_response
+        else
+          raise StandardError, "Gebeta API Error: #{response.code} - #{response.body}"
         end
       end
 
@@ -25,10 +42,10 @@ module Dscf
       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. 
+
+        # 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,

data/config/routes.rb

@@ -121,4 +121,6 @@ Dscf::Marketplace::Engine.routes.draw do
   end
 
   resources :delivery_vehicles
+
+  get "get_location", to: "locations#get_location"
 end

data/lib/dscf/marketplace/version.rb

@@ -1,5 +1,5 @@
 module Dscf
   module Marketplace
-    VERSION = "0.6.7".freeze
+    VERSION = "0.6.9".freeze
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: dscf-marketplace
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.6.9
 platform: ruby
 authors:
 - Asrat
 bindir: bin
 cert_chain: []
-date: 2025-12-20 00:00:00.000000000 Z
+date: 2026-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -423,6 +423,7 @@ files:
 - app/controllers/dscf/marketplace/delivery_stops_controller.rb
 - app/controllers/dscf/marketplace/delivery_vehicles_controller.rb
 - app/controllers/dscf/marketplace/listings_controller.rb
+- app/controllers/dscf/marketplace/locations_controller.rb
 - app/controllers/dscf/marketplace/order_items_controller.rb
 - app/controllers/dscf/marketplace/orders_controller.rb
 - app/controllers/dscf/marketplace/products_controller.rb