Dockerfile

@@ -1,11 +1,10 @@
 FROM docker:dind
 
 RUN apk add --update python3 && ln -sf python3 /usr/bin/python
+RUN python3 -m ensurepip
 RUN apk update && apk add postgresql-dev gcc python3-dev musl-dev jpeg-dev zlib-dev libjpeg
-RUN apk add py3-pip
-RUN python3 -m venv venv
-RUN source venv/bin/activate
-RUN pip install --break-system-packages --upgrade pip wheel setuptools
+RUN pip3 install --upgrade pip wheel setuptools
+RUN addgroup -S docker
 
 ENV PYTHONUNBUFFERED 1
 ENV DJANGO_SETTINGS_MODULE Sprint.settings
@@ -15,7 +14,7 @@ COPY requirements.txt /usr/src/app/requirements.txt
 
 WORKDIR /usr/src/app/
 
-RUN pip install -r requirements.txt --break-system-packages
+RUN pip3 install -r requirements.txt
 
 COPY . /usr/src/app/
 

Main/migrations/0040_delete_subscription.py

@@ -1,16 +0,0 @@
-# Generated by Django 3.2.4 on 2022-10-20 17:42
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('Main', '0039_auto_20221013_1855'),
-    ]
-
-    operations = [
-        migrations.DeleteModel(
-            name='Subscription',
-        ),
-    ]

Main/models/__init__.py

@@ -2,6 +2,7 @@ from Main.models.userinfo import UserInfo
 from Main.models.group import Group
 from Main.models.task import Task
 from Main.models.set import Set
+from Main.models.subscription import Subscription
 from Main.models.settask import SetTask
 from Main.models.solution import Solution
 from Main.models.extrafile import ExtraFile

Main/models/subscription.py

@@ -0,0 +1,12 @@
+from django.db import models
+from django.contrib.auth.models import User
+
+from Main.models.group import Group
+
+
+class Subscription(models.Model):
+    group = models.ForeignKey(
+        Group, on_delete=models.CASCADE, related_name="subscriptions"
+    )
+    user = models.ForeignKey(User, on_delete=models.CASCADE)
+    role = models.IntegerField()

Main/views/MainView.py

@@ -36,11 +36,11 @@ class MainView(BaseView):
         all_tasks = Task.objects.filter(solution__user=self.request.user).distinct()
         ok_tasks = all_tasks.filter(solution__result="OK").distinct()
         undone_tasks = set(all_tasks) - set(ok_tasks)
-        self.context['undone_tasks'] = sample(list(undone_tasks), k=min(5, len(undone_tasks)))
+        self.context['undone_tasks'] = sample(undone_tasks, k=min(5, len(undone_tasks)))
         for task in self.context['undone_tasks']:
             setattr(task, 'solution', Solution.objects.filter(user=self.request.user, task=task).last())
         new_tasks = set(Task.objects.filter(public=True)) - set(all_tasks)
-        self.context['new_tasks'] = sample(list(new_tasks), k=min(5, len(new_tasks)))
+        self.context['new_tasks'] = sample(new_tasks, k=min(5, len(new_tasks)))
         self.context['groups'] = Group.objects.filter(
             Q(editors__in=self.request.user.username) | Q(creator=self.request.user) | Q(
                 users=self.request.user)).distinct()

SprintLib/queue.py

@@ -6,7 +6,6 @@ from django.db import transaction
 from django.core.exceptions import ObjectDoesNotExist
 from django.core.management import BaseCommand
 from django.utils import timezone
-from django import db
 from pika.adapters.utils.connection_workflow import AMQPConnectorException
 
 from Main.models.outbox_message import OutboxMessage
@@ -38,7 +37,6 @@ class MessagingSupport(BaseCommand):
             print("Message is not JSON decodable")
             return
         print(f"Got {data}, processing...")
-        db.close_old_connections()
         try:
             outbox_message = OutboxMessage.objects.get(id=data["id"])
         except ObjectDoesNotExist:

nginx/nginx.conf

@@ -2,7 +2,7 @@ events {}
 
 http {
     server {
-        listen      1238;
+        listen      1235;
         location / {
             proxy_pass http://web:8000/;
         }

requirements.txt

@@ -1,5 +1,5 @@
 aiofiles==0.7.0
-aiohttp==3.9.0b0
+aiohttp==3.8.0
 amqp==5.0.6
 asgiref==3.3.4
 billiard==3.6.4.0