From eb7043d3adcb75039292b9a999334849d57fb732 Mon Sep 17 00:00:00 2001 From: Mike0001-droid Date: Sun, 2 Jun 2024 13:39:30 +0500 Subject: [PATCH] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?= =?UTF-8?q?=D1=82=D0=B0=D0=B1=D0=BB=D0=B8=D1=86=D1=83=20=D1=81=20=D1=83?= =?UTF-8?q?=D1=87=D0=B0=D1=81=D1=82=D0=BD=D0=B8=D0=BA=D0=B0=D0=BC=D0=B8=20?= =?UTF-8?q?=D0=BF=D1=80=D0=BE=D0=B5=D0=BA=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/proj/userProfile/models.py | 16 +++++++++++++++- server/proj/userProfile/serializers.py | 9 ++++++++- server/proj/userProfile/views.py | 13 ++++++++++--- 3 files changed, 33 insertions(+), 5 deletions(-) diff --git a/server/proj/userProfile/models.py b/server/proj/userProfile/models.py index 2b9ce0c..042bc64 100644 --- a/server/proj/userProfile/models.py +++ b/server/proj/userProfile/models.py @@ -28,4 +28,18 @@ class Profile(models.Model): # @receiver(post_save, sender=settings.AUTH_USER_MODEL) # def create_auth_token(sender, instance=None, created=False, **kwargs): # if created: -# Token.objects.create(user=instance) \ No newline at end of file +# Token.objects.create(user=instance) + +class Team(models.Model): + name = models.CharField('Имя участника', max_length=50) + last_name = models.CharField('Фамилия участника', max_length=50) + position = models.CharField('Должность участинка', max_length=50) + img_person = models.ImageField('Изображение участника', blank=True, null=True, upload_to="team_images/") + + def __str__(self): + return f"{self.last_name} {self.name} - {self.position}" + + class Meta: + verbose_name = 'Команда' + verbose_name_plural = 'Команда' + diff --git a/server/proj/userProfile/serializers.py b/server/proj/userProfile/serializers.py index 8c9925e..58bb8c5 100644 --- a/server/proj/userProfile/serializers.py +++ b/server/proj/userProfile/serializers.py @@ -1,6 +1,6 @@ from rest_framework import serializers, views, status from rest_framework.response import Response -from .models import Profile +from .models import Profile, Team class ProfileSerializer(serializers.ModelSerializer): class Meta: @@ -20,3 +20,10 @@ class ProfileSerializer(serializers.ModelSerializer): def create(self, validated_data): validated_data['likedSongs'] = [] return Profile.objects.create(**validated_data) + +class TeamSerializer(serializers.ModelSerializer): + class Meta: + model = Team + fields = ('id', 'name', 'last_name', 'position', 'img_person') + + diff --git a/server/proj/userProfile/views.py b/server/proj/userProfile/views.py index 7db2260..d5343de 100644 --- a/server/proj/userProfile/views.py +++ b/server/proj/userProfile/views.py @@ -1,6 +1,7 @@ from rest_framework.permissions import IsAuthenticated, AllowAny from django.shortcuts import get_object_or_404 from django.db import transaction +from rest_framework.viewsets import ViewSet from rest_framework import viewsets, status, views from rest_framework.response import Response from rest_framework.decorators import api_view, permission_classes, action @@ -8,8 +9,8 @@ from django.contrib.auth.models import User from rest_framework_simplejwt.authentication import JWTAuthentication from rest_framework_simplejwt.exceptions import InvalidToken, AuthenticationFailed -from .models import Profile -from .serializers import ProfileSerializer +from .models import Profile, Team +from .serializers import ProfileSerializer, TeamSerializer class ProfileViewSet(viewsets.ViewSet): queryset = Profile.objects.all() @@ -60,4 +61,10 @@ class ProfileViewSet(viewsets.ViewSet): serializer = ProfileSerializer(profile) return Response(serializer.data['likedSongs'], status=status.HTTP_200_OK) - \ No newline at end of file +class TeamViewSet(ViewSet): + def list(self, request): + queryset = Team.objects.all() + serializer = TeamSerializer(queryset, many=True) + return Response(serializer.data, status=status.HTTP_200_OK) + +