pg_rails 7.6.19 → 7.6.21.pre.1

data/pg_engine/lib/pg_engine/configuracion.rb

@@ -4,11 +4,46 @@
 
 module PgEngine
   class Configuracion
-    attr_accessor :users_controller, :global_domains, :navigators
+    attr_accessor :users_controller, :global_domains, :navigators, :user_profiles
+
+    # attr_accessor :profile_groups
 
     def initialize
       @global_domains = ['app.localhost.com', 'test.host', 'localhost']
       @navigators = [PgEngine::Navigator.new]
+      # @profile_groups = [:account]
+      @user_profiles = {
+        account__owner: 0
+      }
+      user_profiles.merge!(
+        user_accounts__read: 1000 + 1
+      )
+      # add_profiles(:user_accounts, 1000)
+    end
+
+    def add_profiles(key, base)
+      # profile_groups.push(key)
+      user_profiles.merge!(
+        "#{key}__read": base + 1,
+        "#{key}__update": base + 10,
+        "#{key}__create": base + 30,
+        "#{key}__archive": base + 50,
+        "#{key}__export": base + 80,
+        "#{key}__destroy": base + 100
+      )
+    end
+
+    def profile_groups_options
+      groups = user_profiles.keys.map { |v| v.to_s.split('__').first }.uniq
+
+      groups = groups.excluding('account') unless Current.namespace == :admin
+
+      groups.map do |group|
+        options = user_profiles.keys.select { |va| va.starts_with?(group) }.map do |va|
+          [va, I18n.t(va.to_s.split('__').last, scope: 'profile_member')]
+        end
+        { name: group, options: }
+      end
     end
   end
 end

data/pg_engine/lib/pg_engine/navigator.rb

@@ -2,40 +2,17 @@ module PgEngine
   class Navigator
     # rubocop:disable Metrics/MethodLength
     def configure(navbar)
-      navbar.add_item('sidebar.not_signed_in', {
-                        name: 'Crear una cuenta',
-                        path: 'new_user_registration_path'
-                      })
-      navbar.add_item('sidebar.not_signed_in', {
-                        name: 'Iniciar sesión',
-                        path: 'new_user_session_path'
-                      })
-      navbar.add_item('sidebar.not_signed_in', {
-                        name: 'Contacto',
-                        path: 'new_public_mensaje_contacto_path'
-                      })
-
       # *****************************************************
 
       navbar.add_item('sidebar.signed_in', {
                         name: 'Inicio',
-                        path: 'users_root_path',
+                        path: 'tenant_root_path',
                         priority: 0
                       })
-      navbar.add_item('sidebar.signed_in', {
-                        name: 'Mi perfil',
-                        path: 'edit_user_registration_path',
-                        policy: 'policy(Current.user).edit?'
-                      })
-      navbar.add_item('sidebar.signed_in', {
-                        name: 'Cerrar sesión',
-                        path: 'destroy_user_session_path',
-                        attributes: 'data-turbo-method="delete"'
-                      })
 
       # *****************************************************
 
-      return unless Current.user&.developer?
+      return unless Current.namespace == :admin
 
       navbar.add_item('sidebar.signed_in', {
                         name: 'Eventos',

data/pg_engine/lib/pg_engine/utils/{check_invalid_records.rb → resource_reports.rb}

@@ -1,8 +1,8 @@
 # :nocov:
 module PgEngine
   module Utils
-    class CheckInvalidRecords
-      def run
+    class ResourceReports
+      def check_invalid_records
         invalids = []
         classes.each do |klass|
           klass.find_each do |record|
@@ -19,6 +19,26 @@ module PgEngine
         end
       end
 
+      def report(klass)
+        if klass.respond_to?(:discarded)
+          <<~STRING
+            #{klass}.unscoped.count: #{klass.unscoped.count}
+            #{klass}.unscoped.kept.count: #{klass.unscoped.kept.count}
+            #{klass}.unscoped.unkept.count: #{klass.unscoped.unkept.count}
+            #{klass}.unscoped.discarded.count: #{klass.unscoped.discarded.count}
+            #{klass}.unscoped.undiscarded.count: #{klass.unscoped.undiscarded.count}
+          STRING
+        else
+          <<~STRING
+            #{klass}.unscoped.count: #{klass.unscoped.count}
+          STRING
+        end
+      end
+
+      def report_all
+        classes.map { |klass| report(klass).to_s }.join("\n")
+      end
+
       def classes
         all = ActiveRecord::Base.descendants.select { |m| m.table_name.present? }
         all - ignored_classes
@@ -28,7 +48,6 @@ module PgEngine
         [
           ActionText::Record,
           ActionMailbox::Record,
-          ActiveAdmin::Comment,
           ActiveStorage::Record,
           PgEngine::BaseRecord,
           Audited::Audit,

data/pg_engine/lib/pg_engine.rb

@@ -26,6 +26,7 @@ require 'rainbow'
 require 'simple_form'
 require 'devise'
 require 'devise-i18n'
+require 'devise_invitable'
 require 'rails-i18n'
 require 'slim-rails'
 require 'enumerize'

data/pg_engine/spec/controllers/admin/accounts_controller_spec.rb

@@ -45,6 +45,7 @@ RSpec.describe Admin::AccountsController do
   let(:user) { create :user, :developer }
 
   before do
+    create :user, :owner
     sign_in user if user.present?
   end
 
@@ -60,7 +61,7 @@ RSpec.describe Admin::AccountsController do
       get :index, params: {}
     end
 
-    let!(:account) { create :account }
+    let!(:account) { create :account, :with_owner }
 
     it 'returns a success response' do
       subject
@@ -99,7 +100,7 @@ RSpec.describe Admin::AccountsController do
 
   describe 'GET #show' do
     it 'returns a success response' do
-      account = create(:account)
+      account = create(:account, :with_owner)
       get :show, params: { id: account.to_param }
       expect(response).to be_successful
     end

data/pg_engine/spec/controllers/admin/user_accounts_controller_spec.rb

@@ -29,7 +29,12 @@ require 'rails_helper'
 
 RSpec.describe Admin::UserAccountsController do
   render_views
-  let!(:user) { create :user }
+  let!(:user) do
+    create :user
+  end
+  let(:user_account) do
+    create :user_account, user:, account:
+  end
 
   let!(:account) { ActsAsTenant.current_tenant }
 
@@ -64,7 +69,9 @@ RSpec.describe Admin::UserAccountsController do
       get :index, params: {}
     end
 
-    before { create :user_account }
+    before do
+      create :user
+    end
 
     it 'returns a success response' do
       subject
@@ -94,7 +101,6 @@ RSpec.describe Admin::UserAccountsController do
 
   describe 'GET #show' do
     it 'returns a success response' do
-      user_account = create(:user_account)
       get :show, params: { id: user_account.to_param }
       expect(response).to be_successful
     end
@@ -109,7 +115,6 @@ RSpec.describe Admin::UserAccountsController do
 
   describe 'GET #edit' do
     it 'returns a success response' do
-      user_account = create(:user_account)
       get :edit, params: { id: user_account.to_param }
       expect(response).to be_successful
     end
@@ -149,7 +154,6 @@ RSpec.describe Admin::UserAccountsController do
       end
 
       it 'redirects to the user_account' do
-        user_account = create(:user_account)
         put :update, params: { id: user_account.to_param, user_account: valid_attributes }
 
         expect(response).to redirect_to([:admin, UserAccount.last])
@@ -158,13 +162,11 @@ RSpec.describe Admin::UserAccountsController do
 
     context 'with invalid params' do
       it 'returns a unprocessable_entity response' do
-        user_account = create(:user_account)
         put :update, params: { id: user_account.to_param, user_account: invalid_attributes }
         expect(response).to have_http_status(:unprocessable_entity)
       end
 
       it 'renders the edit template' do
-        user_account = create(:user_account)
         put :update, params: { id: user_account.to_param, user_account: invalid_attributes }
         expect(response).to render_template(:edit)
       end
@@ -177,11 +179,11 @@ RSpec.describe Admin::UserAccountsController do
       delete :destroy, params: { id: user_account.to_param, land_on: }
     end
 
-    let!(:user_account) { create :user_account }
     let(:land_on) { nil }
 
     it 'destroys the requested user_account' do
-      expect { subject }.to change(UserAccount, :count).by(-1)
+      user_account
+      expect { subject }.to change(UserAccount.unscoped, :count).by(-1)
     end
 
     it 'envía el pg-event' do

data/pg_engine/spec/factories/accounts.rb

@@ -6,5 +6,13 @@ FactoryBot.define do
   factory :account do
     plan { Account.plan.values.sample }
     nombre { Faker::Lorem.sentence }
+
+    trait :with_owner do
+      after(:create) do |model|
+        ActsAsTenant.with_tenant(model) do
+          create :user, :owner
+        end
+      end
+    end
   end
 end

data/pg_engine/spec/factories/user_accounts.rb

@@ -6,7 +6,7 @@ FactoryBot.define do
   factory :user_account do
     association :user
     association :account
-    profiles { [UserAccount.profiles.values.sample] }
+    profiles { [] }
 
     trait :user_existente do
       user { nil }

data/pg_engine/spec/factories/users.rb

@@ -68,5 +68,11 @@ FactoryBot.define do
     trait :developer do
       developer { true }
     end
+
+    trait :owner do
+      user_accounts do
+        [build(:user_account, account: ActsAsTenant.current_tenant, profiles: [:account__owner])]
+      end
+    end
   end
 end

data/pg_engine/spec/models/concerns/pg_engine/child_record_spec.rb

@@ -0,0 +1,27 @@
+require 'rails_helper'
+
+describe PgEngine::ChildRecord do
+  describe '#parent_accessor' do
+    it 'the values are independent from each class' do
+      model_class = Class.new(PgEngine::BaseRecord)
+      another_model_class = Class.new(PgEngine::BaseRecord)
+      model_class.include described_class
+      another_model_class.include described_class
+      model_class.parent_accessor = :one
+      another_model_class.parent_accessor = :two
+      expect(model_class.parent_accessor).to be :one
+      expect(another_model_class.parent_accessor).to be :two
+      expect { described_class.parent_accessor }.to raise_error(NoMethodError)
+    end
+  end
+
+  describe '#parent?' do
+    it do
+      expect(create(:cosa)).to be_parent
+    end
+
+    it do
+      expect(create(:categoria_de_cosa)).not_to be_parent
+    end
+  end
+end

data/pg_engine/spec/models/user_account_spec.rb

@@ -8,6 +8,10 @@ RSpec.describe UserAccount do
   let(:user_account) { create(:user_account) }
 
   it 'se persiste' do
-    expect(user_account).to be_persisted
+    ActsAsTenant.without_tenant do
+      expect(user_account).to be_persisted
+      expect(User.count).to eq 1
+      expect(described_class.count).to eq 1
+    end
   end
 end

data/pg_engine/spec/models/user_spec.rb

@@ -5,10 +5,12 @@
 require 'rails_helper'
 
 RSpec.describe User do
-  let(:user) { create(:user) }
+  let(:user) { create(:user, :owner) }
 
   it 'se persiste' do
     expect(user).to be_persisted
+    expect(UserAccount.unscoped.count).to eq 1
+    expect(UserAccount.first.profiles).to include(:account__owner)
   end
 
   it do
@@ -21,28 +23,4 @@ RSpec.describe User do
       expect(results).to eq [user]
     end
   end
-
-  describe 'default scope' do
-    before do
-      ActsAsTenant.current_tenant = nil
-      ActsAsTenant.test_tenant = nil
-      Current.reset
-    end
-
-    it 'scopes according to tenant' do
-      account = create(:account)
-      other_account = create(:account)
-      usr1 = usr2 = usr3 = usr4 = nil
-      ActsAsTenant.with_tenant(other_account) do
-        usr3 = create(:user)
-        usr4 = create(:user)
-      end
-      ActsAsTenant.with_tenant(account) do
-        usr1 = create(:user)
-        usr2 = create(:user)
-        expect(described_class.all).to contain_exactly(usr1, usr2)
-      end
-      expect(described_class.all).to contain_exactly(usr1, usr2, usr3, usr4)
-    end
-  end
 end

data/pg_engine/spec/policies/account_policy_spec.rb

@@ -0,0 +1,19 @@
+require 'rails_helper'
+
+describe AccountPolicy do
+  subject do
+    described_class.new(user, account)
+  end
+
+  let(:account) { ActsAsTenant.current_tenant }
+  let(:user) { create :user, account: }
+
+  it do
+    expect(subject).to permit(:show)
+  end
+
+  it do
+    user.user_accounts.first.update(membership_status: :disabled)
+    expect(subject).to permit(:show)
+  end
+end

data/pg_engine/spec/requests/devise/invitations_spec.rb

@@ -0,0 +1,196 @@
+require 'rails_helper'
+
+RSpec::Matchers.define_negated_matcher :not_change, :change
+
+describe 'invite users to the platform and to an account' do
+  let(:account) { ActsAsTenant.current_tenant }
+
+  describe 'send an invitation to the platform', :tpath_req do
+    let(:logged_user) { create :user, :owner }
+
+    before do
+      sign_in logged_user
+    end
+
+    describe 'new' do
+      it 'shows the form' do
+        get '/users/invitation/new'
+        expect(response).to have_http_status(:ok)
+        expect(response.body).to have_text('Agregar usuario')
+      end
+    end
+
+    describe 'create' do
+      subject do
+        post '/users/invitation', params:
+      end
+
+      let(:email) { Faker::Internet.email }
+      let(:params) do
+        {
+          user: {
+            email:,
+            user_accounts_attributes: [{
+              profiles: ['cosas__read']
+            }]
+          }
+        }
+      end
+
+      it 'creates the User and the UserAccount' do
+        expect { subject }.to change(User.unscoped, :count).by(1).and(change(UserAccount.unscoped, :count).by(1))
+        expect(UserAccount.last.profiles).to contain_exactly('cosas__read')
+      end
+
+      context 'when the user exists but not the user account' do
+        let!(:other_user) do
+          ActsAsTenant.without_tenant do
+            create :user
+          end
+        end
+        let(:email) { other_user.email }
+
+        it 'creates the UserAccount but not the User' do
+          expect { subject }.to not_change(User.unscoped, :count).and(change(UserAccount.unscoped, :count).by(1))
+        end
+      end
+
+      context 'when the user exists but is discarded' do
+        let!(:other_user) do
+          ActsAsTenant.without_tenant do
+            create :user, discarded_at: Time.current
+          end
+        end
+        let(:email) { other_user.email }
+
+        it 'doesnt create any' do
+          expect { subject }.to not_change(User.unscoped, :count).and(not_change(UserAccount.unscoped, :count))
+          expect(response).to have_http_status(:unprocessable_entity)
+        end
+      end
+
+      context 'when the user belongs to the account' do
+        let(:email) { logged_user.email }
+
+        it 'doesnt create any' do
+          expect { subject }.to not_change(User.unscoped, :count).and(not_change(UserAccount.unscoped, :count))
+          expect(response).to have_http_status(:unprocessable_entity)
+        end
+      end
+    end
+  end
+
+  describe 'accept an invitation to the platform and to the account' do
+    subject do
+      put '/users/invitation', params: {
+        user: {
+          nombre: Faker::Name.first_name,
+          apellido: Faker::Name.last_name,
+          password: 'asd12345',
+          password_confirmation: 'asd12345',
+          accept_terms: '1',
+          invitation_token: user.raw_invitation_token
+        }
+      }
+    end
+
+    let(:user) do
+      User.invite!({ email: Faker::Internet.email, user_accounts_attributes: [{ profiles: [] }] })
+    end
+
+    it do
+      expect(user.user_accounts.length).to eq 1
+      user_account = user.user_accounts.first
+      expect(user_account.invitation_status).to eq 'ist_invited'
+      expect { subject }.to change { user.reload.invitation_accepted_at }.to(be_present)
+      put "/u/espacios/#{account.to_param}/update_invitation", params: { accept: 1 }
+      expect(user_account.reload.invitation_status).to eq 'ist_accepted'
+    end
+  end
+
+  describe 'update an invitation' do
+    let(:logged_user) { create :user, account: }
+    let(:user_account) do
+      logged_user.user_accounts.first
+    end
+
+    before do
+      sign_in logged_user
+      user_account.update(membership_status:, invitation_status: :ist_invited)
+    end
+
+    context 'when accepting an invite' do
+      subject do
+        put "/u/espacios/#{account.to_param}/update_invitation", params: { accept: 1 }
+      end
+
+      let(:membership_status) { :ms_active }
+
+      it do
+        expect { subject }.to change { user_account.reload.invitation_status }.to('ist_accepted')
+      end
+
+      pending 'and doesnt belong to the account'
+    end
+
+    context 'when rejecting an invite' do
+      subject do
+        put "/u/espacios/#{account.to_param}/update_invitation", params: { reject: 1 }
+      end
+
+      let(:membership_status) { :ms_active }
+
+      it do
+        expect { subject }.to change { user_account.reload.invitation_status }.to('ist_rejected')
+      end
+    end
+
+    context 'when signing off the account' do
+      subject do
+        put "/u/espacios/#{account.to_param}/update_invitation", params: { sign_off: 1 }
+      end
+
+      let(:membership_status) { %i[ms_active ms_disabled].sample }
+
+      it do
+        expect { subject }.to change { user_account.reload.invitation_status }.to('ist_signed_off')
+      end
+    end
+  end
+
+  describe 'remove an invitation', :tpath_req do
+    subject do
+      delete "/u/t/user_accounts/#{user_account.to_param}"
+    end
+
+    let(:logged_user) { create :user, :owner }
+    let(:user_account) do
+      user.user_accounts.first
+    end
+    let!(:user) do
+      User.invite!({ email: Faker::Internet.email, user_accounts_attributes: [{ profiles: [] }] })
+    end
+
+    before do
+      sign_in logged_user
+    end
+
+    context 'when the user is confirmed' do
+      before do
+        user.nombre = Faker::Name.first_name
+        user.apellido = Faker::Name.last_name
+        user.accept_invitation!
+      end
+
+      it 'removes the UserAccount but not the User' do
+        expect { subject }.to change { UserAccount.unscoped.count }.by(-1).and(not_change(User.unscoped, :count))
+      end
+    end
+
+    context 'when the user is not confirmed' do
+      it 'removes both the UserAccount and the User' do
+        expect { subject }.to change { UserAccount.unscoped.count }.by(-1).and(change(User.unscoped, :count).by(-1))
+      end
+    end
+  end
+end

data/pg_engine/spec/requests/resource_spec.rb

@@ -1,7 +1,7 @@
 require 'rails_helper'
 
-describe 'Resources' do
-  let(:user) { create :user }
+describe 'Resources', :tpath_req do
+  let(:user) { create :user, :owner }
   let(:cosa) { create :cosa }
 
   before do
@@ -10,34 +10,33 @@ describe 'Resources' do
 
   describe 'action links' do
     it 'shows the archive link' do
-      get '/u/cosas/' + cosa.to_param
+      get '/u/t/cosas/' + cosa.to_param
       expect(response).to have_http_status(:ok)
-      regex = %r{<a data-turbo-method="post" .* href="/u/cosas/[\d]+/archive">}
-      expect(response.body).to match regex
+      expect(response.body).to have_css('span[title="Archivar"] a')
     end
 
     it 'shows the unarchive link' do
       cosa.update(discarded_at: Time.current)
-      get '/u/cosas/' + cosa.to_param
-      expect(response.body).to have_link(href: %r{/u/cosas/[\d]+/restore})
+      get '/u/t/cosas/' + cosa.to_param
+      expect(response.body).to have_link(href: %r{/u/t/.*/cosas/[\d]+/restore})
     end
   end
 
   describe 'set breadcrumbs for all actions' do
     it 'when flat archived index' do
-      get '/u/cosas/archived'
-      expect(response.body).to have_css('.breadcrumb a[href="/u/cosas"]')
+      get '/u/t/cosas/archived'
+      expect(response.body).to have_css('.breadcrumb a[href*="/cosas"]')
     end
 
     it 'when nested archived index' do
-      get "/u/categoria_de_cosas/#{cosa.categoria_de_cosa.to_param}/cosas/archived"
+      get "/u/t/categoria_de_cosas/#{cosa.categoria_de_cosa.to_param}/cosas/archived"
       expect(response.body).to \
-        have_css ".breadcrumb a[href=\"/u/categoria_de_cosas/#{cosa.categoria_de_cosa.to_param}/cosas\"]"
+        have_css ".breadcrumb a[href*=\"/categoria_de_cosas/#{cosa.categoria_de_cosa.to_param}/cosas\"]"
     end
   end
 
   describe '#archive' do
-    let(:url) { "/u/cosas/#{cosa.to_param}/archive" }
+    let(:url) { "/u/t/cosas/#{cosa.to_param}/archive" }
 
     it 'when accepts turbo stream' do
       headers = { 'ACCEPT' => 'text/vnd.turbo-stream.html' }
@@ -47,7 +46,7 @@ describe 'Resources' do
 
     it 'when accepts only html' do
       expect { post url }.to change { cosa.reload.discarded_at }.to(be_present)
-      expect(response).to redirect_to([:users, cosa])
+      expect(response).to redirect_to([:tenant, cosa])
     end
 
     context 'when fails' do
@@ -64,7 +63,7 @@ describe 'Resources' do
 
       it 'when accepts only html' do
         post url
-        expect(response).to redirect_to([:users, cosa])
+        expect(response).to redirect_to([:tenant, cosa])
         expect(flash[:alert]).to eq 'Hubo un error al intentar actualizar el coso'
       end
     end
@@ -72,7 +71,7 @@ describe 'Resources' do
 
   describe '#restore' do
     subject do
-      post "/u/cosas/#{cosa.to_param}/restore"
+      post "/u/t/cosas/#{cosa.to_param}/restore"
     end
 
     let(:cosa) { create :cosa, discarded_at: Time.zone.now }