From 5665282ce5619076a844e048e8ad32f2455c317c Mon Sep 17 00:00:00 2001
From: Artyom Kravchenko <krav-88@mail.ru>
Date: Fri, 12 Mar 2021 12:34:45 +0300
Subject: [PATCH] fixed UserProfile model

---
 main/extra_func.py                         |  3 ++-
 main/migrations/0012_auto_20210312_1225.py | 23 ++++++++++++++++++++++
 main/models.py                             |  3 ++-
 3 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 main/migrations/0012_auto_20210312_1225.py

diff --git a/main/extra_func.py b/main/extra_func.py
index b76eb55..ada4a88 100644
--- a/main/extra_func.py
+++ b/main/extra_func.py
@@ -156,7 +156,8 @@ def update_profile(user_profile: UserProfile) -> UserProfile:
     """
     user = ZendeskAdmin().get_user(user_profile.user.email)
     user_profile.name = user.name
-    user_profile.role = user.custom_role_id if user.custom_role_id else 0
+    user_profile.role = user.role
+    user_profile.custom_role_id = user.custom_role_id if user.custom_role_id else 0
     user_profile.image = user.photo['content_url'] if user.photo else None
     user_profile.save()
 
diff --git a/main/migrations/0012_auto_20210312_1225.py b/main/migrations/0012_auto_20210312_1225.py
new file mode 100644
index 0000000..6d33580
--- /dev/null
+++ b/main/migrations/0012_auto_20210312_1225.py
@@ -0,0 +1,23 @@
+# Generated by Django 3.1.6 on 2021-03-12 09:25
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('main', '0011_auto_20210311_1734'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='userprofile',
+            name='custom_role_id',
+            field=models.IntegerField(default=0, help_text='Код роли пользователя'),
+        ),
+        migrations.AlterField(
+            model_name='userprofile',
+            name='role',
+            field=models.CharField(default='None', help_text='Глобальное имя роли пользователя', max_length=100),
+        ),
+    ]
diff --git a/main/models.py b/main/models.py
index 95d38f2..112e29e 100644
--- a/main/models.py
+++ b/main/models.py
@@ -13,7 +13,8 @@ class UserProfile(models.Model):
         )
 
     user = models.OneToOneField(to=User, on_delete=models.CASCADE, help_text='Пользователь')
-    role = models.IntegerField(default=0, help_text='Код роли пользователя')
+    role = models.CharField(default='None', max_length=100, help_text='Глобальное имя роли пользователя')
+    custom_role_id = models.IntegerField(default=0, help_text='Код роли пользователя')
     image = models.URLField(null=True, blank=True, help_text='Аватарка')
     name = models.CharField(default='None', max_length=100, help_text='Имя пользователя на нашем сайте')