dscf-core 0.3.11 → 0.3.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae14559d5450c625ee0af53712926aebe5e64c9546c00af6db600139e4e51050
-  data.tar.gz: 1bc97e393a0c8f08015c242e206e1a958fbb76a3f3cc618286c02e9809fb825c
+  metadata.gz: 1017e5f24b7c9e2082e34887e79c5f1f1efe0702aa9be9d51fe7e30f82f26975
+  data.tar.gz: f6f878a9c7dc8df5fd0823cf885a0a88366d0a2b08cdcbcb64898607d7701a50
 SHA512:
-  metadata.gz: bd27090cc7d4e607e5e91e5dfbd2a0a4d0edbc7cf4a190ab15dc79d0353298264c8ccdf0cc3e87e8905e45f598605fb8bd2727a9f3c54323dc1c799e2ee02be2
-  data.tar.gz: c53701558a0481c533df3e3e548349ed510148ec175b609f41fdf5643721c3e23c676e3a6117bf289261b7c1780bf43faca656c8af920b018d950b161042affa
+  metadata.gz: 38ef2bbb5e8ac7e0236e5dea4642350f82518c4b0bf3fcc4ae9f192512c4d5de656894c0c1406707110f3a6b819f9f217290ae0211950c87cccfc03ac58c5170
+  data.tar.gz: bf59dfc24369e0873ead51b1723dd6f14d76ccfe6aa1624e5d93740537090331e7cf9e11cf16f2a7cb4180a754e392104175fe29ece94bb7ff80230447e00ae8

data/app/controllers/dscf/core/auth_controller.rb

@@ -154,12 +154,25 @@ module Dscf
       def create_retailer_from_signup!(user)
         return unless defined?(Dscf::Marketplace::Retailer)
 
+        # `authenticate_user` is skipped for this action so self-service
+        # signup stays public, but `current_user` still resolves whatever
+        # Bearer token was sent — an agent onboarding a retailer on their
+        # behalf attaches their own token, so we derive the onboarding
+        # agent from it rather than trusting a client-supplied agent_id
+        # (there is none in this params shape today, but this keeps the
+        # same trust model as the rest of the agent-assisted flows).
+        onboarding_agent = if defined?(Dscf::Marketplace::Agent)
+          Dscf::Marketplace::Agent.find_by(user_id: current_user&.id)
+        end
+
         retailer = Dscf::Marketplace::Retailer.create!(
           name: retailer_signup_params[:name],
           phone: retailer_signup_params[:phone],
           tin_number: retailer_signup_params[:tin_number],
           location: retailer_signup_params[:location],
-          user: user
+          user: user,
+          agent: onboarding_agent,
+          onboarded_at: (Time.current if onboarding_agent)
         )
 
         if retailer.location.present? && defined?(Dscf::Core::Address)

data/app/models/concerns/dscf/core/attachment_urls.rb

@@ -0,0 +1,31 @@
+module Dscf
+  module Core
+    # Shared Active Storage URL helper for plain has_one_attached/
+    # has_many_attached models (distinct from the custom Attachable/
+    # FileAttachment system). Produces a host-aware proxy URL — unlike
+    # `only_path: true`, which drops the host entirely and can't be used to
+    # build an <img src> from a separate frontend origin.
+    module AttachmentUrls
+      extend ActiveSupport::Concern
+
+      private
+
+      def attachment_url_for(attachment)
+        return unless attachment.present?
+        return if attachment.respond_to?(:attached?) && !attachment.attached?
+
+        Rails.application.routes.url_helpers.rails_storage_proxy_url(attachment, **active_storage_url_options)
+      end
+
+      def active_storage_url_options
+        url_options = Rails.application.config.x.active_storage_url_options.presence ||
+          Rails.application.routes.default_url_options.presence ||
+          Rails.application.config.action_controller.default_url_options.presence ||
+          Rails.application.config.action_mailer.default_url_options.presence ||
+          {}
+
+        url_options.to_h.symbolize_keys.compact
+      end
+    end
+  end
+end

data/app/models/dscf/core/business.rb

@@ -5,6 +5,7 @@ module Dscf
       belongs_to :business_type, class_name: "Dscf::Core::BusinessType"
 
       include Dscf::Core::ReviewableModel
+      include Dscf::Core::AttachmentUrls
 
       has_one_attached :logo
 
@@ -15,9 +16,7 @@ module Dscf
       validates :name, presence: true
 
       def logo_url
-        return nil unless logo.attached?
-
-        Rails.application.routes.url_helpers.rails_storage_proxy_url(logo, only_path: true)
+        attachment_url_for(logo)
       end
 
       def self.ransackable_attributes(_auth_object = nil)

data/app/models/dscf/core/document.rb

@@ -1,6 +1,8 @@
 module Dscf
   module Core
     class Document < ApplicationRecord
+      include Dscf::Core::AttachmentUrls
+
       belongs_to :documentable, polymorphic: true
       belongs_to :verified_by, polymorphic: true, optional: true
       validates :document_type, presence: true
@@ -11,9 +13,7 @@ module Dscf
       def file_urls
         return [] unless files.attached?
 
-        files.map do |file|
-          Rails.application.routes.url_helpers.rails_storage_proxy_url(file, only_path: true)
-        end
+        files.map { |file| attachment_url_for(file) }
       end
     end
   end

data/app/serializers/dscf/core/business_serializer.rb

@@ -1,12 +1,25 @@
 module Dscf
   module Core
     class BusinessSerializer < ActiveModel::Serializer
-      attributes :id, :name, :description, :contact_email, :contact_phone, :tin_number, :created_at, :updated_at, :is_system, :logo_url
+      attributes :id, :name, :description, :contact_email, :contact_phone, :tin_number, :created_at, :updated_at,
+        :is_system, :logo_url, :review_status, :review_reason
 
       belongs_to :user, serializer: Dscf::Core::UserSerializer
       belongs_to :business_type, serializer: Dscf::Core::BusinessTypeSerializer
       has_many :reviews, serializer: Dscf::Core::ReviewSerializer
       has_many :documents, serializer: Dscf::Core::DocumentSerializer
+
+      def review_status
+        object.current_status_for(:default)
+      end
+
+      # Reason the admin gave on the latest review (modification request or
+      # rejection), so the owner can see why without needing the push
+      # notification. nil for approved/pending/draft.
+      def review_reason
+        feedback = object.current_review_for(:default)&.feedback
+        feedback && (feedback["reason"] || feedback[:reason])
+      end
     end
   end
 end

data/lib/dscf/core/version.rb

@@ -1,5 +1,5 @@
 module Dscf
   module Core
-    VERSION = "0.3.11".freeze
+    VERSION = "0.3.13".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dscf-core
 version: !ruby/object:Gem::Version
-  version: 0.3.11
+  version: 0.3.13
 platform: ruby
 authors:
 - Asrat
@@ -469,6 +469,7 @@ files:
 - app/jobs/dscf/core/audit_logger_job.rb
 - app/mailers/dscf/core/application_mailer.rb
 - app/models/concerns/dscf/core/attachable.rb
+- app/models/concerns/dscf/core/attachment_urls.rb
 - app/models/concerns/dscf/core/auditable_model.rb
 - app/models/concerns/dscf/core/notifiable.rb
 - app/models/concerns/dscf/core/reviewable_model.rb