Browse Source
# Conflicts: # app/models/form/sales/subsections/shared_ownership_scheme.rb # app/models/sales_log.rb # app/models/validations/sales/soft_validations.rb # db/schema.rb # spec/models/form/sales/subsections/shared_ownership_scheme_spec.rb # spec/models/form_handler_spec.rbpull/1225/head
natdeanlewissoftwire
3 years ago
44 changed files with 813 additions and 80 deletions
@ -0,0 +1,27 @@
|
||||
class Form::Sales::Pages::SharedOwnershipDepositValueCheck < ::Form::Page |
||||
def initialize(id, hsh, subsection) |
||||
super |
||||
@depends_on = [ |
||||
{ |
||||
"shared_ownership_deposit_invalid?" => true, |
||||
}, |
||||
] |
||||
@informative_text = {} |
||||
@title_text = { |
||||
"translation" => "soft_validations.shared_owhership_deposit.title_text", |
||||
"arguments" => [ |
||||
{ |
||||
"key" => "expected_shared_ownership_deposit_value", |
||||
"label" => false, |
||||
"i18n_template" => "expected_shared_ownership_deposit_value", |
||||
}, |
||||
], |
||||
} |
||||
end |
||||
|
||||
def questions |
||||
@questions ||= [ |
||||
Form::Sales::Questions::SharedOwnershipDepositValueCheck.new(nil, nil, self), |
||||
] |
||||
end |
||||
end |
||||
@ -0,0 +1,23 @@
|
||||
class Form::Sales::Questions::SharedOwnershipDepositValueCheck < ::Form::Question |
||||
def initialize(id, hsh, page) |
||||
super |
||||
@id = "shared_ownership_deposit_value_check" |
||||
@check_answer_label = "Shared ownership deposit confirmation" |
||||
@type = "interruption_screen" |
||||
@header = "Are you sure this is correct?" |
||||
@answer_options = { |
||||
"0" => { "value" => "Yes" }, |
||||
"1" => { "value" => "No" }, |
||||
} |
||||
@hidden_in_check_answers = { |
||||
"depends_on" => [ |
||||
{ |
||||
"shared_ownership_deposit_value_check" => 0, |
||||
}, |
||||
{ |
||||
"shared_ownership_deposit_value_check" => 1, |
||||
}, |
||||
], |
||||
} |
||||
end |
||||
end |
||||
@ -0,0 +1,11 @@
|
||||
<div class="govuk-grid-row"> |
||||
<div class="govuk-grid-column-two-thirds"> |
||||
<h1 class="govuk-heading-xl">There are no more logs that need updating</h1> |
||||
</div> |
||||
</div> |
||||
|
||||
<p class="govuk-body-l"> |
||||
You’ve completed all the logs that had errors from your bulk upload. |
||||
</p> |
||||
|
||||
<%= govuk_button_link_to "Back to all logs", lettings_logs_path, button: true %> |
||||
@ -0,0 +1,7 @@
|
||||
class AddSharedOwnershipDepositValueCheck < ActiveRecord::Migration[7.0] |
||||
def change |
||||
change_table :sales_logs, bulk: true do |t| |
||||
t.column :shared_ownership_deposit_value_check, :integer |
||||
end |
||||
end |
||||
end |
||||
@ -0,0 +1,5 @@
|
||||
class AddColumnToBulkUploadErrors < ActiveRecord::Migration[7.0] |
||||
def change |
||||
add_column :bulk_upload_errors, :col, :text |
||||
end |
||||
end |
||||
@ -0,0 +1,68 @@
|
||||
require "rails_helper" |
||||
|
||||
RSpec.describe BulkUploadLettingsResultsController do |
||||
before do |
||||
sign_in user |
||||
end |
||||
|
||||
describe "GET #resume /lettings-logs/bulk-upload-results/:ID/resume" do |
||||
let(:user) { create(:user) } |
||||
let(:bulk_upload) { create(:bulk_upload, :lettings, user:) } |
||||
|
||||
context "when there are no logs left to resolve" do |
||||
render_views |
||||
|
||||
it "displays copy to user" do |
||||
get :resume, params: { id: bulk_upload.id } |
||||
|
||||
expect(response.body).to include("There are no more logs that need updating") |
||||
end |
||||
|
||||
it "resets logs filters" do |
||||
get :resume, params: { id: bulk_upload.id } |
||||
|
||||
expect(JSON.parse(session["logs_filters"])).to eql({}) |
||||
end |
||||
end |
||||
|
||||
context "when there are logs left to resolve" do |
||||
before do |
||||
create(:lettings_log, :in_progress, bulk_upload:) |
||||
end |
||||
|
||||
it "clears the year filter" do |
||||
hash = { |
||||
years: ["", "2022"], |
||||
} |
||||
|
||||
session["logs_filters"] = hash.to_json |
||||
|
||||
get :resume, params: { id: bulk_upload.id } |
||||
|
||||
expect(JSON.parse(session["logs_filters"])["years"]).to eql([""]) |
||||
end |
||||
|
||||
it "sets the status filter to in progress" do |
||||
session["logs_filters"] ||= {}.to_json |
||||
|
||||
get :resume, params: { id: bulk_upload.id } |
||||
|
||||
expect(JSON.parse(session["logs_filters"])["status"]).to eql(["", "in_progress"]) |
||||
end |
||||
|
||||
it "sets the user filter to all" do |
||||
session["logs_filters"] ||= {}.to_json |
||||
|
||||
get :resume, params: { id: bulk_upload.id } |
||||
|
||||
expect(JSON.parse(session["logs_filters"])["user"]).to eql("all") |
||||
end |
||||
|
||||
it "redirects to logs with bulk upload filter applied" do |
||||
get :resume, params: { id: bulk_upload.id } |
||||
|
||||
expect(response).to redirect_to("/lettings-logs?bulk_upload_id%5B%5D=#{bulk_upload.id}") |
||||
end |
||||
end |
||||
end |
||||
end |
||||
@ -0,0 +1,50 @@
|
||||
require "rails_helper" |
||||
|
||||
RSpec.describe Form::Sales::Pages::SharedOwnershipDepositValueCheck, type: :model do |
||||
subject(:page) { described_class.new(page_id, page_definition, subsection) } |
||||
|
||||
let(:page_id) { "shared_ownership_deposit_value_check" } |
||||
let(:page_definition) { nil } |
||||
let(:subsection) { instance_double(Form::Subsection) } |
||||
|
||||
it "has correct subsection" do |
||||
expect(page.subsection).to eq(subsection) |
||||
end |
||||
|
||||
it "has correct questions" do |
||||
expect(page.questions.map(&:id)).to eq(%w[shared_ownership_deposit_value_check]) |
||||
end |
||||
|
||||
it "has the correct id" do |
||||
expect(page.id).to eq("shared_ownership_deposit_value_check") |
||||
end |
||||
|
||||
it "has the correct header" do |
||||
expect(page.header).to be_nil |
||||
end |
||||
|
||||
it "has correct depends_on" do |
||||
expect(page.depends_on).to eq([ |
||||
{ |
||||
"shared_ownership_deposit_invalid?" => true, |
||||
}, |
||||
]) |
||||
end |
||||
|
||||
it "has the correct title_text" do |
||||
expect(page.title_text).to eq({ |
||||
"translation" => "soft_validations.shared_owhership_deposit.title_text", |
||||
"arguments" => [ |
||||
{ |
||||
"key" => "expected_shared_ownership_deposit_value", |
||||
"label" => false, |
||||
"i18n_template" => "expected_shared_ownership_deposit_value", |
||||
}, |
||||
], |
||||
}) |
||||
end |
||||
|
||||
it "has the correct informative_text" do |
||||
expect(page.informative_text).to eq({}) |
||||
end |
||||
end |
||||
@ -0,0 +1,61 @@
|
||||
require "rails_helper" |
||||
|
||||
RSpec.describe Form::Sales::Questions::SharedOwnershipDepositValueCheck, type: :model do |
||||
subject(:question) { described_class.new(question_id, question_definition, page) } |
||||
|
||||
let(:question_id) { nil } |
||||
let(:question_definition) { nil } |
||||
let(:page) { instance_double(Form::Page) } |
||||
|
||||
it "has correct page" do |
||||
expect(question.page).to eq(page) |
||||
end |
||||
|
||||
it "has the correct id" do |
||||
expect(question.id).to eq("shared_ownership_deposit_value_check") |
||||
end |
||||
|
||||
it "has the correct header" do |
||||
expect(question.header).to eq("Are you sure this is correct?") |
||||
end |
||||
|
||||
it "has the correct check_answer_label" do |
||||
expect(question.check_answer_label).to eq("Shared ownership deposit confirmation") |
||||
end |
||||
|
||||
it "has the correct type" do |
||||
expect(question.type).to eq("interruption_screen") |
||||
end |
||||
|
||||
it "is not marked as derived" do |
||||
expect(question.derived?).to be false |
||||
end |
||||
|
||||
it "has the correct hint" do |
||||
expect(question.hint_text).to be_nil |
||||
end |
||||
|
||||
# it "has a correct check_answers_card_number" do |
||||
# expect(question.check_answers_card_number).to eq(0) |
||||
# end |
||||
|
||||
it "has the correct answer_options" do |
||||
expect(question.answer_options).to eq({ |
||||
"0" => { "value" => "Yes" }, |
||||
"1" => { "value" => "No" }, |
||||
}) |
||||
end |
||||
|
||||
it "has the correct hidden_in_check_answers" do |
||||
expect(question.hidden_in_check_answers).to eq({ |
||||
"depends_on" => [ |
||||
{ |
||||
"shared_ownership_deposit_value_check" => 0, |
||||
}, |
||||
{ |
||||
"shared_ownership_deposit_value_check" => 1, |
||||
}, |
||||
], |
||||
}) |
||||
end |
||||
end |
||||
Loading…
Reference in new issue