diff --git a/access_controller/settings.py b/access_controller/settings.py index 3465039..a534ac9 100644 --- a/access_controller/settings.py +++ b/access_controller/settings.py @@ -13,7 +13,7 @@ import os from pathlib import Path # Build paths inside the project like this: BASE_DIR / 'subdir'. -BASE_DIR = Path(__file__).resolve().parent.parent +BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) # Quick-start development settings - unsuitable for production # See https://docs.djangoproject.com/en/3.1/howto/deployment/checklist/ @@ -87,7 +87,7 @@ WSGI_APPLICATION = 'access_controller.wsgi.application' DATABASES = { 'default': { 'ENGINE': 'django.db.backends.sqlite3', - 'NAME': os.path.join(BASE_DIR / 'db'/ 'db.sqlite3'), + 'NAME': os.path.join(str(BASE_DIR),'db','zd_db.sqlite3'), } } diff --git a/db/zd_db.sqlite3 b/db/zd_db.sqlite3 new file mode 100644 index 0000000..fd85558 Binary files /dev/null and b/db/zd_db.sqlite3 differ diff --git a/main/migrations/0001_initial.py b/main/migrations/0001_initial.py index db1dffd..ab7c944 100644 --- a/main/migrations/0001_initial.py +++ b/main/migrations/0001_initial.py @@ -1,8 +1,9 @@ -# Generated by Django 3.1.6 on 2021-02-04 17:39 +# Generated by Django 3.1.6 on 2021-03-30 15:31 from django.conf import settings from django.db import migrations, models import django.db.models.deletion +import django.utils.timezone class Migration(migrations.Migration): @@ -18,9 +19,34 @@ class Migration(migrations.Migration): name='UserProfile', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('role', models.IntegerField()), - ('image', models.ImageField(upload_to='user_avatars')), - ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), + ('role', models.CharField(default='None', help_text='Глобальное имя роли пользователя', max_length=100)), + ('custom_role_id', models.IntegerField(default=0, help_text='Код роли пользователя')), + ('image', models.URLField(blank=True, help_text='Аватарка', null=True)), + ('name', models.CharField(default='None', help_text='Имя пользователя на нашем сайте', max_length=100)), + ('user', models.OneToOneField(help_text='Пользователь', on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), + ], + options={ + 'permissions': (('has_control_access', 'Can view admin page'),), + }, + ), + migrations.CreateModel( + name='UnassignedTicket', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('ticket_id', models.IntegerField(help_text='Номер тикера, для которого сняли ответственного')), + ('status', models.IntegerField(choices=[(0, 'Снят с пользователя, перенесён в буферную группу'), (1, 'Авторство восстановлено'), (2, 'Пока нас не было, тикет испарился из буферной группы. Дополнительные действия не требуются'), (3, 'Тикет уже был закрыт. Дополнительные действия не требуются'), (4, 'Тикет решён. Записан на пользователя с почтой SOLVED_TICKETS_EMAIL')], default=0, help_text='Статус тикета')), + ('assignee', models.ForeignKey(help_text='Пользователь, с которого снят тикет', on_delete=django.db.models.deletion.CASCADE, related_name='tickets', to=settings.AUTH_USER_MODEL)), + ], + ), + migrations.CreateModel( + name='RoleChangeLogs', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('old_role', models.IntegerField(default=0, help_text='Старая роль')), + ('new_role', models.IntegerField(default=0, help_text='Присвоенная роль')), + ('change_time', models.DateTimeField(default=django.utils.timezone.now, help_text='Дата и время изменения роли')), + ('changed_by', models.ForeignKey(help_text='Кем была изменена роль', on_delete=django.db.models.deletion.CASCADE, related_name='changed_by', to=settings.AUTH_USER_MODEL)), + ('user', models.ForeignKey(help_text='Пользователь, которому присвоили другую роль', on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), ], ), ] diff --git a/main/migrations/0002_userprofile_name.py b/main/migrations/0002_userprofile_name.py deleted file mode 100644 index 1737da2..0000000 --- a/main/migrations/0002_userprofile_name.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.1.6 on 2021-02-08 16:15 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('main', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='userprofile', - name='name', - field=models.CharField(default='None', max_length=100), - ), - ] diff --git a/main/migrations/0003_auto_20210216_2222.py b/main/migrations/0003_auto_20210216_2222.py deleted file mode 100644 index 33076ac..0000000 --- a/main/migrations/0003_auto_20210216_2222.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 3.1.6 on 2021-02-16 19:22 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('main', '0002_userprofile_name'), - ] - - operations = [ - migrations.AlterField( - model_name='userprofile', - name='image', - field=models.URLField(blank=True, null=True), - ), - migrations.AlterField( - model_name='userprofile', - name='role', - field=models.CharField(default='None', max_length=100), - ), - ] diff --git a/main/migrations/0004_rolechangelogs.py b/main/migrations/0004_rolechangelogs.py deleted file mode 100644 index c3d6328..0000000 --- a/main/migrations/0004_rolechangelogs.py +++ /dev/null @@ -1,27 +0,0 @@ -# Generated by Django 3.1.6 on 2021-02-17 17:25 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('main', '0003_auto_20210216_2222'), - ] - - operations = [ - migrations.CreateModel( - name='RoleChangeLogs', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.TextField()), - ('new_role', models.TextField()), - ('change_time', models.DateTimeField()), - ('changed_by', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='changed_by', to=settings.AUTH_USER_MODEL)), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - ] diff --git a/main/migrations/0005_auto_20210302_2255.py b/main/migrations/0005_auto_20210302_2255.py deleted file mode 100644 index dff2dc2..0000000 --- a/main/migrations/0005_auto_20210302_2255.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 3.1.6 on 2021-03-02 19:55 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('main', '0004_rolechangelogs'), - ] - - operations = [ - migrations.AlterModelOptions( - name='userprofile', - options={'permissions': [('admin', 'Have access to control page')]}, - ), - ] diff --git a/main/migrations/0006_delete_userprofile.py b/main/migrations/0006_delete_userprofile.py deleted file mode 100644 index 23adaab..0000000 --- a/main/migrations/0006_delete_userprofile.py +++ /dev/null @@ -1,16 +0,0 @@ -# Generated by Django 3.1.6 on 2021-03-03 19:32 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('main', '0005_auto_20210302_2255'), - ] - - operations = [ - migrations.DeleteModel( - name='UserProfile', - ), - ] diff --git a/main/migrations/0007_userprofile.py b/main/migrations/0007_userprofile.py deleted file mode 100644 index 2b05dd7..0000000 --- a/main/migrations/0007_userprofile.py +++ /dev/null @@ -1,29 +0,0 @@ -# Generated by Django 3.1.6 on 2021-03-03 19:35 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('main', '0006_delete_userprofile'), - ] - - operations = [ - migrations.CreateModel( - name='UserProfile', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('role', models.CharField(default='None', max_length=100)), - ('image', models.URLField(blank=True, null=True)), - ('name', models.CharField(default='None', max_length=100)), - ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - options={ - 'permissions': [('control_access', 'User has access to control page')], - }, - ), - ] diff --git a/main/migrations/0008_auto_20210303_2305.py b/main/migrations/0008_auto_20210303_2305.py deleted file mode 100644 index 8082682..0000000 --- a/main/migrations/0008_auto_20210303_2305.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 3.1.6 on 2021-03-03 20:05 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('main', '0007_userprofile'), - ] - - operations = [ - migrations.AlterModelOptions( - name='userprofile', - options={}, - ), - ] diff --git a/main/migrations/0009_models_help_text.py b/main/migrations/0009_models_help_text.py deleted file mode 100644 index 4bc87e1..0000000 --- a/main/migrations/0009_models_help_text.py +++ /dev/null @@ -1,61 +0,0 @@ -# Generated by Django 3.1.6 on 2021-03-11 08:00 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('main', '0008_auto_20210303_2305'), - ] - - operations = [ - migrations.AlterField( - model_name='rolechangelogs', - name='change_time', - field=models.DateTimeField(help_text='Дата и время изменения роли'), - ), - migrations.AlterField( - model_name='rolechangelogs', - name='changed_by', - field=models.ForeignKey(help_text='Кем была изменена роль', on_delete=django.db.models.deletion.CASCADE, related_name='changed_by', to=settings.AUTH_USER_MODEL), - ), - migrations.AlterField( - model_name='rolechangelogs', - name='name', - field=models.TextField(help_text='Имя пользователя'), - ), - migrations.AlterField( - model_name='rolechangelogs', - name='new_role', - field=models.TextField(help_text='Присвоенная роль'), - ), - migrations.AlterField( - model_name='rolechangelogs', - name='user', - field=models.ForeignKey(help_text='Пользователь, которому присвоили другую роль', on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL), - ), - migrations.AlterField( - model_name='userprofile', - name='image', - field=models.URLField(blank=True, help_text='Аватарка', null=True), - ), - migrations.AlterField( - model_name='userprofile', - name='name', - field=models.CharField(default='None', help_text='Имя пользователя на нашем сайте', max_length=100), - ), - migrations.AlterField( - model_name='userprofile', - name='role', - field=models.CharField(default='None', help_text='Код роли пользователя', max_length=100), - ), - migrations.AlterField( - model_name='userprofile', - name='user', - field=models.OneToOneField(help_text='Пользователь', on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL), - ), - ] diff --git a/main/migrations/0010_userprofile_meta.py b/main/migrations/0010_userprofile_meta.py deleted file mode 100644 index 28fa435..0000000 --- a/main/migrations/0010_userprofile_meta.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 3.1.6 on 2021-03-11 08:04 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('main', '0009_models_help_text'), - ] - - operations = [ - migrations.AlterModelOptions( - name='userprofile', - options={'permissions': (('has_control_access', 'Can view admin page'),)}, - ), - ] diff --git a/main/migrations/0011_auto_20210311_1734.py b/main/migrations/0011_auto_20210311_1734.py deleted file mode 100644 index c228bfc..0000000 --- a/main/migrations/0011_auto_20210311_1734.py +++ /dev/null @@ -1,28 +0,0 @@ -# Generated by Django 3.1.6 on 2021-03-11 14:34 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('main', '0010_userprofile_meta'), - ] - - operations = [ - migrations.AddField( - model_name='rolechangelogs', - name='old_role', - field=models.IntegerField(default=0, 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.IntegerField(default=0, help_text='Код роли пользователя'), - ), - ] diff --git a/main/migrations/0012_auto_20210311_2027.py b/main/migrations/0012_auto_20210311_2027.py deleted file mode 100644 index 113e51e..0000000 --- a/main/migrations/0012_auto_20210311_2027.py +++ /dev/null @@ -1,29 +0,0 @@ -# Generated by Django 3.1.6 on 2021-03-11 17:27 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('main', '0011_auto_20210311_1734'), - ] - - operations = [ - migrations.RemoveField( - model_name='rolechangelogs', - name='name', - ), - migrations.CreateModel( - name='UnassignedTicket', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('ticket_id', models.IntegerField(help_text='Номер тикера, для которого сняли ответственного')), - ('status', models.IntegerField(choices=[(0, 'Снят с пользователя, перенесён в буферную группу'), (1, 'Авторство восстановлено'), (2, 'Пока нас не было, тикет испарился из буферной группы. Дополнительные действия не требуются')], default=0)), - ('assignee', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='tickets', to=settings.AUTH_USER_MODEL)), - ], - ), - ] diff --git a/main/migrations/0013_auto_20210311_2040.py b/main/migrations/0013_auto_20210311_2040.py deleted file mode 100644 index 5648813..0000000 --- a/main/migrations/0013_auto_20210311_2040.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.1.6 on 2021-03-11 17:40 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('main', '0012_auto_20210311_2027'), - ] - - operations = [ - migrations.AlterField( - model_name='unassignedticket', - name='status', - field=models.IntegerField(choices=[(0, 'Снят с пользователя, перенесён в буферную группу'), (1, 'Авторство восстановлено'), (2, 'Пока нас не было, тикет испарился из буферной группы. Дополнительные действия не требуются'), (3, 'Тикет уже был закрыт. Дополнительные действия не требуются')], default=0), - ), - ] diff --git a/main/migrations/0013_rolechangelogs_test.py b/main/migrations/0013_rolechangelogs_test.py deleted file mode 100644 index 983ae29..0000000 --- a/main/migrations/0013_rolechangelogs_test.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.1.6 on 2021-03-22 13:43 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('main', '0012_auto_20210312_1225'), - ] - - operations = [ - migrations.AddField( - model_name='rolechangelogs', - name='test', - field=models.IntegerField(default=0, help_text='test'), - ), - ] diff --git a/main/migrations/0014_auto_20210314_1455.py b/main/migrations/0014_auto_20210314_1455.py deleted file mode 100644 index 77db2ec..0000000 --- a/main/migrations/0014_auto_20210314_1455.py +++ /dev/null @@ -1,29 +0,0 @@ -# Generated by Django 3.1.6 on 2021-03-14 11:55 - -from django.db import migrations, models -import django.utils.timezone - - -class Migration(migrations.Migration): - - dependencies = [ - ('main', '0013_auto_20210311_2040'), - ] - - operations = [ - migrations.AddField( - model_name='userprofile', - name='custom_role_id', - field=models.IntegerField(default=0, help_text='Код роли пользователя'), - ), - migrations.AlterField( - model_name='rolechangelogs', - name='change_time', - field=models.DateTimeField(default=django.utils.timezone.now, help_text='Дата и время изменения роли'), - ), - migrations.AlterField( - model_name='userprofile', - name='role', - field=models.CharField(default='None', help_text='Глобальное имя роли пользователя', max_length=100), - ), - ] diff --git a/main/migrations/0014_remove_rolechangelogs_test.py b/main/migrations/0014_remove_rolechangelogs_test.py deleted file mode 100644 index c5a5dad..0000000 --- a/main/migrations/0014_remove_rolechangelogs_test.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 3.1.6 on 2021-03-22 13:44 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('main', '0013_rolechangelogs_test'), - ] - - operations = [ - migrations.RemoveField( - model_name='rolechangelogs', - name='test', - ), - ] diff --git a/main/migrations/0015_auto_20210321_1600.py b/main/migrations/0015_auto_20210321_1600.py deleted file mode 100644 index 79b5726..0000000 --- a/main/migrations/0015_auto_20210321_1600.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.1.6 on 2021-03-21 13:00 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('main', '0014_auto_20210314_1455'), - ] - - operations = [ - migrations.AlterField( - model_name='unassignedticket', - name='status', - field=models.IntegerField(choices=[(0, 'Снят с пользователя, перенесён в буферную группу'), (1, 'Авторство восстановлено'), (2, 'Пока нас не было, тикет испарился из буферной группы. Дополнительные действия не требуются'), (3, 'Тикет уже был закрыт. Дополнительные действия не требуются'), (4, 'Тикет решён. Записан на пользователя с почтой SOLVED_TICKETS_EMAIL')], default=0), - ), - ] diff --git a/main/migrations/0015_auto_20210330_0007.py b/main/migrations/0015_auto_20210330_0007.py deleted file mode 100644 index 91398ba..0000000 --- a/main/migrations/0015_auto_20210330_0007.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.1.6 on 2021-03-29 21:07 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('main', '0014_auto_20210314_1455'), - ] - - operations = [ - migrations.AlterField( - model_name='unassignedticket', - name='status', - field=models.IntegerField(choices=[(0, 'Снят с пользователя, перенесён в буферную группу'), (1, 'Авторство восстановлено'), (2, 'Пока нас не было, тикет испарился из буферной группы. Дополнительные действия не требуются'), (3, 'Тикет уже был закрыт. Дополнительные действия не требуются'), (4, 'Тикет решён. Записан на пользователя с почтой SOLVED_TICKETS_EMAIL')], default=0), - ), - ] diff --git a/main/migrations/0016_merge_20210330_0043.py b/main/migrations/0016_merge_20210330_0043.py deleted file mode 100644 index efb1d45..0000000 --- a/main/migrations/0016_merge_20210330_0043.py +++ /dev/null @@ -1,14 +0,0 @@ -# Generated by Django 3.1.6 on 2021-03-29 21:43 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('main', '0015_auto_20210330_0007'), - ('main', '0015_auto_20210321_1600'), - ] - - operations = [ - ] diff --git a/start.sh b/start.sh index d4f4106..0e723d1 100644 --- a/start.sh +++ b/start.sh @@ -1,7 +1,7 @@ cd /access_controller/ -if [ ! -f "/access_controller/db/db.sqlite3" ]; then +if [ ! -f "/access_controller/db/zd_db.sqlite3" ]; then python manage.py migrate fi