From e72957a913981281a40fd1d060cc9ef2866e6cad Mon Sep 17 00:00:00 2001 From: Ridhwana Date: Wed, 4 May 2022 16:20:46 +0200 Subject: [PATCH] feat: add an inflection and change instances of gdpr to GDPR (#17567) --- app/controllers/admin/gdpr_delete_requests_controller.rb | 6 +++--- app/models/gdpr_delete_request.rb | 2 +- app/views/admin/users/index/_tabs.html.erb | 4 ++-- app/workers/users/delete_worker.rb | 2 +- config/initializers/inflections.rb | 1 + .../20201012072557_create_users_gdpr_delete_requests.rb | 2 +- spec/factories/gdpr_delete_requests.rb | 2 +- spec/requests/admin/gdpr_delete_requests_spec.rb | 2 +- spec/workers/users/delete_worker_spec.rb | 2 +- 9 files changed, 12 insertions(+), 11 deletions(-) diff --git a/app/controllers/admin/gdpr_delete_requests_controller.rb b/app/controllers/admin/gdpr_delete_requests_controller.rb index 0465f0a24..f9ebfd006 100644 --- a/app/controllers/admin/gdpr_delete_requests_controller.rb +++ b/app/controllers/admin/gdpr_delete_requests_controller.rb @@ -1,13 +1,13 @@ module Admin - class GdprDeleteRequestsController < Admin::ApplicationController + class GDPRDeleteRequestsController < Admin::ApplicationController layout "admin" def index - @gdpr_delete_requests = ::GdprDeleteRequest.order(created_at: :desc).page(params[:page]).per(50) + @gdpr_delete_requests = ::GDPRDeleteRequest.order(created_at: :desc).page(params[:page]).per(50) end def destroy - @gdpr_delete_request = ::GdprDeleteRequest.find(params[:id]) + @gdpr_delete_request = ::GDPRDeleteRequest.find(params[:id]) @gdpr_delete_request.destroy AuditLog.create( diff --git a/app/models/gdpr_delete_request.rb b/app/models/gdpr_delete_request.rb index 43ba7e470..50a049faa 100644 --- a/app/models/gdpr_delete_request.rb +++ b/app/models/gdpr_delete_request.rb @@ -1,4 +1,4 @@ -class GdprDeleteRequest < ApplicationRecord +class GDPRDeleteRequest < ApplicationRecord validates :email, :user_id, presence: true def self.table_name_prefix diff --git a/app/views/admin/users/index/_tabs.html.erb b/app/views/admin/users/index/_tabs.html.erb index 0c0668d27..b072d65e9 100644 --- a/app/views/admin/users/index/_tabs.html.erb +++ b/app/views/admin/users/index/_tabs.html.erb @@ -9,8 +9,8 @@
  • <%= link_to admin_gdpr_delete_requests_path, class: "crayons-navigation__item #{'crayons-navigation__item--current' if params[:controller] == 'admin/gdpr_delete_requests'}", "aria-current": ("page" if params[:controller] == "admin/gdpr_delete_requests") do %> GDPR Delete Requests - <% if GdprDeleteRequest.any? %> -  <%= GdprDeleteRequest.count %> + <% if GDPRDeleteRequest.any? %> +  <%= GDPRDeleteRequest.count %> <% end %> <% end %>
    • diff --git a/app/workers/users/delete_worker.rb b/app/workers/users/delete_worker.rb index 1bd2ab5c3..eea820a4d 100644 --- a/app/workers/users/delete_worker.rb +++ b/app/workers/users/delete_worker.rb @@ -10,7 +10,7 @@ module Users Users::Delete.call(user) # notify admins internally that they need to delete gdpr data - GdprDeleteRequest.create(user_id: user.id, email: user.email, username: user.username) + GDPRDeleteRequest.create(user_id: user.id, email: user.email, username: user.username) return if admin_delete || user.email.blank? diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb index 67012a382..c859ceb3c 100644 --- a/config/initializers/inflections.rb +++ b/config/initializers/inflections.rb @@ -13,4 +13,5 @@ # These inflection rules are supported but not enabled by default: ActiveSupport::Inflector.inflections(:en) do |inflect| inflect.acronym "SMTP" + inflect.acronym "GDPR" end diff --git a/db/migrate/20201012072557_create_users_gdpr_delete_requests.rb b/db/migrate/20201012072557_create_users_gdpr_delete_requests.rb index 888e6efbd..6877ef9a1 100644 --- a/db/migrate/20201012072557_create_users_gdpr_delete_requests.rb +++ b/db/migrate/20201012072557_create_users_gdpr_delete_requests.rb @@ -1,4 +1,4 @@ -class CreateUsersGdprDeleteRequests < ActiveRecord::Migration[6.0] +class CreateUsersGDPRDeleteRequests < ActiveRecord::Migration[6.0] def change create_table :users_gdpr_delete_requests do |t| t.integer :user_id, null: false diff --git a/spec/factories/gdpr_delete_requests.rb b/spec/factories/gdpr_delete_requests.rb index 4b82018fe..541f2e22a 100644 --- a/spec/factories/gdpr_delete_requests.rb +++ b/spec/factories/gdpr_delete_requests.rb @@ -1,5 +1,5 @@ FactoryBot.define do - factory :gdpr_delete_request, class: "GdprDeleteRequest" do + factory :gdpr_delete_request, class: "GDPRDeleteRequest" do user_id { rand(100) } sequence(:email) { |n| "person#{n}@example.com" } sequence(:username) { |n| "username#{n}" } diff --git a/spec/requests/admin/gdpr_delete_requests_spec.rb b/spec/requests/admin/gdpr_delete_requests_spec.rb index 7ffe0710a..ac1cefe03 100644 --- a/spec/requests/admin/gdpr_delete_requests_spec.rb +++ b/spec/requests/admin/gdpr_delete_requests_spec.rb @@ -28,7 +28,7 @@ RSpec.describe "/admin/gdpr_delete_requests", type: :request do it "destroys the gdpr delete request on confirmation" do expect do delete admin_gdpr_delete_request_path(gdr.id) - end.to change(GdprDeleteRequest, :count).by(-1) + end.to change(GDPRDeleteRequest, :count).by(-1) end it "creates a corresponding audit_log on confirmation" do diff --git a/spec/workers/users/delete_worker_spec.rb b/spec/workers/users/delete_worker_spec.rb index 6a18d1da9..7f601e61d 100644 --- a/spec/workers/users/delete_worker_spec.rb +++ b/spec/workers/users/delete_worker_spec.rb @@ -54,7 +54,7 @@ RSpec.describe Users::DeleteWorker, type: :worker do it "creates a gdpr-delete record" do expect do worker.perform(user.id, true) - end.to change(GdprDeleteRequest, :count).by(1) + end.to change(GDPRDeleteRequest, :count).by(1) end end