baarkerlounger
/
submit-social-housing-lettings-and-sales-data
mirror of https://github.com/communitiesuk/submit-social-housing-lettings-and-sales-data.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

refactor delete logs controller after tech review 

improve the private method that builds the form object so that it has the flexibility to do so for all controller methods
ensure that the search term is passed to the delete logs controller when navigating through the organisations tab
ensure that noly logs for that organisation are displayed when navigating to delete logs through the organisations tab
pull/1657/head
Arthur Campbell 3 years ago
parent
080a3e6952
commit
91533d0308
4 changed files with 51 additions and 54 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 85
      app/controllers/delete_logs_controller.rb
  2. 4
      app/controllers/organisations_controller.rb
  3. 8
      app/models/forms/delete_logs_form.rb
  4. 8
      spec/requests/delete_logs_controller_spec.rb

85
app/controllers/delete_logs_controller.rb
Unescape View File

@ -4,26 +4,20 @@ class DeleteLogsController < ApplicationController
rescue_from ActiveRecord::RecordNotFound, with: :render_not_found rescue_from ActiveRecord::RecordNotFound, with: :render_not_found
before_action :session_filters, if: :current_user, except: %i[discard_lettings_logs discard_sales_logs discard_lettings_logs_for_organisation discard_sales_logs_for_organisation] before_action :session_filters, if: :current_user, except: %i[discard_lettings_logs discard_sales_logs discard_lettings_logs_for_organisation discard_sales_logs_for_organisation]
before_action :add_organisation_to_filters, only: %i[delete_lettings_logs_for_organisation delete_lettings_logs_for_organisation_with_selected_ids delete_lettings_logs_for_organisation_confirmation delete_sales_logs_for_organisation delete_sales_logs_for_organisation_with_selected_ids delete_sales_logs_for_organisation_confirmation]
def delete_lettings_logs def delete_lettings_logs
@delete_logs_form = delete_logs_form(log_type: :lettings, paths: lettings_logs_paths) @delete_logs_form = delete_logs_form(log_type: :lettings)
render "logs/delete_logs" render "logs/delete_logs"
end end
def delete_lettings_logs_with_selected_ids def delete_lettings_logs_with_selected_ids
@delete_logs_form = delete_logs_form(selected_ids:, log_type: :lettings, paths: lettings_logs_paths) @delete_logs_form = delete_logs_form(log_type: :lettings, selected_ids:)
render "logs/delete_logs" render "logs/delete_logs"
end end
def delete_lettings_logs_confirmation def delete_lettings_logs_confirmation
default_attributes = { @delete_logs_form = delete_logs_form(log_type: :lettings, form_params:)
current_user:,
log_filters: @session_filters,
log_type: :lettings,
}.merge lettings_logs_paths
attributes = form_attributes.merge(default_attributes)
attributes[:selected_ids] = [] unless attributes.key? :selected_ids
@delete_logs_form = Forms::DeleteLogsForm.new(attributes)
if @delete_logs_form.valid? if @delete_logs_form.valid?
render "logs/delete_logs_confirmation" render "logs/delete_logs_confirmation"
else else
@ -39,24 +33,17 @@ class DeleteLogsController < ApplicationController
end end
def delete_sales_logs def delete_sales_logs
@delete_logs_form = delete_logs_form(log_type: :sales, paths: sales_logs_paths) @delete_logs_form = delete_logs_form(log_type: :sales)
render "logs/delete_logs" render "logs/delete_logs"
end end
def delete_sales_logs_with_selected_ids def delete_sales_logs_with_selected_ids
@delete_logs_form = delete_logs_form(selected_ids:, log_type: :sales, paths: sales_logs_paths) @delete_logs_form = delete_logs_form(log_type: :sales, selected_ids:)
render "logs/delete_logs" render "logs/delete_logs"
end end
def delete_sales_logs_confirmation def delete_sales_logs_confirmation
default_attributes = { @delete_logs_form = delete_logs_form(log_type: :sales, form_params:)
current_user:,
log_filters: @session_filters,
log_type: :sales,
}.merge sales_logs_paths
attributes = form_attributes.merge(default_attributes)
attributes[:selected_ids] = [] unless attributes.key? :selected_ids
@delete_logs_form = Forms::DeleteLogsForm.new(attributes)
if @delete_logs_form.valid? if @delete_logs_form.valid?
render "logs/delete_logs_confirmation" render "logs/delete_logs_confirmation"
else else
@ -72,24 +59,17 @@ class DeleteLogsController < ApplicationController
end end
def delete_lettings_logs_for_organisation def delete_lettings_logs_for_organisation
@delete_logs_form = delete_logs_form(log_type: :lettings, paths: lettings_logs_for_organisation_paths) @delete_logs_form = delete_logs_form(log_type: :lettings, organisation: true)
render "logs/delete_logs" render "logs/delete_logs"
end end
def delete_lettings_logs_for_organisation_with_selected_ids def delete_lettings_logs_for_organisation_with_selected_ids
@delete_logs_form = delete_logs_form(selected_ids:, log_type: :lettings, paths: lettings_logs_for_organisation_paths) @delete_logs_form = delete_logs_form(log_type: :lettings, organisation: true, selected_ids:)
render "logs/delete_logs" render "logs/delete_logs"
end end
def delete_lettings_logs_for_organisation_confirmation def delete_lettings_logs_for_organisation_confirmation
default_attributes = { @delete_logs_form = delete_logs_form(log_type: :lettings, organisation: true, form_params:)
current_user:,
log_filters: @session_filters,
log_type: :lettings,
}.merge lettings_logs_for_organisation_paths
attributes = form_attributes.merge(default_attributes)
attributes[:selected_ids] = [] unless attributes.key? :selected_ids
@delete_logs_form = Forms::DeleteLogsForm.new(attributes)
if @delete_logs_form.valid? if @delete_logs_form.valid?
render "logs/delete_logs_confirmation" render "logs/delete_logs_confirmation"
else else
@ -98,31 +78,24 @@ class DeleteLogsController < ApplicationController
end end
def discard_lettings_logs_for_organisation def discard_lettings_logs_for_organisation
logs = LettingsLog.find(params.require(:ids)) logs = LettingsLog.where(owning_organisation: params[:id]).find(params.require(:ids))
discard logs discard logs
redirect_to lettings_logs_organisation_path, notice: I18n.t("notification.logs_deleted", count: logs.count) redirect_to lettings_logs_organisation_path, notice: I18n.t("notification.logs_deleted", count: logs.count)
end end
def delete_sales_logs_for_organisation def delete_sales_logs_for_organisation
@delete_logs_form = delete_logs_form(log_type: :sales, paths: sales_logs_for_organisation_paths) @delete_logs_form = delete_logs_form(log_type: :sales, organisation: true)
render "logs/delete_logs" render "logs/delete_logs"
end end
def delete_sales_logs_for_organisation_with_selected_ids def delete_sales_logs_for_organisation_with_selected_ids
@delete_logs_form = delete_logs_form(selected_ids:, log_type: :sales, paths: sales_logs_for_organisation_paths) @delete_logs_form = delete_logs_form(log_type: :sales, organisation: true, selected_ids:)
render "logs/delete_logs" render "logs/delete_logs"
end end
def delete_sales_logs_for_organisation_confirmation def delete_sales_logs_for_organisation_confirmation
default_attributes = { @delete_logs_form = delete_logs_form(log_type: :sales, organisation: true, form_params:)
current_user:,
log_filters: @session_filters,
log_type: :sales,
}.merge sales_logs_for_organisation_paths
attributes = form_attributes.merge(default_attributes)
attributes[:selected_ids] = [] unless attributes.key? :selected_ids
@delete_logs_form = Forms::DeleteLogsForm.new(attributes)
if @delete_logs_form.valid? if @delete_logs_form.valid?
render "logs/delete_logs_confirmation" render "logs/delete_logs_confirmation"
else else
@ -131,7 +104,7 @@ class DeleteLogsController < ApplicationController
end end
def discard_sales_logs_for_organisation def discard_sales_logs_for_organisation
logs = SalesLog.find(params.require(:ids)) logs = SalesLog.where(owning_organisation: params[:id]).find(params.require(:ids))
discard logs discard logs
redirect_to sales_logs_organisation_path, notice: I18n.t("notification.logs_deleted", count: logs.count) redirect_to sales_logs_organisation_path, notice: I18n.t("notification.logs_deleted", count: logs.count)
@ -139,12 +112,28 @@ class DeleteLogsController < ApplicationController
private private
def delete_logs_form(log_type:, paths:, selected_ids: nil) def delete_logs_form(log_type:, organisation: false, selected_ids: nil, form_params: {})
Forms::DeleteLogsForm.new(current_user:, search_term:, log_filters: @session_filters, log_type:, selected_ids:, **paths) paths = case log_type
when :lettings
organisation ? lettings_logs_for_organisation_paths : lettings_logs_paths
when :sales
organisation ? sales_logs_for_organisation_paths : sales_logs_paths
end
attributes = {
log_type:,
current_user:,
log_filters: @session_filters,
search_term:,
selected_ids:,
**paths
}.merge(form_params).transform_keys(&:to_sym)
Forms::DeleteLogsForm.new(attributes)
end end
def form_attributes def form_params
params.require(:forms_delete_logs_form).permit(:search_term, selected_ids: []) form_attributes = params.require(:forms_delete_logs_form).permit(:search_term, selected_ids: [])
form_attributes[:selected_ids] = [] unless form_attributes.key? :selected_ids
form_attributes
end end
def lettings_logs_paths def lettings_logs_paths
@ -179,6 +168,10 @@ private
} }
end end
def add_organisation_to_filters
@session_filters[:organisation] = params[:id]
end
def search_term def search_term
params["search"] params["search"]
end end

4
app/controllers/organisations_controller.rb
Unescape View File

@ -96,7 +96,7 @@ class OrganisationsController < ApplicationController
format.html do format.html do
@search_term = search_term @search_term = search_term
@pagy, @logs = pagy(unpaginated_filtered_logs) @pagy, @logs = pagy(unpaginated_filtered_logs)
@delete_logs_path = delete_lettings_logs_organisation_path @delete_logs_path = delete_lettings_logs_organisation_path(search: @search_term)
@searched = search_term.presence @searched = search_term.presence
@total_count = organisation_logs.size @total_count = organisation_logs.size
@log_type = :lettings @log_type = :lettings
@ -127,7 +127,7 @@ class OrganisationsController < ApplicationController
format.html do format.html do
@search_term = search_term @search_term = search_term
@pagy, @logs = pagy(unpaginated_filtered_logs) @pagy, @logs = pagy(unpaginated_filtered_logs)
@delete_logs_path = delete_sales_logs_organisation_path @delete_logs_path = delete_sales_logs_organisation_path(search: @search_term)
@searched = search_term.presence @searched = search_term.presence
@total_count = organisation_logs.size @total_count = organisation_logs.size
@log_type = :sales @log_type = :sales

8
app/models/forms/delete_logs_form.rb
Unescape View File

@ -11,7 +11,7 @@ module Forms
@log_type = attributes[:log_type] @log_type = attributes[:log_type]
@search_term = attributes[:search_term] @search_term = attributes[:search_term]
@current_user = attributes[:current_user] @current_user = attributes[:current_user]
@logs = FilterService.filter_logs(all_logs, @search_term, attributes[:log_filters], nil, @current_user) @logs = FilterService.filter_logs(visible_logs, @search_term, attributes[:log_filters], nil, @current_user)
@selected_ids = attributes[:selected_ids] || @logs.map(&:id) @selected_ids = attributes[:selected_ids] || @logs.map(&:id)
@delete_confirmation_path = attributes[:delete_confirmation_path] @delete_confirmation_path = attributes[:delete_confirmation_path]
@back_to_logs_path = attributes[:back_to_logs_path] @back_to_logs_path = attributes[:back_to_logs_path]
@ -22,6 +22,10 @@ module Forms
@logs.count @logs.count
end end
def table_partial_name
"logs/delete_logs_table_#{@log_type}"
end
private private
def at_least_one_log_selected def at_least_one_log_selected
@ -30,7 +34,7 @@ module Forms
end end
end end
def all_logs def visible_logs
case @log_type case @log_type
when :lettings then @current_user.lettings_logs.visible when :lettings then @current_user.lettings_logs.visible
when :sales then @current_user.sales_logs.visible when :sales then @current_user.sales_logs.visible

8
spec/requests/delete_logs_controller_spec.rb
Unescape View File

@ -513,7 +513,7 @@ RSpec.describe "DeleteLogs", type: :request do
expect(FilterService).to receive(:filter_logs) { |arg1, arg2, arg3, _arg4, _arg5| expect(FilterService).to receive(:filter_logs) { |arg1, arg2, arg3, _arg4, _arg5|
expect(arg1).to contain_exactly(log_1, log_2) expect(arg1).to contain_exactly(log_1, log_2)
expect(arg2).to eq search expect(arg2).to eq search
expect(arg3).to eq logs_filters expect(arg3).to eq logs_filters.merge(organisation: organisation.id.to_s)
}.and_return LettingsLog.all }.and_return LettingsLog.all
get delete_lettings_logs_organisation_path(id: organisation, search:) get delete_lettings_logs_organisation_path(id: organisation, search:)
@ -562,7 +562,7 @@ RSpec.describe "DeleteLogs", type: :request do
expect(FilterService).to receive(:filter_logs) { |arg1, arg2, arg3, _arg4, _arg5| expect(FilterService).to receive(:filter_logs) { |arg1, arg2, arg3, _arg4, _arg5|
expect(arg1).to contain_exactly(log_1, log_2) expect(arg1).to contain_exactly(log_1, log_2)
expect(arg2).to eq search expect(arg2).to eq search
expect(arg3).to eq logs_filters expect(arg3).to eq logs_filters.merge(organisation: organisation.id.to_s)
}.and_return LettingsLog.all }.and_return LettingsLog.all
post delete_lettings_logs_organisation_path(id: organisation, search:, selected_ids:) post delete_lettings_logs_organisation_path(id: organisation, search:, selected_ids:)
@ -738,7 +738,7 @@ RSpec.describe "DeleteLogs", type: :request do
expect(FilterService).to receive(:filter_logs) { |arg1, arg2, arg3, _arg4, _arg5| expect(FilterService).to receive(:filter_logs) { |arg1, arg2, arg3, _arg4, _arg5|
expect(arg1).to contain_exactly(log_1, log_2) expect(arg1).to contain_exactly(log_1, log_2)
expect(arg2).to eq search expect(arg2).to eq search
expect(arg3).to eq logs_filters expect(arg3).to eq logs_filters.merge(organisation: organisation.id.to_s)
}.and_return SalesLog.all }.and_return SalesLog.all
get delete_sales_logs_organisation_path(id: organisation, search:) get delete_sales_logs_organisation_path(id: organisation, search:)
@ -787,7 +787,7 @@ RSpec.describe "DeleteLogs", type: :request do
expect(FilterService).to receive(:filter_logs) { |arg1, arg2, arg3, _arg4, _arg5| expect(FilterService).to receive(:filter_logs) { |arg1, arg2, arg3, _arg4, _arg5|
expect(arg1).to contain_exactly(log_1, log_2) expect(arg1).to contain_exactly(log_1, log_2)
expect(arg2).to eq search expect(arg2).to eq search
expect(arg3).to eq logs_filters expect(arg3).to eq logs_filters.merge(organisation: organisation.id.to_s)
}.and_return SalesLog.all }.and_return SalesLog.all
post delete_sales_logs_organisation_path(id: organisation, search:, selected_ids:) post delete_sales_logs_organisation_path(id: organisation, search:, selected_ids:)

Write Preview
Loading…
Cancel
Save