Fix up fields

app/constants/db_enums.rb

@@ -22,7 +22,7 @@ module DbEnums
   def self.builtype
     {
       "Purpose built" => 1,
-      "Conversion" => 2
+      "Conversion" => 2,
     }
   end
 

app/models/bulk_upload.rb

@@ -159,7 +159,7 @@ class BulkUpload
       # property_reference: row[100],
       beds: row[101],
       unittype_gn: row[102],
-      property_building_type: row[103],
+      builtype: row[103],
       wchair: row[104],
       property_relet: row[105],
       rsnvac: row[106],

app/models/case_log.rb

@@ -112,9 +112,11 @@ class CaseLog < ApplicationRecord
   enum armedforces: DbEnums.armed_forces, _suffix: true
   enum first_time_property_let_as_social_housing: DbEnums.polar, _suffix: true
   enum unitletas: DbEnums.unitletas, _suffix: true
+  enum builtype: DbEnums.builtype, _suffix: true
 
   AUTOGENERATED_FIELDS = %w[id status created_at updated_at discarded_at].freeze
-  OPTIONAL_FIELDS = %w[do_you_know_the_postcode do_you_know_the_local_authority
+  OPTIONAL_FIELDS = %w[do_you_know_the_postcode
+                       do_you_know_the_local_authority
                        first_time_property_let_as_social_housing].freeze
 
   def self.editable_fields

db/migrate/20211124174732_remove_old_fields.rb

@@ -0,0 +1,9 @@
+class RemoveOldFields < ActiveRecord::Migration[6.1]
+  def up
+    remove_column :case_logs, :property_building_type
+  end
+
+  def down
+    add_column :case_logs, :property_building_type, :string
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2021_11_24_152204) do
+ActiveRecord::Schema.define(version: 2021_11_24_174732) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -82,7 +82,6 @@ ActiveRecord::Schema.define(version: 2021_11_24_152204) do
     t.string "previous_postcode"
     t.integer "rsnvac"
     t.integer "unittype_gn"
-    t.string "property_building_type"
     t.integer "beds"
     t.string "property_void_date"
     t.integer "offered"

spec/factories/case_log.rb

@@ -56,7 +56,6 @@ FactoryBot.define do
       previous_postcode { "SE2 6RT" }
       rsnvac { "Tenant abandoned property" }
       unittype_gn { "House" }
-      property_building_type { "dummy" }
       beds { 3 }
       property_void_date { "03/11/2019" }
       offered { 2 }