Browse Source

Fix postcode duplication

pull/40/head
baarkerlounger 4 years ago
parent
commit
77624c5a5b
  1. 2
      app/views/case_logs/_log_list.html.erb
  2. 1
      db/migrate/20211011115946_rename_economic_status_fields.rb
  3. 3
      db/schema.rb
  4. 4
      spec/factories/case_log.rb
  5. 2
      spec/helpers/tasklist_helper_spec.rb
  6. 4
      spec/views/case_log_index_view_spec.rb

2
app/views/case_logs/_log_list.html.erb

@ -15,7 +15,7 @@
<%= link_to log.id, case_log_path(log) %> <%= link_to log.id, case_log_path(log) %>
</th> </th>
<td class="govuk-table__cell govuk-table__cell"> <td class="govuk-table__cell govuk-table__cell">
<%= log.postcode %> <%= log.property_postcode %>
</td> </td>
<td class="govuk-table__cell govuk-table__cell"> <td class="govuk-table__cell govuk-table__cell">
<%= log.tenant_code %> <%= log.tenant_code %>

1
db/migrate/20211011115946_rename_economic_status_fields.rb

@ -8,6 +8,7 @@ class RenameEconomicStatusFields < ActiveRecord::Migration[6.1]
t.rename :person_6_economic, :person_6_economic_status t.rename :person_6_economic, :person_6_economic_status
t.rename :person_7_economic, :person_7_economic_status t.rename :person_7_economic, :person_7_economic_status
t.rename :person_8_economic, :person_8_economic_status t.rename :person_8_economic, :person_8_economic_status
t.rename :postcode, :property_postcode
end end
end end
end end

3
db/schema.rb

@ -27,7 +27,6 @@ ActiveRecord::Schema.define(version: 2021_10_11_115946) do
t.string "previous_housing_situation" t.string "previous_housing_situation"
t.integer "prior_homelessness" t.integer "prior_homelessness"
t.string "armed_forces" t.string "armed_forces"
t.string "postcode"
t.string "tenant_economic_status" t.string "tenant_economic_status"
t.integer "household_number_of_other_members" t.integer "household_number_of_other_members"
t.string "person_2_relationship" t.string "person_2_relationship"
@ -102,7 +101,6 @@ ActiveRecord::Schema.define(version: 2021_10_11_115946) do
t.string "time_lived_in_la" t.string "time_lived_in_la"
t.string "time_on_la_waiting_list" t.string "time_on_la_waiting_list"
t.string "previous_la" t.string "previous_la"
t.string "property_postcode"
t.string "reasonable_preference" t.string "reasonable_preference"
t.string "reasonable_preference_reason" t.string "reasonable_preference_reason"
t.string "cbl_letting" t.string "cbl_letting"
@ -132,6 +130,7 @@ ActiveRecord::Schema.define(version: 2021_10_11_115946) do
t.boolean "reasonable_preference_reason_medical_grounds" t.boolean "reasonable_preference_reason_medical_grounds"
t.boolean "reasonable_preference_reason_avoid_hardship" t.boolean "reasonable_preference_reason_avoid_hardship"
t.boolean "reasonable_preference_reason_do_not_know" t.boolean "reasonable_preference_reason_do_not_know"
t.string "property_postcode"
end end
end end

4
spec/factories/case_log.rb

@ -4,14 +4,14 @@ FactoryBot.define do
trait :in_progress do trait :in_progress do
status { 0 } status { 0 }
tenant_code { "TH356" } tenant_code { "TH356" }
postcode { "SW2 6HI" } property_postcode { "SW2 6HI" }
previous_postcode { "P0 5ST" } previous_postcode { "P0 5ST" }
tenant_age { "12" } tenant_age { "12" }
end end
trait :submitted do trait :submitted do
status { 1 } status { 1 }
tenant_code { "BZ737" } tenant_code { "BZ737" }
postcode { "NW1 7TY" } property_postcode { "NW1 7TY" }
end end
created_at { Time.zone.now } created_at { Time.zone.now }
updated_at { Time.zone.now } updated_at { Time.zone.now }

2
spec/helpers/tasklist_helper_spec.rb

@ -73,7 +73,7 @@ RSpec.describe TasklistHelper do
it "returns the number of sections in progress" do it "returns the number of sections in progress" do
@form = Form.new(2021, 2022) @form = Form.new(2021, 2022)
expect(get_sections_count(@form, case_log, :in_progress)).to eq(2) expect(get_sections_count(@form, case_log, :in_progress)).to eq(3)
end end
it "returns 0 for invalid state" do it "returns 0 for invalid state" do

4
spec/views/case_log_index_view_spec.rb

@ -12,7 +12,7 @@ RSpec.describe "case_logs/index" do
expect(rendered).to match(/Logs you need to complete/) expect(rendered).to match(/Logs you need to complete/)
expect(rendered).not_to match(/Logs you&#39;ve submitted/) expect(rendered).not_to match(/Logs you&#39;ve submitted/)
expect(rendered).to match(in_progress_log.tenant_code) expect(rendered).to match(in_progress_log.tenant_code)
expect(rendered).to match(in_progress_log.postcode) expect(rendered).to match(in_progress_log.property_postcode)
end end
end end
@ -25,7 +25,7 @@ RSpec.describe "case_logs/index" do
expect(rendered).to match(/Logs you&#39;ve submitted/) expect(rendered).to match(/Logs you&#39;ve submitted/)
expect(rendered).not_to match(/Logs you need to complete/) expect(rendered).not_to match(/Logs you need to complete/)
expect(rendered).to match(submitted_log.tenant_code) expect(rendered).to match(submitted_log.tenant_code)
expect(rendered).to match(submitted_log.postcode) expect(rendered).to match(submitted_log.property_postcode)
end end
end end

Loading…
Cancel
Save