Updated database logging

access_controller/urls.py

@@ -16,7 +16,6 @@ Including another URLconf
 from django.contrib import admin
 from django.contrib.auth import views as auth_views
 from django.urls import path, include
-from main.views import work_page, work_hand_over, work_become_engineer, AdminPageView
 
 from main.views import main_page, profile_page, CustomRegistrationView, CustomLoginView
 from main.views import work_page, work_hand_over, work_become_engineer, \

main/extra_func.py

@@ -397,9 +397,13 @@ class DatabaseHandler(logging.Handler):
         user = record.msg
         # data = UserProfile.objects.filter(user=user.user)
         self.database.name = user.name
-        self.database.new_role = user.role
         self.database.user = user.user
         self.database.changed_by = user.user
+        if user.custom_role_id == ROLES['engineer']:
+            self.database.old_role = ROLES['light_agent']
+        elif user.custom_role_id == ROLES['light_agent']:
+            self.database.old_role = ROLES['engineer']
+        self.database.new_role = user.custom_role_id
         self.database.save()
 
 

main/migrations/0013_merge_20210315_1948.py

@@ -0,0 +1,14 @@
+# Generated by Django 3.1.6 on 2021-03-15 16:48
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('main', '0012_auto_20210312_1225'),
+        ('main', '0009_auto_20210309_2317'),
+    ]
+
+    operations = [
+    ]

main/migrations/0014_auto_20210315_1948.py

@@ -0,0 +1,29 @@
+# Generated by Django 3.1.6 on 2021-03-15 16:48
+
+from django.db import migrations, models
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('main', '0013_merge_20210315_1948'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='rolechangelogs',
+            name='change_time',
+            field=models.DateTimeField(default=django.utils.timezone.now, help_text='Дата и время изменения роли'),
+        ),
+        migrations.AlterField(
+            model_name='rolechangelogs',
+            name='new_role',
+            field=models.IntegerField(default=0, help_text='Присвоенная роль'),
+        ),
+        migrations.AlterField(
+            model_name='userprofile',
+            name='role',
+            field=models.CharField(default='None', help_text='Глобальное имя роли пользователя', max_length=100),
+        ),
+    ]