From 8b1f22ee241909e37cfe843ac12206f4e7063296 Mon Sep 17 00:00:00 2001 From: Matthew Rider Date: Tue, 27 Aug 2024 19:52:41 +0200 Subject: [PATCH] Scope profile to organization (#1993) --- .../create_user_modal.html.erb | 2 +- .../create_user_modal/create_user_modal.rb | 10 +++++++- app/components/nav_bar/nav_bar.html.erb | 2 +- .../upgrade_business_plan_modal.html.erb | 2 +- .../user_management/user_management.html.erb | 2 +- app/controllers/profile_controller.rb | 24 ++++++++----------- config/routes.rb | 8 +++---- spec/requests/profile_spec.rb | 16 ++++++------- spec/system/profile/index_spec.rb | 12 ++++------ 9 files changed, 40 insertions(+), 38 deletions(-) diff --git a/app/components/create_user_modal/create_user_modal.html.erb b/app/components/create_user_modal/create_user_modal.html.erb index 83d13c654..506f65b78 100644 --- a/app/components/create_user_modal/create_user_modal.html.erb +++ b/app/components/create_user_modal/create_user_modal.html.erb @@ -1,5 +1,5 @@ <%= c 'modal', **attrs do %> - <%= form_with(url: profile_user_path) do %> + <%= form_with(url: organization_profile_user_path(organization)) do %> <%= c 'button', styles: [:secondary, :circular], type: 'button', diff --git a/app/components/create_user_modal/create_user_modal.rb b/app/components/create_user_modal/create_user_modal.rb index a70b1889c..50ee08b35 100644 --- a/app/components/create_user_modal/create_user_modal.rb +++ b/app/components/create_user_modal/create_user_modal.rb @@ -1,5 +1,13 @@ # frozen_string_literal: true module CreateUserModal - class CreateUserModal < ApplicationComponent; end + class CreateUserModal < ApplicationComponent + def initialize(organization:, **) + super + + @organization = organization + end + + attr_reader :organization + end end diff --git a/app/components/nav_bar/nav_bar.html.erb b/app/components/nav_bar/nav_bar.html.erb index 78e44b1c6..4273b6234 100644 --- a/app/components/nav_bar/nav_bar.html.erb +++ b/app/components/nav_bar/nav_bar.html.erb @@ -45,7 +45,7 @@ <% end %>
  • - <%= link_to profile_path, aria: { label: t('.profile_path') } do %> + <%= link_to organization_profile_path(organization), aria: { label: t('.profile_path') } do %> <%= t '.profile_link' %> diff --git a/app/components/upgrade_business_plan_modal/upgrade_business_plan_modal.html.erb b/app/components/upgrade_business_plan_modal/upgrade_business_plan_modal.html.erb index 041ce5d1a..2e788f266 100644 --- a/app/components/upgrade_business_plan_modal/upgrade_business_plan_modal.html.erb +++ b/app/components/upgrade_business_plan_modal/upgrade_business_plan_modal.html.erb @@ -9,7 +9,7 @@ <% end %> <%= form_with( model: organization, - url: profile_upgrade_business_plan_path, + url: organization_profile_upgrade_business_plan_path(organization), local: true, method: 'PUT', html: { autocomplete: 'off' } diff --git a/app/components/user_management/user_management.html.erb b/app/components/user_management/user_management.html.erb index cac63f414..23b147fcc 100644 --- a/app/components/user_management/user_management.html.erb +++ b/app/components/user_management/user_management.html.erb @@ -20,5 +20,5 @@ <%= t('.add_users_button') %> <% end%> <% end %> - <%= c 'create_user_modal', data: { controller: 'modal', user_management_target: 'modal' } %> + <%= c 'create_user_modal', organization: organization, data: { controller: 'modal', user_management_target: 'modal' } %> <% end %> diff --git a/app/controllers/profile_controller.rb b/app/controllers/profile_controller.rb index 28125edec..bfc7d67ce 100644 --- a/app/controllers/profile_controller.rb +++ b/app/controllers/profile_controller.rb @@ -1,31 +1,31 @@ # frozen_string_literal: true class ProfileController < ApplicationController - before_action :organization, :business_plans + before_action :business_plans def index; end def create_user password = SecureRandom.alphanumeric(20) - user = User.new(user_params.merge(password: password, organization: organization)) + user = User.new(user_params.merge(password: password, organization: @organization)) if user.save - redirect_to profile_path, flash: { success: I18n.t('profile.user.created_successfully') } + redirect_to organization_profile_path(@organization), flash: { success: I18n.t('profile.user.created_successfully') } else - redirect_to profile_path, flash: { error: user.errors.full_messages.join(' ') } + redirect_to organization_profile_path(@organization), flash: { error: user.errors.full_messages.join(' ') } end end def upgrade_business_plan - organization.business_plan.update(valid_from: nil, valid_until: nil) + @organization.business_plan.update(valid_from: nil, valid_until: nil) business_plan = BusinessPlan.find(upgrade_business_plan_params[:business_plan_id]) business_plan.update(valid_from: Time.current, valid_until: 1.year.from_now) - organization.business_plan = business_plan - organization.upgraded_business_plan_at = Time.current + @organization.business_plan = business_plan + @organization.upgraded_business_plan_at = Time.current - if organization.save - redirect_to profile_path, flash: { success: I18n.t('profile.business_plan.updated_successfully') } + if @organization.save + redirect_to organization_profile_path(@organization), flash: { success: I18n.t('profile.business_plan.updated_successfully') } else - redirect_to profile_path, flash: { error: organization.errors.full_messages.join(' ') } + redirect_to organization_profile_path(@organization), flash: { error: @organization.errors.full_messages.join(' ') } end end @@ -39,10 +39,6 @@ def upgrade_business_plan_params params.require(:profile).permit(:business_plan_id) end - def organization - @organization ||= current_user.admin? ? Organization.last : current_user.organization - end - def business_plans @business_plans ||= BusinessPlan.order(:price_per_month) end diff --git a/config/routes.rb b/config/routes.rb index 1ac803571..13cda67da 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -84,6 +84,10 @@ get 'count' end end + + get '/profile', to: 'profile#index' + post '/profile/user', to: 'profile#create_user' + put '/profile/upgrade_business_plan', to: 'profile#upgrade_business_plan' end get '/health', to: 'health#index' @@ -132,8 +136,4 @@ resource :otp_setup, controller: :otp_setup, only: %i[show create] resource :otp_auth, controller: :otp_auth, only: %i[show create] - - get '/profile', to: 'profile#index' - post '/profile/user', to: 'profile#create_user' - put '/profile/upgrade_business_plan', to: 'profile#upgrade_business_plan' end diff --git a/spec/requests/profile_spec.rb b/spec/requests/profile_spec.rb index 64691a85b..9324b5092 100644 --- a/spec/requests/profile_spec.rb +++ b/spec/requests/profile_spec.rb @@ -14,7 +14,7 @@ describe 'GET /index' do it 'should be successful' do - get profile_url(as: user) + get organization_profile_url(organization, as: user) expect(response).to be_successful end end @@ -23,7 +23,7 @@ let(:params) { { user: { first_name: 'Daniel', last_name: 'Theis', email: 'daniel-theis@example.org' } } } context 'unauthenticated' do - subject { -> { post profile_user_path, params: params } } + subject { -> { post organization_profile_user_path(organization), params: params } } it 'does not change user count' do expect { subject.call }.not_to(change { User.count }) @@ -31,7 +31,7 @@ end context 'authenticated' do - subject { -> { post profile_user_path(as: user), params: params } } + subject { -> { post organization_profile_user_path(organization, as: user), params: params } } it 'creates a user' do expect { subject.call }.to(change { User.count }.from(2).to(3)) @@ -39,7 +39,7 @@ it 'redirects to profile page' do subject.call - expect(response).to redirect_to profile_path + expect(response).to redirect_to organization_profile_path(organization) end it 'shows success notification' do @@ -58,7 +58,7 @@ it 'redirects to profile page' do subject.call - expect(response).to redirect_to profile_path + expect(response).to redirect_to organization_profile_path(organization) end it 'shows success notification' do @@ -86,7 +86,7 @@ let(:params) { { profile: { business_plan_id: business_plan.id } } } context 'unauthenticated' do - subject { -> { put profile_upgrade_business_plan_path, params: params } } + subject { -> { put organization_profile_upgrade_business_plan_path(organization), params: params } } it 'does not change user count' do expect { subject.call }.not_to(change { organization.reload.business_plan }) @@ -94,7 +94,7 @@ end context 'authenticated' do - subject { -> { put profile_upgrade_business_plan_path(as: user), params: params } } + subject { -> { put organization_profile_upgrade_business_plan_path(organization, as: user), params: params } } it 'updates the organization business_plan' do current_business_plan = organization.business_plan @@ -103,7 +103,7 @@ it 'redirects to profile page' do subject.call - expect(response).to redirect_to profile_path + expect(response).to redirect_to organization_profile_path(organization) end it 'shows success notification' do diff --git a/spec/system/profile/index_spec.rb b/spec/system/profile/index_spec.rb index 8812e2fc7..ef801ec27 100644 --- a/spec/system/profile/index_spec.rb +++ b/spec/system/profile/index_spec.rb @@ -41,7 +41,7 @@ find('a[aria-label="Zur Profilseite"]').click end - expect(page).to have_current_path(profile_path) + expect(page).to have_current_path(organization_profile_path(organization)) # header expect(page).to have_content("Dein 100eyes Plan: #{current_plan.name}") @@ -70,7 +70,7 @@ user_to_be_deactivated.update(deactivated_at: Time.current) - visit profile_path(as: user) + visit organization_profile_path(organization, as: user) expect(page).to have_content("3 von #{current_plan.number_of_users} Seats genutzt") expect(page).not_to have_content(user_to_be_deactivated.name) @@ -160,7 +160,7 @@ expect(page).to have_content("Mindeslaufzeit: bis #{I18n.l(1.year.from_now, format: '%m/%Y')}") Timecop.travel(6.months.from_now + 1.minute) - visit profile_path(as: user) + visit organization_profile_path(organization, as: user) expect(page).to have_content("Preis: #{number_to_currency(editorial_enterprise.price_per_month)}/Monat") # WhatsApp not set up @@ -180,8 +180,7 @@ three_sixty_dialog_client_api_key: nil ) - visit profile_path(as: user) - + visit organization_profile_path(organization, as: user) expect(page).not_to have_selector(:element, 'section', 'data-testid': 'whats-app-setup') # 360dialog configured @@ -192,8 +191,7 @@ three_sixty_dialog_client_api_key: SecureRandom.alphanumeric(26) ) - visit profile_path(as: user) - + visit organization_profile_path(organization, as: user) expect(page).not_to have_selector(:element, 'section', 'data-testid': 'whats-app-setup') end end