From c418ecf0e41887b51648891c44f8b16082e248bb Mon Sep 17 00:00:00 2001
From: Fredrik Jonsson <frjo@xdeb.org>
Date: Wed, 24 Oct 2018 18:28:17 +0200
Subject: [PATCH] Address field no longer requeried so remove fake address.
 Remove non existing groups-role from mapping in user migration.

---
 opentech/apply/funds/management/commands/migration_base.py | 3 ---
 opentech/apply/users/management/commands/migrate_users.py  | 1 -
 2 files changed, 4 deletions(-)

diff --git a/opentech/apply/funds/management/commands/migration_base.py b/opentech/apply/funds/management/commands/migration_base.py
index 547f8b205..310140dbc 100644
--- a/opentech/apply/funds/management/commands/migration_base.py
+++ b/opentech/apply/funds/management/commands/migration_base.py
@@ -140,9 +140,6 @@ class MigrateCommand(BaseCommand):
             else:
                 form_data["email"] = f"user+{node['uid']}@example.com"
 
-        if "address" not in form_data or not form_data["address"]:
-            form_data["address"] = json.dumps({"country": "GB", "thoroughfare": "This is not a real address!", "premise": "", "localityname": "London", "administrativearea": "", "postalcode": "123"})
-
         submission.form_data = form_data
 
         try:
diff --git a/opentech/apply/users/management/commands/migrate_users.py b/opentech/apply/users/management/commands/migrate_users.py
index c09e7eb67..dd78952ac 100644
--- a/opentech/apply/users/management/commands/migrate_users.py
+++ b/opentech/apply/users/management/commands/migrate_users.py
@@ -75,7 +75,6 @@ class Command(BaseCommand):
         groups = []
         role_map = {
             'council': 'Reviewer',
-            'administrator': 'Editors',
         }
 
         if self.is_staff(user['mail']):
-- 
GitLab