dscf-core 0.3.12 → 0.3.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d5c9ec3fc1c7652890999a1d4a0a51c803c5a76048a2ae19e618eed764bfeaa
-  data.tar.gz: 774c4fe39b0d823b1c76445ef8a6ad3908cc4a7c2042265fe97c3e23641a957d
+  metadata.gz: 04dc0626657988f601694e4e423b72fbc82996d6960178bc52024aa1de41bfe8
+  data.tar.gz: 9270c931ab649cf64b2265e0680ea36cdea14c85cb7d73439e66035a4336bae1
 SHA512:
-  metadata.gz: 95e7d2bf92eb2630122b13d92983636e0b616fcd09752f513ea00a4ed828f40defb83246d6ddbfb34613241009ba43f113ddff366fdda258f85a7b034527cfb9
-  data.tar.gz: 1a9ca7f46e79f9a04434ccafe465a947d0c26334ed00bbd02733dda7e8d62287c561236aeef8479cf7283d1ac5bfc264d568bc329109c98dbb72e3118016aa1e
+  metadata.gz: 369e0eb673118c48fafb0c41ab308a926cda01ba05348047db3907fa988ca569185c9f5c899f9a5d560ed728271b2bc273baed41abe2a62695eca5171d52ef88
+  data.tar.gz: fa2cc032c4fb2ce73478517a353896dd03dc36717a05839b8fde475308d41215d0b396cde8aa935a1fed48ffe9b5b437909c067a5548434d048fed3ce808fbd0

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

@@ -161,8 +161,12 @@ module Dscf
         # 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)
+        # Guard on current_user first: find_by(user_id: nil) matches any
+        # Agent row with a null user_id, silently attributing anonymous
+        # self-signups to a random agent (confirmed live in dscf_marketplace's
+        # equivalent bug — same fix applied here).
+        onboarding_agent = if current_user && defined?(Dscf::Marketplace::Agent)
+          Dscf::Marketplace::Agent.find_by(user_id: current_user.id)
         end
 
         retailer = Dscf::Marketplace::Retailer.create!(

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.12".freeze
+    VERSION = "0.3.14".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dscf-core
 version: !ruby/object:Gem::Version
-  version: 0.3.12
+  version: 0.3.14
 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