From 50a4a5eb5819e3db52a0a9f85dabd04888cb7fde Mon Sep 17 00:00:00 2001 From: ITQ Date: Wed, 3 Apr 2024 00:08:07 +0300 Subject: [PATCH] [fix] --- .../api/events/migrations/0001_initial.py | 8 +++---- backend/project/api/events/models.py | 7 +----- backend/project/api/events/serializers.py | 11 +-------- backend/project/api/tree/__init__.py | 0 backend/project/api/tree/admin.py | 5 ---- backend/project/api/tree/apps.py | 6 ----- .../api/tree/migrations/0001_initial.py | 22 ----------------- .../project/api/tree/migrations/__init__.py | 0 backend/project/api/tree/models.py | 12 ---------- backend/project/api/tree/serializers.py | 9 ------- backend/project/api/tree/urls.py | 13 ---------- backend/project/api/tree/utils.py | 24 ------------------- backend/project/api/tree/views.py | 9 ------- backend/project/api/urls.py | 4 ---- backend/project/config/settings.py | 1 - 15 files changed, 5 insertions(+), 126 deletions(-) delete mode 100644 backend/project/api/tree/__init__.py delete mode 100644 backend/project/api/tree/admin.py delete mode 100644 backend/project/api/tree/apps.py delete mode 100644 backend/project/api/tree/migrations/0001_initial.py delete mode 100644 backend/project/api/tree/migrations/__init__.py delete mode 100644 backend/project/api/tree/models.py delete mode 100644 backend/project/api/tree/serializers.py delete mode 100644 backend/project/api/tree/urls.py delete mode 100644 backend/project/api/tree/utils.py delete mode 100644 backend/project/api/tree/views.py diff --git a/backend/project/api/events/migrations/0001_initial.py b/backend/project/api/events/migrations/0001_initial.py index 1b808c9..bde3bc5 100644 --- a/backend/project/api/events/migrations/0001_initial.py +++ b/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={ diff --git a/backend/project/api/events/models.py b/backend/project/api/events/models.py index 2e11860..4bd226e 100644 --- a/backend/project/api/events/models.py +++ b/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, - on_delete=models.CASCADE, - related_name="events", - ) + tree = models.JSONField() def __str__(self): return self.title diff --git a/backend/project/api/events/serializers.py b/backend/project/api/events/serializers.py index abf8df0..6d57dd4 100644 --- a/backend/project/api/events/serializers.py +++ b/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) diff --git a/backend/project/api/tree/__init__.py b/backend/project/api/tree/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/backend/project/api/tree/admin.py b/backend/project/api/tree/admin.py deleted file mode 100644 index 6881ebf..0000000 --- a/backend/project/api/tree/admin.py +++ /dev/null @@ -1,5 +0,0 @@ -from django.contrib import admin - -from api.tree.models import Tree - -admin.site.register(Tree) diff --git a/backend/project/api/tree/apps.py b/backend/project/api/tree/apps.py deleted file mode 100644 index 2ca1f49..0000000 --- a/backend/project/api/tree/apps.py +++ /dev/null @@ -1,6 +0,0 @@ -from django.apps import AppConfig - - -class TreeConfig(AppConfig): - default_auto_field = "django.db.models.BigAutoField" - name = "api.tree" diff --git a/backend/project/api/tree/migrations/0001_initial.py b/backend/project/api/tree/migrations/0001_initial.py deleted file mode 100644 index afd159b..0000000 --- a/backend/project/api/tree/migrations/0001_initial.py +++ /dev/null @@ -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()), - ], - ), - ] diff --git a/backend/project/api/tree/migrations/__init__.py b/backend/project/api/tree/migrations/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/backend/project/api/tree/models.py b/backend/project/api/tree/models.py deleted file mode 100644 index 0ac9184..0000000 --- a/backend/project/api/tree/models.py +++ /dev/null @@ -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 diff --git a/backend/project/api/tree/serializers.py b/backend/project/api/tree/serializers.py deleted file mode 100644 index 1bebb82..0000000 --- a/backend/project/api/tree/serializers.py +++ /dev/null @@ -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__" diff --git a/backend/project/api/tree/urls.py b/backend/project/api/tree/urls.py deleted file mode 100644 index 9ee02a2..0000000 --- a/backend/project/api/tree/urls.py +++ /dev/null @@ -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)), -] diff --git a/backend/project/api/tree/utils.py b/backend/project/api/tree/utils.py deleted file mode 100644 index f740a68..0000000 --- a/backend/project/api/tree/utils.py +++ /dev/null @@ -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, - ) diff --git a/backend/project/api/tree/views.py b/backend/project/api/tree/views.py deleted file mode 100644 index ab1a6de..0000000 --- a/backend/project/api/tree/views.py +++ /dev/null @@ -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() diff --git a/backend/project/api/urls.py b/backend/project/api/urls.py index 813755f..4ec6200 100644 --- a/backend/project/api/urls.py +++ b/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"), - ), ] diff --git a/backend/project/config/settings.py b/backend/project/config/settings.py index 6de71a9..5d0f4c1 100755 --- a/backend/project/config/settings.py +++ b/backend/project/config/settings.py @@ -49,7 +49,6 @@ INSTALLED_APPS = [ "api", "api.users", "api.events", - "api.tree", ] MIDDLEWARE = [