dscf-marketplace 0.8.2 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc4f1d1a9a6e410b60d37864c916ba34f69783495d87582d109e33c858d9b872
-  data.tar.gz: d4633eb9e5d1efb5adefaa1d74837b542aa17cebb6196d532baf7b3e7278bd03
+  metadata.gz: 3ccdf7ab2d80d24d3125fc70cd2967e82b64ceec4fecad26005cc38539416d3d
+  data.tar.gz: 513a5ca0fc82efe0e44ed34d4f5ccc9360c6508747ae569bda5c36a8497f00d5
 SHA512:
-  metadata.gz: 19e8ec54666855599c42a59a5946d343cdc7fd75d9e464a484f3495dea4109dbd25a5e705fe32916901f323ec98f5f46188c629191fbdf0e7091029ed3b87293
-  data.tar.gz: 1e5b40b3498eaacddd0d3fce068f8997ed04e5c38d531a244249027424b72c7fe0f6e30e9bb098ddd093cd659a5719eb4066cd16bee76bd92824cbf28d8749a4
+  metadata.gz: 6293f513a29b0e11b5300350af009c07504582dd3f29ef423cb3ee14ee87e8389397cad18ab7e7b505ff598f92a9cf06ba99f0e4cd44ee91917928f79e3579e3
+  data.tar.gz: 68c91b028dbdce0862f7dafedf85e262469dc36bcdcd943e036edfe0ea3b271a56233870d4075272ae6da618d55c4ba0b2539bf74eff349ec83f339bd814d5ff

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

@@ -0,0 +1,57 @@
+module Dscf
+  module Marketplace
+    class AgentsController < ApplicationController
+      include Dscf::Core::Common
+
+      def register
+        authorize @clazz.new, :register?
+
+        obj = @clazz.new(registration_params)
+        ActiveRecord::Base.transaction do
+          if obj.save
+            render_success("agent.success.register", data: obj, status: :created)
+          else
+            render_error("agent.errors.register", errors: obj.errors.full_messages[0], status: :unprocessable_entity)
+          end
+        end
+      end
+
+      def destroy
+        @obj = find_record
+        authorize @obj
+        @obj.destroy!
+        render_success("agent.success.destroy")
+      end
+
+      private
+
+      def model_params
+        params.require(:agent).permit(
+          :name, :phone, :service_area, :fayda_number, :photo, :onboarded_by_id
+        )
+      end
+
+      # Registration allows same fields but no authentication required
+      def registration_params
+        params.require(:agent).permit(
+          :name, :phone, :service_area, :fayda_number, :onboarded_by_id
+        )
+      end
+
+      def eager_loaded_associations
+        [:onboarded_by]
+      end
+
+      def default_serializer_includes
+        {
+          index: [:onboarded_by],
+          show: [:onboarded_by]
+        }
+      end
+
+      def find_record
+        @clazz.find(params[:id])
+      end
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+module Dscf
+  module Marketplace
+    class DashboardController < ApplicationController
+      def summary
+        authorize :dashboard, :summary?
+
+        render_success(
+          "dashboard.success.summary",
+          data: {
+            total_listings: Dscf::Marketplace::Listing.count,
+            total_suppliers: Dscf::Marketplace::Supplier.count,
+            total_businesses: Dscf::Core::Business.count,
+            total_products: Dscf::Marketplace::Product.count,
+            pending_supplier_products: Dscf::Marketplace::SupplierProduct.inactive.count,
+            active_listings: Dscf::Marketplace::Listing.active.count,
+            promoted_listings: Dscf::Marketplace::Listing.orchestrator_promoted.count
+          }
+        )
+      end
+    end
+  end
+end

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

@@ -0,0 +1,58 @@
+module Dscf::Marketplace
+  class Agent < ApplicationRecord
+    # Associations
+    belongs_to :onboarded_by, class_name: "Dscf::Core::Business", optional: true
+    has_one_attached :photo
+
+    # Enums
+    enum :status, { active: 0, inactive: 1, suspended: 2 }, default: :active
+    enum :verification_status, {
+      pending: 0,
+      verified: 1,
+      rejected: 2,
+      under_review: 3
+    }, default: :pending
+
+    # Callbacks
+    before_validation :generate_agent_code, on: :create
+
+    # Validations
+    validates :code, presence: true, uniqueness: true
+    validates :name, presence: true
+    validates :service_area, presence: true
+    validates :phone, presence: true
+
+    # Scopes
+    scope :active, -> { where(status: :active) }
+    scope :inactive, -> { where(status: :inactive) }
+    scope :suspended, -> { where(status: :suspended) }
+    scope :by_onboarded_by, ->(business_id) { where(onboarded_by_id: business_id) }
+    scope :verified, -> { where(verification_status: :verified) }
+    scope :pending_verification, -> { where(verification_status: :pending) }
+
+    # Ransack
+    def self.ransackable_attributes(_auth_object = nil)
+      %w[id code name phone service_area status fayda_number verification_status
+         onboarded_by_id created_at updated_at]
+    end
+
+    def self.ransackable_associations(_auth_object = nil)
+      %w[onboarded_by photo_attachment photo_blob]
+    end
+
+    def photo_url
+      return nil unless photo.attached?
+
+      Rails.application.routes.url_helpers.rails_blob_url(photo, only_path: true)
+    end
+
+    private
+
+    def generate_agent_code
+      loop do
+        self.code = "AGT-#{SecureRandom.hex(4).upcase}"
+        break unless self.class.exists?(code: code)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,29 @@
+module Dscf
+  module Marketplace
+    class AgentPolicy < Dscf::Core::ApplicationPolicy
+      def index?
+        true
+      end
+
+      def show?
+        true
+      end
+
+      def create?
+        user.present?
+      end
+
+      def update?
+        user.present?
+      end
+
+      def destroy?
+        user.super_admin?
+      end
+
+      def register?
+        true
+      end
+    end
+  end
+end

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

@@ -0,0 +1,9 @@
+module Dscf
+  module Marketplace
+    class DashboardPolicy < Dscf::Core::ApplicationPolicy
+      def summary?
+        user.present?
+      end
+    end
+  end
+end

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

@@ -0,0 +1,15 @@
+module Dscf
+  module Marketplace
+    class AgentSerializer < ActiveModel::Serializer
+      attributes :id, :code, :name, :phone, :service_area, :status,
+                 :fayda_number, :verification_status, :onboarded_by_id,
+                 :photo_url, :created_at, :updated_at
+
+      belongs_to :onboarded_by, serializer: Dscf::Core::BusinessSerializer
+
+      def photo_url
+        object.photo_url
+      end
+    end
+  end
+end

data/config/locales/en.yml

@@ -400,7 +400,30 @@ en:
     operation_failed: "Operation failed"
     record_not_found: "Record not found"
     supplier_not_found: "Supplier not found"
-    activerecord:
+
+  agent:
+    success:
+      index: "Agents retrieved successfully"
+      show: "Agent details retrieved successfully"
+      create: "Agent created successfully"
+      update: "Agent updated successfully"
+      destroy: "Agent deleted successfully"
+      register: "Agent registered successfully"
+    errors:
+      index: "Failed to retrieve agents"
+      show: "Failed to retrieve agent details"
+      create: "Failed to create agent"
+      update: "Failed to update agent"
+      destroy: "Failed to delete agent"
+      register: "Failed to register agent"
+
+  dashboard:
+    success:
+      summary: "Dashboard summary retrieved successfully"
+    errors:
+      summary: "Failed to retrieve dashboard summary"
+
+  activerecord:
       errors:
         messages:
           record_invalid: "Validation failed: %{errors}"

data/config/routes.rb

@@ -146,4 +146,14 @@ Dscf::Marketplace::Engine.routes.draw do
   resources :delivery_vehicles
 
   get "get_location", to: "locations#get_location"
+
+  # Dashboard
+  get "dashboard/summary", to: "dashboard#summary"
+
+  # Agent Management
+  resources :agents do
+    collection do
+      post "register"
+    end
+  end
 end

data/db/migrate/20260529000001_create_dscf_marketplace_agents.rb

@@ -0,0 +1,21 @@
+class CreateDscfMarketplaceAgents < ActiveRecord::Migration[8.1]
+  def change
+    create_table "dscf_marketplace_agents" do |t|
+      t.string "code", null: false
+      t.string "name", null: false
+      t.string "phone"
+      t.text "service_area"
+      t.integer "status", default: 0, null: false
+      t.string "fayda_number"
+      t.integer "verification_status", default: 0, null: false
+      t.bigint "onboarded_by_id"
+      t.timestamps
+    end
+
+    add_index "dscf_marketplace_agents", "code", unique: true, name: "code_on_dm_agents_indx"
+    add_index "dscf_marketplace_agents", "status", name: "status_on_dm_agents_indx"
+    add_index "dscf_marketplace_agents", "onboarded_by_id", name: "onboarded_by_on_dm_agents_indx"
+
+    add_foreign_key "dscf_marketplace_agents", "dscf_core_businesses", column: "onboarded_by_id"
+  end
+end

data/db/seeds.rb

@@ -21,6 +21,8 @@ Dscf::Core::PermissionRegistry.register("dscf-marketplace") do
   resource :delivery_order_items, actions: %i[index show create update destroy receiver_confirm report_issue dispute_delivery]
   resource :delivery_vehicles, actions: %i[index show create update destroy]
   resource :locations, actions: %i[get_location]
+  resource :agents, actions: %i[index show create update destroy register]
+  resource :dashboard, actions: %i[summary]
 end
 
 user_role = Dscf::Core::Role.find_or_create_by!(code: "USER") do |role|

data/lib/dscf/marketplace/version.rb

@@ -1,5 +1,5 @@
 module Dscf
   module Marketplace
-    VERSION = "0.8.2".freeze
+    VERSION = "0.8.4".freeze
   end
 end

data/spec/factories/dscf/marketplace/agents.rb

@@ -0,0 +1,10 @@
+FactoryBot.define do
+  factory :dscf_marketplace_agent, class: "Dscf::Marketplace::Agent" do
+    code { "AGT-#{SecureRandom.hex(4).upcase}" }
+    name { Faker::Name.name }
+    phone { Faker::PhoneNumber.phone_number }
+    service_area { "Bole" }
+    status { :active }
+    verification_status { :pending }
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: dscf-marketplace
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.4
 platform: ruby
 authors:
 - Asrat
 bindir: bin
 cert_chain: []
-date: 2026-05-28 00:00:00.000000000 Z
+date: 2026-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -417,9 +417,11 @@ files:
 - MIT-LICENSE
 - Rakefile
 - app/controllers/concerns/dscf/marketplace/demo_permission_bypass.rb
+- app/controllers/dscf/marketplace/agents_controller.rb
 - app/controllers/dscf/marketplace/aggregator_listings_controller.rb
 - app/controllers/dscf/marketplace/application_controller.rb
 - app/controllers/dscf/marketplace/categories_controller.rb
+- app/controllers/dscf/marketplace/dashboard_controller.rb
 - app/controllers/dscf/marketplace/delivery_order_items_controller.rb
 - app/controllers/dscf/marketplace/delivery_orders_controller.rb
 - app/controllers/dscf/marketplace/delivery_stops_controller.rb
@@ -439,6 +441,7 @@ files:
 - app/controllers/dscf/marketplace/units_controller.rb
 - app/jobs/dscf/marketplace/application_job.rb
 - app/mailers/dscf/marketplace/application_mailer.rb
+- app/models/dscf/marketplace/agent.rb
 - app/models/dscf/marketplace/aggregator_listing.rb
 - app/models/dscf/marketplace/application_record.rb
 - app/models/dscf/marketplace/category.rb
@@ -459,8 +462,10 @@ files:
 - app/models/dscf/marketplace/supplier_product.rb
 - app/models/dscf/marketplace/unit.rb
 - app/models/dscf/marketplace/unit_conversion.rb
+- app/policies/dscf/marketplace/agent_policy.rb
 - app/policies/dscf/marketplace/aggregator_listing_policy.rb
 - app/policies/dscf/marketplace/category_policy.rb
+- app/policies/dscf/marketplace/dashboard_policy.rb
 - app/policies/dscf/marketplace/delivery_order_item_policy.rb
 - app/policies/dscf/marketplace/delivery_order_policy.rb
 - app/policies/dscf/marketplace/delivery_stop_policy.rb
@@ -478,6 +483,7 @@ files:
 - app/policies/dscf/marketplace/supplier_product_policy.rb
 - app/policies/dscf/marketplace/unit_conversion_policy.rb
 - app/policies/dscf/marketplace/unit_policy.rb
+- app/serializers/dscf/marketplace/agent_serializer.rb
 - app/serializers/dscf/marketplace/aggregator_listing_serializer.rb
 - app/serializers/dscf/marketplace/category_serializer.rb
 - app/serializers/dscf/marketplace/delivery_order_item_serializer.rb
@@ -551,6 +557,7 @@ files:
 - db/migrate/20260514000005_create_dscf_marketplace_aggregator_listings.rb
 - db/migrate/20260514000006_add_supplier_id_to_addresses.rb
 - db/migrate/20260527000001_add_orchestrator_fields_to_listings.rb
+- db/migrate/20260529000001_create_dscf_marketplace_agents.rb
 - db/seeds.rb
 - lib/dscf/marketplace.rb
 - lib/dscf/marketplace/engine.rb
@@ -562,6 +569,7 @@ files:
 - spec/factories/dscf/core/roles.rb
 - spec/factories/dscf/core/user_roles.rb
 - spec/factories/dscf/core/users.rb
+- spec/factories/dscf/marketplace/agents.rb
 - spec/factories/dscf/marketplace/aggregator_listings.rb
 - spec/factories/dscf/marketplace/categories.rb
 - spec/factories/dscf/marketplace/delivery_order_items.rb