tenancy_code -> tenant_code

app/models/case_log.rb

@@ -52,12 +52,12 @@ class CaseLog < ApplicationRecord
                          }
 
   scope :filter_by_id, ->(id) { where(id:) }
-  scope :filter_by_tenancy_code, ->(code) { where(tenancy_code: code) }
+  scope :filter_by_tenant_code, ->(code) { where(tenant_code: code) }
   scope :filter_by_propcode, ->(code) { where(propcode: code) }
   scope :filter_by_postcode, ->(code) { where(postcode_full: code) }
   scope :search_by, lambda { |param|
                       filter_by_id(param)
-                                .or(filter_by_tenancy_code(param))
+                                .or(filter_by_tenant_code(param))
                                 .or(filter_by_propcode(param))
                                 .or(filter_by_postcode(param.upcase.gsub(/\s+/, "")))
                     }

app/views/case_logs/index.html.erb

@@ -1,9 +1,9 @@
 <% item_label = @pagy.count > 1 ? "logs" : "log" %>
 
 <% if @searched.present? %>
-  <% title = "Logs (search results for ‘#{@searched}’#{@pagy.count > 1 ? ", page #{@pagy.page} of #{@pagy.last}" : ''}) - Submit social housing and sales data (CORE) - GOV.UK" %>
+  <% title = "Logs (search results for ‘#{@searched}’#{@pagy.last > 1 ? ", page #{@pagy.page} of #{@pagy.last}" : ''}) - Submit social housing and sales data (CORE) - GOV.UK" %>
 <% else %>
-  <% title = "Logs #{@pagy.count > 1 ? "(page #{@pagy.page} of #{@pagy.last}) " : ''}- Submit social housing and sales data (CORE) - GOV.UK" %>
+  <% title = "Logs #{@pagy.last > 1 ? "(page #{@pagy.page} of #{@pagy.last}) " : ''}- Submit social housing and sales data (CORE) - GOV.UK" %>
 <% end %>
 
 <% content_for :title, title %>

spec/factories/case_log.rb

@@ -11,7 +11,7 @@ FactoryBot.define do
     end
     trait :in_progress do
       status { 1 }
-      tenant_code { "TH356" }
+      tenant_code { Faker::Alphanumeric.alphanumeric(number: 10) }
       postcode_full { Faker::Address.postcode }
       ppostcode_full { Faker::Address.postcode }
       age1 { 17 }
@@ -24,7 +24,7 @@ FactoryBot.define do
       incfreq { 1 }
     end
     trait :conditional_section_complete do
-      tenant_code { "TH356" }
+      tenant_code { Faker::Alphanumeric.alphanumeric(number: 10) }
       age1 { 34 }
       sex1 { "M" }
       ethnic { 2 }
@@ -34,7 +34,7 @@ FactoryBot.define do
     end
     trait :completed do
       status { 2 }
-      tenant_code { "BZ737" }
+      tenant_code { Faker::Alphanumeric.alphanumeric(number: 10) }
       age1 { 35 }
       sex1 { "F" }
       ethnic { 2 }

spec/models/case_log_spec.rb

@@ -1886,9 +1886,9 @@ RSpec.describe CaseLog do
         end
       end
 
-      describe "#filter_by_tenancy_code" do
-        it "allows searching by a Tenancy Code" do
-          result = described_class.filter_by_tenancy_code(case_log_to_search.tenancy_code)
+      describe "#filter_by_tenant_code" do
+        it "allows searching by a Tenant Code" do
+          result = described_class.filter_by_tenant_code(case_log_to_search.tenant_code)
           expect(result.count).to eq(1)
           expect(result.first.id).to eq case_log_to_search.id
         end
@@ -1918,7 +1918,7 @@ RSpec.describe CaseLog do
         end
 
         it "allows searching using tenancy code" do
-          result = described_class.search_by(case_log_to_search.tenancy_code)
+          result = described_class.search_by(case_log_to_search.tenant_code)
           expect(result.count).to eq(1)
           expect(result.first.id).to eq case_log_to_search.id
         end

spec/requests/case_logs_controller_spec.rb

@@ -336,8 +336,8 @@ RSpec.describe CaseLogsController, type: :request do
             end
           end
 
-          it "shows case logs matching the tenancy code" do
-            get "/logs?search=#{log_to_search.tenancy_code}", headers: headers, params: {}
+          it "shows case logs matching the tenant code" do
+            get "/logs?search=#{log_to_search.tenant_code}", headers: headers, params: {}
             expect(page).to have_content(log_to_search.id)
             logs.each do |log|
               expect(page).not_to have_content(log.id)

spec/services/exports/case_log_export_service_spec.rb

@@ -47,7 +47,7 @@ RSpec.describe Exports::CaseLogExportService do
     end
 
     context "and one case log is available for export" do
-      let!(:case_log) { FactoryBot.create(:case_log, :completed, tenancy_code: "BZ757", propcode: "123", ppostcode_full: "SE2 6RT", postcode_full: "NW1 5TY") }
+      let!(:case_log) { FactoryBot.create(:case_log, :completed, tenancy_code: "BZ757", propcode: "123", ppostcode_full: "SE2 6RT", postcode_full: "NW1 5TY", tenant_code: "BZ737") }
       let(:expected_data_filename) { "core_2021_2022_jan_mar_f0001_inc0001_pt001.xml" }
 
       it "generates a ZIP export file with the expected filename" do
@@ -226,7 +226,7 @@ RSpec.describe Exports::CaseLogExportService do
     let(:csv_export_file) { File.open("spec/fixtures/exports/case_logs.csv", "r:UTF-8") }
     let(:expected_csv_filename) { "export_2022_05_01.csv" }
 
-    let(:case_log) { FactoryBot.create(:case_log, :completed, tenancy_code: "BZ757", propcode: "123", ppostcode_full: "SE2 6RT", postcode_full: "NW1 5TY") }
+    let(:case_log) { FactoryBot.create(:case_log, :completed, tenancy_code: "BZ757", propcode: "123", ppostcode_full: "SE2 6RT", postcode_full: "NW1 5TY", tenant_code: "BZ737") }
 
     it "generates an CSV export file with the expected content" do
       expected_content = replace_entity_ids(case_log, csv_export_file.read)