From 94ed1c6aae34b2249bf51f5d5cbe0339d1581e4a Mon Sep 17 00:00:00 2001
From: kiddhustle <kiddhustle@wiardweb.com>
Date: Mon, 14 Mar 2022 15:29:17 +0000
Subject: [PATCH] CLDC-1050: re-add ethnic question

CLDC-1050: revert schema change
---
 config/forms/2021_2022.json | 20 ++++++++++----------
 db/schema.rb                |  1 -
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/config/forms/2021_2022.json b/config/forms/2021_2022.json
index c8e288eaa..04541db6d 100644
--- a/config/forms/2021_2022.json
+++ b/config/forms/2021_2022.json
@@ -1284,7 +1284,7 @@
                   },
                   "conditional_for": {
                     "ethnic_other": [
-                      "Other ethnic group"
+                      1
                     ]
                   }
                 },
@@ -1296,7 +1296,7 @@
               },
               "depends_on": [
                 {
-                  "ethnic_group": "Other ethnic group"
+                  "ethnic_group": 4
                 }
               ]
             },
@@ -1328,7 +1328,7 @@
                   },
                   "conditional_for": {
                     "ethnic_other": [
-                      "Other ethnic group"
+                      4
                     ]
                   }
                 },
@@ -1340,7 +1340,7 @@
               },
               "depends_on": [
                 {
-                  "ethnic_group": "Asian or Asian British"
+                  "ethnic_group": 2
                 }
               ]
             },
@@ -1366,7 +1366,7 @@
                   },
                   "conditional_for": {
                     "ethnic_other": [
-                      "Any other Black, African or Caribbean background"
+                      2
                     ]
                   }
                 },
@@ -1378,7 +1378,7 @@
               },
               "depends_on": [
                 {
-                  "ethnic_group": "Black, African, Caribbean or Black British"
+                  "ethnic_group": 3
                 }
               ]
             },
@@ -1404,7 +1404,7 @@
                   },
                   "conditional_for": {
                     "tenant_ethnic_group_mixed_other": [
-                      "Any other Mixed or Multiple ethnic background"
+                      2
                     ]
                   }
                 },
@@ -1416,7 +1416,7 @@
               },
               "depends_on": [
                 {
-                  "ethnic_group": "Mixed or Multiple ethnic groups"
+                  "ethnic_group": 1
                 }
               ]
             },
@@ -1445,7 +1445,7 @@
                   },
                   "conditional_for": {
                     "tenant_ethnic_group_white_other": [
-                      "Any other White background"
+                      3
                     ]
                   }
                 },
@@ -1457,7 +1457,7 @@
               },
               "depends_on": [
                 {
-                  "ethnic": "White"
+                  "ethnic": 0
                 }
               ]
             },
diff --git a/db/schema.rb b/db/schema.rb
index e28e022c4..e0325a683 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -284,7 +284,6 @@ ActiveRecord::Schema[7.0].define(version: 202202071123100) do
     t.integer "failed_attempts", default: 0
     t.string "unlock_token"
     t.datetime "locked_at", precision: nil
-    t.string "phone"
     t.index ["email"], name: "index_users_on_email", unique: true
     t.index ["organisation_id"], name: "index_users_on_organisation_id"
     t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true