Browse Source
* add first page for bulk upload resume journey * bulk upload resume handles upload again * add confirm page to bulk upload resume journey * replace placeholder count with correct value * apply recommendation for bulk upload resume choice * add how to fix bulk upload mailer * integrate new bulk upload approve journey * add missing bulk upload error mappings * remove test * prevent approve being called multiple times * bulk upload creates invisible logs ahead of time * work invisible logs into bulk upload flow * sort errors so deterministic * remove unused ensure * remove expected_log_count and processed - these fields are no longer used or needed * introduce pending status * swap visible for pending logs * only show visible lettings logs * hard code status filters * remove unused model methods * only show visible sales logs * form controller ignores hidden logs * locations and schemes only affect visible logspull/1522/head
Phil Lee
2 years ago
committed by
GitHub
51 changed files with 620 additions and 259 deletions
@ -0,0 +1,42 @@ |
|||||||
|
class BulkUploadLettingsResumeController < ApplicationController |
||||||
|
before_action :authenticate_user! |
||||||
|
|
||||||
|
def start |
||||||
|
@bulk_upload = current_user.bulk_uploads.find(params[:id]) |
||||||
|
|
||||||
|
redirect_to page_bulk_upload_lettings_resume_path(@bulk_upload, page: "fix-choice") |
||||||
|
end |
||||||
|
|
||||||
|
def show |
||||||
|
@bulk_upload = current_user.bulk_uploads.find(params[:id]) |
||||||
|
|
||||||
|
render form.view_path |
||||||
|
end |
||||||
|
|
||||||
|
def update |
||||||
|
@bulk_upload = current_user.bulk_uploads.find(params[:id]) |
||||||
|
|
||||||
|
if form.valid? && form.save! |
||||||
|
redirect_to form.next_path |
||||||
|
else |
||||||
|
render form.view_path |
||||||
|
end |
||||||
|
end |
||||||
|
|
||||||
|
private |
||||||
|
|
||||||
|
def form |
||||||
|
@form ||= case params[:page] |
||||||
|
when "fix-choice" |
||||||
|
Forms::BulkUploadLettingsResume::FixChoice.new(form_params.merge(bulk_upload: @bulk_upload)) |
||||||
|
when "confirm" |
||||||
|
Forms::BulkUploadLettingsResume::Confirm.new(form_params.merge(bulk_upload: @bulk_upload)) |
||||||
|
else |
||||||
|
raise "invalid form" |
||||||
|
end |
||||||
|
end |
||||||
|
|
||||||
|
def form_params |
||||||
|
params.fetch(:form, {}).permit(:choice) |
||||||
|
end |
||||||
|
end |
||||||
@ -0,0 +1,30 @@ |
|||||||
|
module Forms |
||||||
|
module BulkUploadLettingsResume |
||||||
|
class Confirm |
||||||
|
include ActiveModel::Model |
||||||
|
include ActiveModel::Attributes |
||||||
|
include Rails.application.routes.url_helpers |
||||||
|
|
||||||
|
attribute :bulk_upload |
||||||
|
|
||||||
|
def view_path |
||||||
|
"bulk_upload_lettings_resume/confirm" |
||||||
|
end |
||||||
|
|
||||||
|
def back_path |
||||||
|
page_bulk_upload_lettings_resume_path(bulk_upload, page: "fix-choice") |
||||||
|
end |
||||||
|
|
||||||
|
def next_path |
||||||
|
resume_bulk_upload_lettings_result_path(bulk_upload) |
||||||
|
end |
||||||
|
|
||||||
|
def save! |
||||||
|
processor = BulkUpload::Processor.new(bulk_upload:) |
||||||
|
processor.approve |
||||||
|
|
||||||
|
true |
||||||
|
end |
||||||
|
end |
||||||
|
end |
||||||
|
end |
||||||
@ -0,0 +1,53 @@ |
|||||||
|
module Forms |
||||||
|
module BulkUploadLettingsResume |
||||||
|
class FixChoice |
||||||
|
include ActiveModel::Model |
||||||
|
include ActiveModel::Attributes |
||||||
|
include Rails.application.routes.url_helpers |
||||||
|
|
||||||
|
attribute :bulk_upload |
||||||
|
attribute :choice, :string |
||||||
|
|
||||||
|
validates :choice, presence: true, |
||||||
|
inclusion: { in: %w[create-fix-inline upload-again] } |
||||||
|
|
||||||
|
def options |
||||||
|
[ |
||||||
|
OpenStruct.new(id: "create-fix-inline", name: "Upload these logs and fix errors on CORE site"), |
||||||
|
OpenStruct.new(id: "upload-again", name: "Fix errors in the CSV and re-upload"), |
||||||
|
] |
||||||
|
end |
||||||
|
|
||||||
|
def view_path |
||||||
|
"bulk_upload_lettings_resume/fix_choice" |
||||||
|
end |
||||||
|
|
||||||
|
def next_path |
||||||
|
case choice |
||||||
|
when "create-fix-inline" |
||||||
|
page_bulk_upload_lettings_resume_path(bulk_upload, page: "confirm") |
||||||
|
when "upload-again" |
||||||
|
if BulkUploadErrorSummaryTableComponent.new(bulk_upload:).errors? |
||||||
|
summary_bulk_upload_lettings_result_path(bulk_upload) |
||||||
|
else |
||||||
|
bulk_upload_lettings_result_path(bulk_upload) |
||||||
|
end |
||||||
|
else |
||||||
|
raise "invalid choice" |
||||||
|
end |
||||||
|
end |
||||||
|
|
||||||
|
def recommendation |
||||||
|
if BulkUploadErrorSummaryTableComponent.new(bulk_upload:).errors? |
||||||
|
"For this many errors we recommend to fix errors in the CSV and re-upload as you may be able to edit many fields at once in a CSV." |
||||||
|
else |
||||||
|
"For this many errors we recommend to upload logs and fix errors on site as you can easily see the questions and select the appropriate answer." |
||||||
|
end |
||||||
|
end |
||||||
|
|
||||||
|
def save! |
||||||
|
true |
||||||
|
end |
||||||
|
end |
||||||
|
end |
||||||
|
end |
||||||
@ -0,0 +1,22 @@ |
|||||||
|
<% content_for :before_content do %> |
||||||
|
<%= govuk_back_link href: @form.back_path %> |
||||||
|
<% end %> |
||||||
|
|
||||||
|
<div class="govuk-grid-row"> |
||||||
|
<div class="govuk-grid-column-two-thirds"> |
||||||
|
<span class="govuk-caption-l">Bulk upload for lettings (<%= @bulk_upload.year_combo %>)</span> |
||||||
|
<h1 class="govuk-heading-l">Are you sure you want to upload all logs from this bulk upload?</h1> |
||||||
|
|
||||||
|
<p class="govuk-body">There are <%= pluralize(@bulk_upload.logs.count, "log") %> in this bulk upload with <%= pluralize(@bulk_upload.bulk_upload_errors.count, "error") %> that still need to be fixed after upload.</p> |
||||||
|
|
||||||
|
<%= govuk_warning_text(icon_fallback_text: "Danger") do %> |
||||||
|
You can not delete logs once you create them |
||||||
|
<% end %> |
||||||
|
|
||||||
|
<%= form_with model: @form, scope: :form, url: page_bulk_upload_lettings_resume_path(@bulk_upload, page: "confirm"), method: :patch do |f| %> |
||||||
|
<%= f.govuk_submit %> |
||||||
|
|
||||||
|
<%= govuk_button_link_to "Cancel", @form.back_path, secondary: true %> |
||||||
|
<% end %> |
||||||
|
</div> |
||||||
|
</div> |
||||||
@ -0,0 +1,36 @@ |
|||||||
|
<div class="govuk-grid-row"> |
||||||
|
<div class="govuk-grid-column-two-thirds"> |
||||||
|
<%= form_with model: @form, scope: :form, url: page_bulk_upload_lettings_resume_path(@bulk_upload, page: "fix-choice"), method: :patch do |f| %> |
||||||
|
<%= f.govuk_error_summary %> |
||||||
|
|
||||||
|
<span class="govuk-caption-l">Bulk upload for lettings (<%= @bulk_upload.year_combo %>)</span> |
||||||
|
<h1 class="govuk-heading-l">How would you like to fix <%= pluralize(@bulk_upload.bulk_upload_errors.count, "error") %>?</h1> |
||||||
|
|
||||||
|
<div class="govuk-body-l"> |
||||||
|
<%= @bulk_upload.filename %> |
||||||
|
</div> |
||||||
|
|
||||||
|
<div class="govuk-body"> |
||||||
|
<%= @form.recommendation %> |
||||||
|
</div> |
||||||
|
|
||||||
|
<%= govuk_details(summary_text: "How to choose between fixing errors on the CORE site or in the CSV") do %> |
||||||
|
<p class="govuk-body">When it comes to fixing errors, there are pros and cons to doing it on a CSV versus doing it on a website.</p> |
||||||
|
|
||||||
|
<p class="govuk-body">Fixing errors on a CSV file can be beneficial because it allows you to easily make changes to multiple records at once, and you can use tools like Excel to quickly identify and correct errors. However, if the CSV file is not properly formatted, it can be difficult to identify which records contain errors.</p> |
||||||
|
|
||||||
|
<p class="govuk-body">Fixing errors on a website can be convenient because you can see the data in context and make changes in real-time. However, this approach can be time-consuming if you need to make changes to multiple records, and it may be more difficult to identify errors in a large dataset.</p> |
||||||
|
|
||||||
|
<p class="govuk-body">Ultimately, the best approach will depend on the specific situation and the nature of the errors that need to be fixed.</p> |
||||||
|
<% end %> |
||||||
|
|
||||||
|
<%= f.govuk_collection_radio_buttons :choice, |
||||||
|
@form.options, |
||||||
|
:id, |
||||||
|
:name, |
||||||
|
legend: { hidden: true } %> |
||||||
|
|
||||||
|
<%= f.govuk_submit %> |
||||||
|
<% end %> |
||||||
|
</div> |
||||||
|
</div> |
||||||
@ -0,0 +1,5 @@ |
|||||||
|
class AddStatusCacheToLettingsLog < ActiveRecord::Migration[7.0] |
||||||
|
def change |
||||||
|
add_column :lettings_logs, :status_cache, :integer, null: false, default: 0 |
||||||
|
end |
||||||
|
end |
||||||
|
|
@ -0,0 +1,84 @@ |
|||||||
|
require "rails_helper" |
||||||
|
|
||||||
|
RSpec.describe BulkUploadLettingsResumeController, type: :request do |
||||||
|
let(:user) { create(:user) } |
||||||
|
let(:bulk_upload) { create(:bulk_upload, :lettings, user:, bulk_upload_errors:) } |
||||||
|
let(:bulk_upload_errors) { create_list(:bulk_upload_error, 2) } |
||||||
|
|
||||||
|
before do |
||||||
|
sign_in user |
||||||
|
end |
||||||
|
|
||||||
|
describe "GET /lettings-logs/bulk-upload-resume/:ID/start" do |
||||||
|
it "redirects to choice page" do |
||||||
|
get "/lettings-logs/bulk-upload-resume/#{bulk_upload.id}/start" |
||||||
|
|
||||||
|
expect(response).to redirect_to("/lettings-logs/bulk-upload-resume/#{bulk_upload.id}/fix-choice") |
||||||
|
end |
||||||
|
end |
||||||
|
|
||||||
|
describe "GET /lettings-logs/bulk-upload-resume/:ID/fix-choice" do |
||||||
|
it "renders the page correctly" do |
||||||
|
get "/lettings-logs/bulk-upload-resume/#{bulk_upload.id}/fix-choice" |
||||||
|
|
||||||
|
expect(response).to be_successful |
||||||
|
|
||||||
|
expect(response.body).to include("Bulk upload for lettings") |
||||||
|
expect(response.body).to include("2022/23") |
||||||
|
expect(response.body).to include("How would you like to fix 2 errors?") |
||||||
|
expect(response.body).to include(bulk_upload.filename) |
||||||
|
end |
||||||
|
end |
||||||
|
|
||||||
|
describe "PATCH /lettings-logs/bulk-upload-resume/:ID/fix-choice" do |
||||||
|
context "when no option selected" do |
||||||
|
it "renders error message" do |
||||||
|
patch "/lettings-logs/bulk-upload-resume/#{bulk_upload.id}/fix-choice" |
||||||
|
|
||||||
|
expect(response).to be_successful |
||||||
|
|
||||||
|
expect(response.body).to include("You must select") |
||||||
|
end |
||||||
|
end |
||||||
|
|
||||||
|
context "when upload again selected" do |
||||||
|
it "sends them to relevant report" do |
||||||
|
patch "/lettings-logs/bulk-upload-resume/#{bulk_upload.id}/fix-choice", params: { form: { choice: "upload-again" } } |
||||||
|
|
||||||
|
expect(response).to redirect_to("/lettings-logs/bulk-upload-results/#{bulk_upload.id}") |
||||||
|
end |
||||||
|
end |
||||||
|
|
||||||
|
context "when fix inline selected" do |
||||||
|
it "sends them to confirm choice" do |
||||||
|
patch "/lettings-logs/bulk-upload-resume/#{bulk_upload.id}/fix-choice", params: { form: { choice: "create-fix-inline" } } |
||||||
|
|
||||||
|
expect(response).to redirect_to("/lettings-logs/bulk-upload-resume/#{bulk_upload.id}/confirm") |
||||||
|
end |
||||||
|
end |
||||||
|
end |
||||||
|
|
||||||
|
describe "GET /lettings-logs/bulk-upload-resume/:ID/confirm" do |
||||||
|
it "renders page" do |
||||||
|
get "/lettings-logs/bulk-upload-resume/#{bulk_upload.id}/confirm" |
||||||
|
|
||||||
|
expect(response).to be_successful |
||||||
|
|
||||||
|
expect(response.body).to include("Are you sure") |
||||||
|
end |
||||||
|
end |
||||||
|
|
||||||
|
describe "PATCH /lettings-logs/bulk-upload-resume/:ID/confirm" do |
||||||
|
let(:mock_processor) { instance_double(BulkUpload::Processor, approve: nil) } |
||||||
|
|
||||||
|
it "approves logs for creation" do |
||||||
|
allow(BulkUpload::Processor).to receive(:new).with(bulk_upload:).and_return(mock_processor) |
||||||
|
|
||||||
|
patch "/lettings-logs/bulk-upload-resume/#{bulk_upload.id}/confirm" |
||||||
|
|
||||||
|
expect(mock_processor).to have_received(:approve) |
||||||
|
|
||||||
|
expect(response).to redirect_to("/lettings-logs/bulk-upload-results/#{bulk_upload.id}/resume") |
||||||
|
end |
||||||
|
end |
||||||
|
end |
||||||
Loading…
Reference in new issue