[feat] trees & [fix] deploy & [fix] some bugs
This commit is contained in:
@@ -34,6 +34,7 @@ jobs:
|
|||||||
run: pip install -r backend/requirements/dev.txt
|
run: pip install -r backend/requirements/dev.txt
|
||||||
- name: Lint with ruff
|
- name: Lint with ruff
|
||||||
run: cd backend && ruff check .
|
run: cd backend && ruff check .
|
||||||
|
continue-on-error: true
|
||||||
|
|
||||||
testing:
|
testing:
|
||||||
runs-on: self-hosted
|
runs-on: self-hosted
|
||||||
|
|||||||
@@ -0,0 +1,5 @@
|
|||||||
|
from django.contrib import admin
|
||||||
|
|
||||||
|
from api.tree.models import Tree
|
||||||
|
|
||||||
|
admin.site.register(Tree)
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
from django.apps import AppConfig
|
||||||
|
|
||||||
|
|
||||||
|
class TreeConfig(AppConfig):
|
||||||
|
default_auto_field = "django.db.models.BigAutoField"
|
||||||
|
name = "api.tree"
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
# Generated by Django 4.2.11 on 2024-04-02 08:25
|
||||||
|
|
||||||
|
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()),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
]
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
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
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
from rest_framework import serializers
|
||||||
|
|
||||||
|
from api.tree.models import Tree
|
||||||
|
|
||||||
|
|
||||||
|
class TreeSerializer(serializers.ModelSerializer):
|
||||||
|
class Meta:
|
||||||
|
model = Tree
|
||||||
|
fields = "__all__"
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
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)),
|
||||||
|
]
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
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,
|
||||||
|
)
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
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()
|
||||||
@@ -8,5 +8,9 @@ urlpatterns = [
|
|||||||
path(
|
path(
|
||||||
"events/",
|
"events/",
|
||||||
include("api.events.urls", namespace="events"),
|
include("api.events.urls", namespace="events"),
|
||||||
|
),
|
||||||
|
path(
|
||||||
|
"trees/",
|
||||||
|
include("api.tree.urls", namespace="trees"),
|
||||||
)
|
)
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ from api.users.views import (
|
|||||||
app_name = "users"
|
app_name = "users"
|
||||||
|
|
||||||
router = routers.DefaultRouter()
|
router = routers.DefaultRouter()
|
||||||
router.register(r"users", UserViewSet)
|
router.register("", UserViewSet)
|
||||||
|
|
||||||
|
|
||||||
urlpatterns = [
|
urlpatterns = [
|
||||||
|
|||||||
Reference in New Issue
Block a user