[FS-10] Refactor has company to be has current attributes

beetlegius-jt · Jan 23, 2025 · 8694cd6 · 8694cd6
1 parent 1cc1522
commit 8694cd6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/app/controllers/admin/base_controller.rb b/app/controllers/admin/base_controller.rb
@@ -1,6 +1,6 @@
 module Admin
   class BaseController < ApplicationController
-    include HasCompany
+    include HasCurrentAttributes
     include ErrorHandler
     include ActionView::RecordIdentifier
 

diff --git a/app/controllers/concerns/has_company.rb → ...ollers/concerns/has_current_attributes.rb b/app/controllers/concerns/has_company.rb → ...ollers/concerns/has_current_attributes.rb
@@ -1,11 +1,15 @@
-module HasCompany
+module HasCurrentAttributes
   extend ActiveSupport::Concern
 
   included do
     before_action :set_current_attributes
 
     def set_current_attributes
-      Current.user = current_user if user_signed_in?
+      if user_signed_in?
+        Current.user = current_user
+        Current.customer = current_user.customer
+      end
+
       Current.company = Company.find_by(subdomain: request.subdomain)
     end
   end

diff --git a/app/lib/current.rb b/app/lib/current.rb
@@ -1,4 +1,5 @@
 class Current < ActiveSupport::CurrentAttributes
   attribute :user
   attribute :company
+  attribute :customer
 end