refactor ScopableConcern

Author: Sergey Toy

lib/core/app/models/concerns/ros/application_record_concern.rb

@@ -5,7 +5,7 @@ module ApplicationRecordConcern
     extend ActiveSupport::Concern
     include AssociationResource
     include UrnConcern
-    include Ros::ScopableConcern
+    include ScopableConcern
 
     class_methods do
       def account_id; Apartment::Tenant.current.eql?('public') ? '' : Apartment::Tenant.current.remove('_') end

lib/core/app/models/concerns/ros/scopable_concern.rb

@@ -4,14 +4,9 @@ module Ros
   module ScopableConcern
     extend ActiveSupport::Concern
 
-    class_methods do
-      def everything(_user_context)
-        all
-      end
-
-      def owned(_user_context)
-        all
-      end
+    included do
+      scope :everything, ->(_user_context) { all }
+      scope :owned, ->(_user_context) { all }
     end
   end
 end

services/cognito/app/models/user.rb

@@ -6,6 +6,8 @@ class User < Cognito::ApplicationRecord
   has_many :user_pools
   has_many :pools, through: :user_pools
 
+  scope :owned, ->(user_context) { where(id: user_context.cognito_user_id) }
+
   def self.reset
     UserPool.delete_all
     Pool.delete_all
@@ -16,10 +18,6 @@ def self.file_fingerprint_attributes
     column_names + %i[pool_name]
   end
 
-  def self.owned(user_context)
-    where(id: user_context.cognito_user_id)
-  end
-
   # rubocop:disable Rails/Output
   def self.load_document(file_name, column_map = nil, create = false)
     column_map ||= default_headers

services/iam/app/models/user.rb

@@ -37,9 +37,7 @@ def self.urn_id; :username end
          authentication_keys: [:username]
   # jwt_revocation_strategy: Devise::JWT::RevocationStrategies::Null
 
-  def self.owned(user_context)
-    where(id: user_context.iam_user.id)
-  end
+  scope :owned, ->(user_context) { where(id: user_context.iam_user.id) }
 
   def all_policy_actions
     # delete duplication and group by name, effect and segment