[fix]

backend/project/api/events/migrations/0001_initial.py

@@ -1,7 +1,6 @@
-# Generated by Django 4.2.11 on 2024-04-02 17:05
+# Generated by Django 4.2.11 on 2024-04-02 21:07
 
 from django.db import migrations, models
-import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
@@ -10,7 +9,6 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ('users', '0001_initial'),
-        ('tree', '0001_initial'),
     ]
 
     operations = [
@@ -24,10 +22,10 @@ class Migration(migrations.Migration):
                 ('start_date', models.DateField(blank=True, null=True)),
                 ('end_date', models.DateField(blank=True, null=True)),
                 ('description', models.TextField(default='')),
-                ('is_online', models.BooleanField(default=True, verbose_name='оффлайн или онлайн')),
+                ('is_online', models.BooleanField(default=True)),
                 ('location', models.CharField(default='', max_length=512)),
                 ('limitation', models.CharField(choices=[('Everyone', 'everyone'), ('School', 'school'), ('Student', 'student'), ('Professional', 'professional')], default='everyone', max_length=64)),
-                ('tree', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='events', to='tree.tree')),
+                ('tree', models.JSONField()),
                 ('users', models.ManyToManyField(blank=True, related_name='events', to='users.user')),
             ],
             options={

backend/project/api/events/models.py

@@ -1,7 +1,6 @@
 from django.db import models
 
 from api.core.models import BaseModel
-from api.tree.models import Tree
 
 
 class Event(BaseModel):
@@ -51,11 +50,7 @@ class Event(BaseModel):
         default="everyone",
     )
 
-    tree = models.ForeignKey(
+    tree = models.JSONField()
-        Tree,
-        on_delete=models.CASCADE,
-        related_name="events",
-    )
 
     def __str__(self):
         return self.title

backend/project/api/events/serializers.py

@@ -1,18 +1,9 @@
 from rest_framework import serializers
 
-from api.events.models import Event, Tree
+from api.events.models import Event
 
 
 class EventSerializer(serializers.ModelSerializer):
-    tree = serializers.JSONField(write_only=True)
-
     class Meta:
         model = Event
         fields = "__all__"
-
-    def create(self, validated_data):
-        tree = Tree.objects.get_or_create(pk=validated_data.pop("tree"))
-
-        validated_data["tree"] = tree.id
-
-        return Event.objects.create(**validated_data)

backend/project/api/tree/admin.py

@@ -1,5 +0,0 @@
-from django.contrib import admin
-
-from api.tree.models import Tree
-
-admin.site.register(Tree)

backend/project/api/tree/apps.py

@@ -1,6 +0,0 @@
-from django.apps import AppConfig
-
-
-class TreeConfig(AppConfig):
-    default_auto_field = "django.db.models.BigAutoField"
-    name = "api.tree"

backend/project/api/tree/migrations/0001_initial.py

@@ -1,22 +0,0 @@
-# Generated by Django 4.2.11 on 2024-04-02 17:05
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    initial = True
-
-    dependencies = [
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Tree',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=255, unique=True)),
-                ('data', models.JSONField()),
-            ],
-        ),
-    ]

backend/project/api/tree/models.py

@@ -1,12 +0,0 @@
-from django.db import models
-
-
-class Tree(models.Model):
-    name = models.CharField(
-        max_length=255,
-        unique=True,
-    )
-    data = models.JSONField()
-
-    def __str__(self):
-        return self.name

backend/project/api/tree/serializers.py

@@ -1,9 +0,0 @@
-from rest_framework import serializers
-
-from api.tree.models import Tree
-
-
-class TreeSerializer(serializers.ModelSerializer):
-    class Meta:
-        model = Tree
-        fields = "__all__"

backend/project/api/tree/urls.py

@@ -1,13 +0,0 @@
-from django.urls import include, path
-from rest_framework.routers import DefaultRouter
-
-from api.tree.views import TreeViewSet
-
-app_name = "tree"
-
-router = DefaultRouter()
-router.register("", TreeViewSet)
-
-urlpatterns = [
-    path("", include(router.urls)),
-]

backend/project/api/tree/utils.py

@@ -1,24 +0,0 @@
-from django.conf import settings
-from django.core.mail import send_mail
-from django.template.loader import render_to_string
-
-
-def send_mails_for_commands(teams):
-    subject = "Ваша команда"
-    from_mail = settings.EMAIL_HOST_USER
-    template_name = "mail.html"
-    context = {}
-    for team in teams:
-        to_mails = [x["email"] for x in team]
-        context = {
-            "team": team,
-        }
-        html_content = render_to_string(template_name, context)
-        send_mail(
-            subject=subject,
-            from_email=from_mail,
-            recipient_list=to_mails,
-            message="Круто",
-            fail_silently=True,
-            html_message=html_content,
-        )

backend/project/api/tree/views.py

@@ -1,9 +0,0 @@
-from rest_framework.viewsets import ModelViewSet
-
-from api.tree.models import Tree
-from api.tree.serializers import TreeSerializer
-
-
-class TreeViewSet(ModelViewSet):
-    serializer_class = TreeSerializer
-    queryset = Tree.objects.all()

backend/project/api/urls.py

@@ -29,8 +29,4 @@ urlpatterns = [
         "events/",
         include("api.events.urls", namespace="events"),
     ),
-    path(
-        "trees/",
-        include("api.tree.urls", namespace="trees"),
-    ),
 ]

backend/project/config/settings.py

@@ -49,7 +49,6 @@ INSTALLED_APPS = [
     "api",
     "api.users",
     "api.events",
-    "api.tree",
 ]
 
 MIDDLEWARE = [