From 82a15f15c6d643f420a969fa9aab6ac82c927984 Mon Sep 17 00:00:00 2001 From: Egor Matveev Date: Tue, 1 Feb 2022 00:33:39 +0300 Subject: [PATCH] group --- Main/migrations/0017_auto_20220201_0033.py | 32 ++++++++++++++++++++++ Main/models/group.py | 5 ++++ Main/models/userinfo.py | 2 +- 3 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 Main/migrations/0017_auto_20220201_0033.py diff --git a/Main/migrations/0017_auto_20220201_0033.py b/Main/migrations/0017_auto_20220201_0033.py new file mode 100644 index 0000000..90091c7 --- /dev/null +++ b/Main/migrations/0017_auto_20220201_0033.py @@ -0,0 +1,32 @@ +# Generated by Django 3.2.4 on 2022-01-31 21:33 + +from django.conf import settings +import django.contrib.postgres.fields +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('Main', '0016_userinfo_teacher'), + ] + + operations = [ + migrations.AddField( + model_name='group', + name='creator', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL), + ), + migrations.AddField( + model_name='group', + name='editors', + field=django.contrib.postgres.fields.ArrayField(base_field=models.TextField(), default=list, size=None), + ), + migrations.AddField( + model_name='group', + name='users', + field=models.ManyToManyField(related_name='user_groups', to=settings.AUTH_USER_MODEL), + ), + ] diff --git a/Main/models/group.py b/Main/models/group.py index c662f3b..f231ad7 100644 --- a/Main/models/group.py +++ b/Main/models/group.py @@ -1,3 +1,5 @@ +from django.contrib.auth.models import User +from django.contrib.postgres.fields import ArrayField from django.db import models from Main.models.set import Set @@ -5,3 +7,6 @@ from Main.models.set import Set class Group(models.Model): name = models.TextField() sets = models.ManyToManyField(Set) + creator = models.ForeignKey(User, null=True, on_delete=models.SET_NULL) + users = models.ManyToManyField(User, related_name='user_groups') + editors = ArrayField(models.TextField(), default=list) diff --git a/Main/models/userinfo.py b/Main/models/userinfo.py index 9891724..501c4c3 100644 --- a/Main/models/userinfo.py +++ b/Main/models/userinfo.py @@ -1,6 +1,6 @@ from functools import cached_property -from django.contrib.auth.models import User +from django.contrib.auth.models import User, Group from django.db import models from django.db.models import Q from django.utils import timezone