From d23e680d3e040767923e2355393e763d2b55296a Mon Sep 17 00:00:00 2001
From: Michael Olund <michaelo@openroad.ca>
Date: Fri, 16 Oct 2020 10:03:33 -0700
Subject: [PATCH] Fixed migration errors

---
 ...iduser_is_bcsc.py => 0020_bceiduser_is_bcsc.py} |  6 ++++--
 .../core/migrations/0024_auto_20201009_1235.py     | 12 ++----------
 .../core/migrations/0025_merge_20201016_1006.py    | 14 ++++++++++++++
 3 files changed, 20 insertions(+), 12 deletions(-)
 rename edivorce/apps/core/migrations/{0024_bceiduser_is_bcsc.py => 0020_bceiduser_is_bcsc.py} (64%)
 create mode 100644 edivorce/apps/core/migrations/0025_merge_20201016_1006.py

diff --git a/edivorce/apps/core/migrations/0024_bceiduser_is_bcsc.py b/edivorce/apps/core/migrations/0020_bceiduser_is_bcsc.py
similarity index 64%
rename from edivorce/apps/core/migrations/0024_bceiduser_is_bcsc.py
rename to edivorce/apps/core/migrations/0020_bceiduser_is_bcsc.py
index 2fb076d8..3c4f853b 100644
--- a/edivorce/apps/core/migrations/0024_bceiduser_is_bcsc.py
+++ b/edivorce/apps/core/migrations/0020_bceiduser_is_bcsc.py
@@ -1,4 +1,6 @@
-# Generated by Django 2.2.15 on 2020-10-09 13:15
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.29 on 2020-10-15 17:38
+from __future__ import unicode_literals
 
 from django.db import migrations, models
 
@@ -6,7 +8,7 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('core', '0024_auto_20201009_1235'),
+        ('core', '0019_auto_20191008_2141'),
     ]
 
     operations = [
diff --git a/edivorce/apps/core/migrations/0024_auto_20201009_1235.py b/edivorce/apps/core/migrations/0024_auto_20201009_1235.py
index ec37da5d..58042a77 100644
--- a/edivorce/apps/core/migrations/0024_auto_20201009_1235.py
+++ b/edivorce/apps/core/migrations/0024_auto_20201009_1235.py
@@ -9,16 +9,8 @@ import django.utils.timezone
 def set_username(apps, schema_editor):
     Series = apps.get_model('core', 'bceiduser')
     for series in Series.objects.all().iterator():
-        if series.sm_user:
-            series.username = series.sm_user
-        else:
-            series.username = 'user' + str(series.id)
-
-        try:
-            series.save()
-        except:
-            series.username = 'user' + str(series.id)
-            series.save()
+        series.username = 'user' + str(series.id)
+        series.save()
 
 
 def reverse_func(apps, schema_editor):
diff --git a/edivorce/apps/core/migrations/0025_merge_20201016_1006.py b/edivorce/apps/core/migrations/0025_merge_20201016_1006.py
new file mode 100644
index 00000000..dd299673
--- /dev/null
+++ b/edivorce/apps/core/migrations/0025_merge_20201016_1006.py
@@ -0,0 +1,14 @@
+# Generated by Django 2.2.15 on 2020-10-16 17:06
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0024_auto_20201009_1235'),
+        ('core', '0020_bceiduser_is_bcsc'),
+    ]
+
+    operations = [
+    ]