dscf-marketplace 0.7.3 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42792144bb56d00c7a6767aa3f8e2b4a0704fbbd815de3647bb942a764b34bb7
-  data.tar.gz: cb649cc916dedf3729a38b12e08714242647f34fd98971741decc3344fe8a776
+  metadata.gz: e66e6a4fac1c4edcfd47fee2305ae1f1003e0f5b67d1de4ed92437efab52c51d
+  data.tar.gz: 938e70e67ec267163bdb2414da889a90ecb5d46c4c72c016af6b26bac160a4cb
 SHA512:
-  metadata.gz: 8ed6fa17b79144e124102e838d34322d4b1735a77f2c9b9015c55f939669c6a6f16d059550394464e66402ceb9002ae33e8213c8da7af84e084c0dc15b9e9d83
-  data.tar.gz: babc3f0ccf9eef0f5be066fa59b0e77046ba03dae121c243ea8a946b3e49c3bfdea146c944486fe5bb1994d08a8e72e88cdcd8d362c2da4e802ba866c6db018c
+  metadata.gz: 74555ff90a3951e9ba75d3fc451da200458a4b15c6eb4cd227f48dee569fe14e70174c292e7e7f1454200a6765431f3b3e66cd2862e4885dc474e0a1eddfc6eb
+  data.tar.gz: 999a3fa20ea0ee8db77b9d39c48efcffb9f5f9d19c73d1fd7555c7a9b0b9a77c9cf76ee363564e5acfabf1ed3cfbfe5b84f6bda1525fdb018903429495f3a21f

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

@@ -16,12 +16,64 @@ module Dscf
         render_success("supplier_products.success.index", data: products, serializer_options: options)
       end
 
+      # Override create so supplier submissions default to inactive (require approval)
+      def create
+        authorize @clazz.new, :create?
+
+        obj = @clazz.new(model_params)
+        # Ensure newly created supplier products are inactive until approved by platform admin
+        obj.status = :inactive
+
+        ActiveRecord::Base.transaction do
+          if obj.save
+            @obj = obj
+            after_save_hook(obj) if respond_to?(:after_save_hook, true)
+
+            obj = @clazz.includes(eager_loaded_associations).find(obj.id) if eager_loaded_associations.present?
+            @obj = obj
+
+            includes = serializer_includes_for_action(:create)
+            options = {}
+            options[:include] = includes if includes.present?
+
+            render_success(data: obj, serializer_options: options, status: :created)
+          else
+            render_error(errors: obj.errors.full_messages[0], status: :unprocessable_entity)
+          end
+        end
+      end
+
+      # Admin action to approve a supplier product (makes it active)
+      def approve
+        set_object
+        authorize @obj, :approve?
+
+        if @obj.update(status: :active)
+          render_success("supplier_products.success.approve", data: @obj)
+        else
+          render_error("supplier_products.errors.approve", errors: @obj.errors.full_messages, status: :unprocessable_entity)
+        end
+      end
+
+      # Admin action to reject a supplier product (makes it inactive)
+      def reject
+        set_object
+        authorize @obj, :approve?
+
+        if @obj.update(status: :inactive)
+          render_success("supplier_products.success.reject", data: @obj)
+        else
+          render_error("supplier_products.errors.reject", errors: @obj.errors.full_messages, status: :unprocessable_entity)
+        end
+      end
+
       private
 
       def model_params
         params.require(:supplier_product).permit(
           :business_id, :product_id, :supplier_price, :available_quantity,
-          :minimum_order_quantity, :status
+          :minimum_order_quantity, :status,
+          :supplier_name, :supplier_address, :supplier_contact_phone
         )
       end
 

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

@@ -20,7 +20,7 @@ module Dscf::Marketplace
     scope :by_product, ->(product_id) { where(product_id: product_id) }
 
     def self.ransackable_attributes(_auth_object = nil)
-      %w[id business_id product_id supplier_price available_quantity minimum_order_quantity status created_at updated_at]
+      %w[id business_id product_id supplier_price available_quantity minimum_order_quantity status created_at updated_at supplier_name supplier_address supplier_contact_phone]
     end
 
     def self.ransackable_associations(_auth_object = nil)

data/app/policies/dscf/marketplace/supplier_product_policy.rb

@@ -4,6 +4,13 @@ module Dscf
       def my_products?
         user.has_permission?("supplier_products.my_products")
       end
+
+      def approve?
+        return true if user.super_admin?
+
+        # Only allow users who belong to a system business to approve supplier products
+        user.businesses.where(is_system: true).exists?
+      end
     end
   end
 end

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

@@ -4,7 +4,8 @@ module Dscf
       attributes :id, :business_id, :product_id, :supplier_price, :available_quantity,
         :minimum_order_quantity, :status, :created_at, :updated_at,
         :in_stock?, :price_per_unit, :display_name, :name, :description,
-        :thumbnail_url, :images_urls
+        :thumbnail_url, :images_urls,
+        :supplier_name, :supplier_address, :supplier_contact_phone
 
       belongs_to :business
       belongs_to :product

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

@@ -9,7 +9,7 @@ module Dscf::Marketplace
     def assign_driver(delivery_order, driver)
       raise ArgumentError, "Delivery order is required" unless delivery_order
       raise ArgumentError, "Driver is required" unless driver
-      
+
       validate_assignment(delivery_order)
 
       delivery_order.driver_id = driver.id
@@ -35,9 +35,15 @@ module Dscf::Marketplace
         delivery_order = create_delivery_order(vehicle_type, pickup_address, delivery_notes)
         create_delivery_stops_and_items(delivery_order, orders, pickup_address)
         associate_orders_with_delivery(delivery_order, orders)
-        
-        # Optimize route using Gebeta Maps
-        RouteOptimizationService.new(delivery_order).optimize!
+
+        # Best-effort route optimization using Gebeta Maps.
+        begin
+          RouteOptimizationService.new(delivery_order).optimize!
+        rescue StandardError => e
+          Rails.logger.warn(
+            "[DeliveryOrderService] Route optimization skipped for delivery_order=#{delivery_order.id}: #{e.class} - #{e.message}"
+          )
+        end
 
         delivery_order
       end
@@ -79,7 +85,7 @@ module Dscf::Marketplace
     def create_delivery_stops_and_items(delivery_order, orders, pickup_address)
       # Group orders by dropoff address to create stops
       orders_by_address = orders.group_by(&:dropoff_address_id)
-      
+
       orders_by_address.each do |dropoff_address_id, address_orders|
         # Create stop
         stop = DeliveryStop.create!(
@@ -87,7 +93,7 @@ module Dscf::Marketplace
           dropoff_address_id: dropoff_address_id,
           status: :pending
         )
-        
+
         # Create items for this stop
         address_orders.each do |order|
           order.order_items.reload.each do |order_item|

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

@@ -10,83 +10,71 @@ module Dscf
       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 }
-        
+        stops = []
+        locations = []
+
+        stops = ordered_stops
+        locations = build_locations(stops)
+
+        apply_remote_optimization(stops, locations)
+      rescue StandardError => e
+        Rails.logger.warn(
+          "[RouteOptimizationService] Falling back to local route for delivery_order=#{delivery_order.id}: #{e.class} - #{e.message}"
+        )
+
+        apply_local_fallback(stops, locations)
+      end
+
+      private
+
+      def apply_remote_optimization(stops, locations)
+        response = GebetaService.new.tsp(locations)
+        best_order = Array(response["best_order"])
+        ordered_stops_data = best_order.select { |node| node["original_index"].to_i.positive? }
+
         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].
+            original_idx = node["original_index"].to_i
             stop = stops[original_idx - 1]
-            
-            if stop
-              stop.update!(sequence_number: seq_num + 1)
-            end
+            stop.update!(sequence_number: seq_num + 1) if stop
           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"] 
+            estimated_delivery_price: calculate_price(distance_km * 1000),
+            optimized_route: response["Direction"]
           )
         end
       end
 
-      private
+      def apply_local_fallback(stops, locations)
+        ActiveRecord::Base.transaction do
+          stops.each_with_index do |stop, index|
+            stop.update!(sequence_number: index + 1)
+          end
+
+          delivery_order.update!(optimized_route: locations)
+        end
+      end
+
+      def ordered_stops
+        delivery_order.delivery_stops.includes(:dropoff_address).order(:id).to_a
+      end
+
+      def build_locations(stops)
+        pickup_coords = [ delivery_order.pickup_address.latitude.to_f, delivery_order.pickup_address.longitude.to_f ]
+        stop_coords = stops.map { |stop| [ stop.dropoff_address.latitude.to_f, stop.dropoff_address.longitude.to_f ] }
+
+        [ pickup_coords ] + stop_coords
+      end
 
-      # Placeholder pricing logic
       def calculate_price(distance_meters)
         base_rate = 50.0
-        km_rate = 10.0 # 10 ETB per km
+        km_rate = 10.0
         distance_km = distance_meters / 1000.0
-        
+
         base_rate + (distance_km * km_rate)
       end
     end

data/config/locales/en.yml

@@ -77,12 +77,16 @@ en:
   supplier_products:
     success:
       index: "Supplier products retrieved successfully"
+      approve: "Supplier product approved successfully"
+      reject: "Supplier product rejected successfully"
       show: "Supplier product details retrieved successfully"
       create: "Supplier product created successfully"
       update: "Supplier product updated successfully"
       destroy: "Supplier product deleted successfully"
     errors:
       index: "Failed to retrieve supplier products"
+      approve: "Failed to approve supplier product"
+      reject: "Failed to reject supplier product"
       show: "Failed to retrieve supplier product details"
       create: "Failed to create supplier product"
       update: "Failed to update supplier product"

data/config/routes.rb

@@ -25,6 +25,10 @@ Dscf::Marketplace::Engine.routes.draw do
     collection do
       get "my_products"
     end
+    member do
+      post "approve"
+      post "reject"
+    end
   end
 
   resources :listings do

data/db/migrate/20260501000002_add_supplier_contact_fields_to_supplier_products.rb

@@ -0,0 +1,7 @@
+class AddSupplierContactFieldsToSupplierProducts < ActiveRecord::Migration[8.0]
+  def change
+    add_column :dscf_marketplace_supplier_products, :supplier_name, :string
+    add_column :dscf_marketplace_supplier_products, :supplier_address, :text
+    add_column :dscf_marketplace_supplier_products, :supplier_contact_phone, :string
+  end
+end

data/lib/dscf/marketplace/version.rb

@@ -1,5 +1,5 @@
 module Dscf
   module Marketplace
-    VERSION = "0.7.3".freeze
+    VERSION = "0.7.5".freeze
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: dscf-marketplace
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.5
 platform: ruby
 authors:
 - Asrat
 bindir: bin
 cert_chain: []
-date: 2026-04-17 00:00:00.000000000 Z
+date: 2026-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -532,6 +532,7 @@ files:
 - db/migrate/20251130144500_add_delivery_stop_to_delivery_order_items.rb
 - db/migrate/20260310120000_add_active_and_description_to_dscf_core_roles.rb
 - db/migrate/20260310122000_add_missing_fields_to_dscf_core_user_roles.rb
+- db/migrate/20260501000002_add_supplier_contact_fields_to_supplier_products.rb
 - db/seeds.rb
 - lib/dscf/marketplace.rb
 - lib/dscf/marketplace/engine.rb