Merge branch 'develop' of github.com:D4rkLght/Skills into develop

Author: D4rkLght

backend/api/v1/serializers.py

@@ -1,4 +1,5 @@
 from rest_framework import serializers
+from django.shortcuts import get_object_or_404
 from skills.models import ResourceLibrary, Skill, SkillGroup
 from users.models import Specialization, UserProfile, UserResources, UserSkill
 
@@ -8,7 +9,7 @@ class GroupSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = SkillGroup
-        fields = ('id','name')
+        fields = ('id', 'name')
 
 
 class SpecializationDashbordSerializer(serializers.ModelSerializer):
@@ -34,12 +35,12 @@ class ResourceLibrarySerializer(serializers.ModelSerializer):
     """Отображение библиотек на дашборде."""
 
     learning_status = serializers.SerializerMethodField()
+
     class Meta:
         model = ResourceLibrary
         fields = ("id", "type", "description",
                   "learning_time", "url", "learning_status")
 
-
     def get_learning_status(self, obj):
         """Получение статуса изучения ресурса."""
         if not self.context:
@@ -57,6 +58,7 @@ class SkillFrontSerializer(serializers.ModelSerializer):
 
     group = GroupSerializer()
     resource_library = ResourceLibrarySerializer(many=True)
+    level = serializers.CharField(source='get_level_display')
 
     class Meta:
         model = Skill
@@ -68,10 +70,39 @@ class UserSkillSerializer(serializers.ModelSerializer):
     """Навыки пользователя."""
 
     skill = SkillFrontSerializer()
+    userskill_id = serializers.CharField(source='id')
 
     class Meta:
         model = UserSkill
-        fields = ( "skill",)
+        fields = ("userskill_id", "skill",)
+
+
+class ProfileSerializer(serializers.ModelSerializer):
+    """Создание профайла пользователя."""
+
+    class Meta:
+        model = UserProfile
+        fields = ('current_specialization', 'goal_specialization', 'skills')
+
+    def validate(self, data):
+        """Проверка, что такого у пользователя еще нет профайла."""
+        profile = UserProfile.objects.filter(
+            user=self.context['request'].user).exists()
+        if profile:
+            raise serializers.ValidationError(
+                'Профайл уже существует!')
+        return data
+
+    def create(self, validated_data):
+        """Переопределение метода create."""
+        skills = self.initial_data.pop('skills')
+        profile = UserProfile.objects.create(**validated_data)
+        for status in skills:
+            for id in skills[status]:
+                current_skill = get_object_or_404(Skill, id=id)
+                UserSkill.objects.create(
+                    skill=current_skill, user_profile=profile, status=status)
+        return validated_data
 
 
 class LevelSerializer(serializers.ModelSerializer):
@@ -223,7 +254,7 @@ class ShortUserSkillSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = UserSkill
-        fields = ("skill",)
+        fields = ("id", "skill",)
 
 
 class UserCreateSkillSerializer(serializers.ModelSerializer):
@@ -250,3 +281,33 @@ class UserUpdateSkillSerializer(serializers.ModelSerializer):
     class Meta:
         model = UserSkill
         fields = ("status",)
+
+
+class UserResourcesSerializer(serializers.ModelSerializer):
+    """Изменение статуса ресурсов пользователя."""
+
+    class Meta:
+        model = UserProfile
+        fields = ('resources',)
+
+    def create(self, validated_data):
+        """Переопределение метода create."""
+        profile = validated_data.get('profile')
+        try:
+            add = self.initial_data['add']
+            rm = self.initial_data['rm']
+        except BaseException:
+            raise serializers.ValidationError(
+                {'error': 'Неверные ключи словаря.'}) from None
+
+        for item in add:
+            resource = get_object_or_404(ResourceLibrary, id=item)
+            UserResources.objects.create(
+                profile=profile, resource=resource, status='done')
+        for item in rm:
+            resource = get_object_or_404(ResourceLibrary, id=item)
+            UserResources.objects.filter(
+                profile=profile,
+                resource=resource,
+                status='done').delete()
+        return validated_data

backend/api/v1/urls.py

@@ -4,9 +4,11 @@
 from rest_framework import permissions
 from rest_framework.routers import DefaultRouter
 
-from api.v1.views import (DashboardViewSet, LevelViewSet, LibraryViewSet,
-                          MyUsersViewSet, ShortUserSkillViewSet, SkillDetail,
-                          SkillViewSet, UserActivationView, UserSkillViewSet)
+from api.v1.views import (DashboardViewSet, LevelViewSet,
+                          LibraryViewSet, MyUsersViewSet,
+                          ProfileViewSet, ShortUserSkillViewSet,
+                          SkillViewSet, UserActivationView,
+                          UserSkillViewSet, UserResourceViewSet)
 
 app_name = "v1"
 
@@ -24,9 +26,11 @@
 router_v1 = DefaultRouter()
 router_v1.register("users", MyUsersViewSet, basename="users")
 router_v1.register("userskills", UserSkillViewSet, basename="userskills")
+router_v1.register("userresources", UserResourceViewSet, basename="resource")
 router_v1.register("levels", LevelViewSet, basename="level")
 router_v1.register("dashboard", DashboardViewSet, basename="dashboard")
 router_v1.register("libraries", LibraryViewSet, basename="library")
+router_v1.register("skills", SkillViewSet, basename="skills")
 router_v1.register(
     "short-userskills",
     ShortUserSkillViewSet,
@@ -41,8 +45,7 @@
     path("", include(router_v1.urls)),
     path("", include("djoser.urls.base")),
     path("auth/", include("djoser.urls.jwt")),
-    path('skills/', SkillViewSet.as_view({'get': 'list'})),
-    path('skills/<int:pk>/', SkillDetail.as_view()),
+    path('profile/', ProfileViewSet.as_view()),
 ]
 
 urlpatterns += [

backend/api/v1/views.py

@@ -9,11 +9,18 @@
 
 from skills.models import ResourceLibrary, Skill, Specialization
 from users.models import UserProfile, UserSkill
-from api.v1.serializers import (DashboardSerializer, LevelSerializer,
-                                LibrarySerializer, ShortUserSkillSerializer,
-                                SkillDetailSerializer, SkillFrontSerializer,
-                                UserCreateSkillSerializer, UserSkillSerializer,
-                                UserUpdateSkillSerializer)
+from api.v1.serializers import (
+    DashboardSerializer,
+    LevelSerializer,
+    LibrarySerializer,
+    ProfileSerializer,
+    ShortUserSkillSerializer,
+    SkillDetailSerializer,
+    SkillFrontSerializer,
+    UserCreateSkillSerializer,
+    UserSkillSerializer,
+    UserUpdateSkillSerializer,
+    UserResourcesSerializer)
 
 User = get_user_model()
 
@@ -40,13 +47,19 @@ class SkillViewSet(viewsets.ReadOnlyModelViewSet):
     """Список всех навыков."""
 
     queryset = Skill.objects.all()
-    serializer_class = SkillFrontSerializer
     filter_backends = (DjangoFilterBackend,)
     filterset_fields = (
         'level',
         'specialization',
         'specialization__level_name')
 
+    def get_serializer_class(self):
+        """Получение сериализатора."""
+        if self.action == 'list':
+            return SkillFrontSerializer
+        elif self.action == 'retrieve':
+            return SkillDetailSerializer
+
 
 class UserSkillViewSet(viewsets.ReadOnlyModelViewSet):
     """Навыки пользователя."""
@@ -68,7 +81,7 @@ def get_serializer_class(self):
             return ShortUserSkillSerializer
         elif self.request.method == "POST":
             return UserCreateSkillSerializer
-        elif self.request.method == "PATCH":
+        elif self.request.method in ("PATCH", "DELETE"):
             return UserUpdateSkillSerializer
 
     def get_queryset(self):
@@ -82,11 +95,27 @@ def perform_create(self, serializer):
         serializer.save(user_profile=profile)
 
 
+class ProfileViewSet(generics.ListCreateAPIView):
+    """Профайл текущего пользователя."""
+
+    serializer_class = ProfileSerializer
+
+    def get_queryset(self):
+        """Профайл текущего пользователя."""
+        return UserProfile.objects.filter(user=self.request.user)
+
+    def perform_create(self, serializer):
+        """Переопределение метода save."""
+        serializer.save(user=self.request.user)
+
+
 class LevelViewSet(viewsets.ReadOnlyModelViewSet):
     """Список уровней должности."""
 
     queryset = Specialization.objects.all()
     serializer_class = LevelSerializer
+    filter_backends = (DjangoFilterBackend,)
+    filterset_fields = ('name', 'level_name')
 
 
 class DashboardViewSet(viewsets.ReadOnlyModelViewSet):
@@ -100,15 +129,24 @@ def get_queryset(self):
         return UserProfile.objects.filter(user=self.request.user)
 
 
-class SkillDetail(generics.RetrieveAPIView):
-    """Список всех навыков."""
-
-    queryset = Skill.objects.all()
-    serializer_class = SkillDetailSerializer
-
-
 class LibraryViewSet(viewsets.ReadOnlyModelViewSet):
     """Список уровней должности."""
 
     queryset = ResourceLibrary.objects.all()
     serializer_class = LibrarySerializer
+
+
+class UserResourceViewSet(viewsets.ModelViewSet):
+    """Изменение ресурсов пользователя."""
+
+    serializer_class = UserResourcesSerializer
+
+    def get_queryset(self):
+        """Ресурсы текущего пользователя."""
+        profile = UserProfile.objects.filter(user=self.request.user)
+        return profile
+
+    def perform_create(self, serializer):
+        """Переопределение метода save."""
+        profile = UserProfile.objects.get(user=self.request.user)
+        serializer.save(profile=profile)

backend/core/settings.py

@@ -144,6 +144,7 @@
 }
 LOGIN_URL = "/accounts/login"
 LOGIN_REDIRECT_URL = "/"
+SOCIALACCOUNT_LOGIN_ON_GET = True
 
 
 # EMAIL CONFIG
@@ -194,7 +195,7 @@
 AUTH_USER_MODEL = "users.User"
 
 SIMPLE_JWT = {
-    "ACCESS_TOKEN_LIFETIME": timedelta(minutes=10000),
+    "ACCESS_TOKEN_LIFETIME": timedelta(minutes=100000),
     "AUTH_HEADER_TYPES": ("Bearer",),
 }
 

backend/users/migrations/0003_alter_userprofile_options.py

@@ -0,0 +1,20 @@
+# Generated by Django 4.2.7 on 2023-12-10 08:38
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("users", "0002_alter_userskill_skill"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="userprofile",
+            options={
+                "ordering": ("id",),
+                "verbose_name": "Данные пользователя",
+                "verbose_name_plural": "Данные пользователя",
+            },
+        ),
+    ]

backend/users/models.py

@@ -57,6 +57,7 @@ class UserProfile(models.Model):
     class Meta:
         verbose_name = "Данные пользователя"
         verbose_name_plural = "Данные пользователя"
+        ordering = ('id',)
 
     def __str__(self):
         return f"Профайл {self.user.username}"