From 5893fce7a1cc9af7847a9d20fe1c562d3baebd6d Mon Sep 17 00:00:00 2001
From: Kat <katrina@kosiak.co.uk>
Date: Wed, 8 Mar 2023 12:05:48 +0000
Subject: [PATCH] Update field name and required fields

---
 app/services/imports/local_authorities_service.rb           | 2 +-
 config/local_authorities_data/initial_local_authorities.csv | 2 +-
 db/migrate/20230308101826_create_local_authorities.rb       | 6 +++---
 db/schema.rb                                                | 6 +++---
 spec/fixtures/files/local_authorities.csv                   | 2 +-
 spec/lib/tasks/local_authorities_import_spec.rb             | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/services/imports/local_authorities_service.rb b/app/services/imports/local_authorities_service.rb
index f2573ac10..93365fd30 100644
--- a/app/services/imports/local_authorities_service.rb
+++ b/app/services/imports/local_authorities_service.rb
@@ -13,7 +13,7 @@ module Imports
       CSV.foreach(path, headers: true) do |row|
         LocalAuthority.upsert(
           { code: row["code"],
-            la_name: row["la_name"],
+            name: row["name"],
             start_date: Time.zone.local(row["start_year"], 4, 1),
             end_date: (Time.zone.local(row["end_year"], 3, 31) if row["end_year"]),
             previous_location_only: row["previous_location_only"] || false },
diff --git a/config/local_authorities_data/initial_local_authorities.csv b/config/local_authorities_data/initial_local_authorities.csv
index 0fa158c5c..829cde25e 100644
--- a/config/local_authorities_data/initial_local_authorities.csv
+++ b/config/local_authorities_data/initial_local_authorities.csv
@@ -1,4 +1,4 @@
-code,la_name,start_year,end_year,previous_location_only
+code,name,start_year,end_year,previous_location_only
 S12000033,Aberdeen City,2021,,true
 S12000034,Aberdeenshire,2021,,true
 E07000223,Adur,2021,,
diff --git a/db/migrate/20230308101826_create_local_authorities.rb b/db/migrate/20230308101826_create_local_authorities.rb
index 0004a25da..60c67b6fa 100644
--- a/db/migrate/20230308101826_create_local_authorities.rb
+++ b/db/migrate/20230308101826_create_local_authorities.rb
@@ -1,9 +1,9 @@
 class CreateLocalAuthorities < ActiveRecord::Migration[7.0]
   def change
     create_table :local_authorities do |t|
-      t.string :code
-      t.string :la_name
-      t.datetime :start_date
+      t.string :code, null: false
+      t.string :name, null: false
+      t.datetime :start_date, null: false
       t.datetime :end_date
       t.boolean :previous_location_only, default: false
       t.index %w[code], name: "index_local_authority_code", unique: true
diff --git a/db/schema.rb b/db/schema.rb
index e7c534738..3b96bb62a 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -290,9 +290,9 @@ ActiveRecord::Schema[7.0].define(version: 2023_03_08_101826) do
   end
 
   create_table "local_authorities", force: :cascade do |t|
-    t.string "code"
-    t.string "la_name"
-    t.datetime "start_date"
+    t.string "code", null: false
+    t.string "name", null: false
+    t.datetime "start_date", null: false
     t.datetime "end_date"
     t.boolean "previous_location_only", default: false
     t.datetime "created_at", null: false
diff --git a/spec/fixtures/files/local_authorities.csv b/spec/fixtures/files/local_authorities.csv
index 93cdd5170..e96485ca1 100644
--- a/spec/fixtures/files/local_authorities.csv
+++ b/spec/fixtures/files/local_authorities.csv
@@ -1,4 +1,4 @@
-code,la_name,start_year,end_year,previous_location_only
+code,name,start_year,end_year,previous_location_only
 S12000033,Aberdeen City,2021,,true
 S12000034,Aberdeenshire,2021,,true
 E07000223,Adur,2021,,
diff --git a/spec/lib/tasks/local_authorities_import_spec.rb b/spec/lib/tasks/local_authorities_import_spec.rb
index beef36605..205b1b529 100644
--- a/spec/lib/tasks/local_authorities_import_spec.rb
+++ b/spec/lib/tasks/local_authorities_import_spec.rb
@@ -29,7 +29,7 @@ RSpec.describe "data_import" do
       end
 
       context "when a record already exists with a matching code index" do
-        let!(:local_authority) { LocalAuthority.create(code: "S12000041", la_name: "Angus", start_date: Time.zone.local(2021, 4, 1), previous_location_only: false) }
+        let!(:local_authority) { LocalAuthority.create(code: "S12000041", name: "Angus", start_date: Time.zone.local(2021, 4, 1), previous_location_only: false) }
 
         it "updates local authority if the record is matched on code" do
           task.invoke(local_authorities_file_path)