Merge pull request #195 from PROCOLLAB-github/feature/trajectories

Добавлена POST ручка для обновления статуса "Встреч"

Author: Toksi86

apps/courses/admin.py

@@ -1,10 +1,10 @@
+from django import forms
 from django.contrib import admin
 from django.contrib.contenttypes.models import ContentType
-from django import forms
 from django.db.models import Q
 from django.utils.html import format_html
 
-from courses.models import Skill, Task, TaskObject, Popup
+from courses.models import Popup, Skill, Task, TaskObject
 from questions.models import QuestionSingleAnswer
 
 

apps/courses/models.py

@@ -4,8 +4,8 @@
 from django.db import models
 from django.db.models import Max
 
+from courses.managers import AvailableForUser, PublishedManager
 from files.models import FileModel
-from courses.managers import PublishedManager, AvailableForUser
 from subscription.models import SubscriptionType
 
 

apps/courses/serializers.py

@@ -3,12 +3,9 @@
 
 from courses.mapping import SWAGGER_API_HINTS
 from courses.models import Skill
-from courses.typing import (
-    TaskResultData,
-    TaskResponseSerializerData,
-    PopupSerializerData,
-    TaskOfSkillProgressSerializerData,
-)
+from courses.typing import (PopupSerializerData,
+                            TaskOfSkillProgressSerializerData,
+                            TaskResponseSerializerData, TaskResultData)
 
 
 class StepSerializer(serializers.Serializer):

apps/courses/services.py

@@ -1,17 +1,10 @@
-from django.db.models import Prefetch, Count, QuerySet, Max
+from django.db.models import Count, Max, Prefetch, QuerySet
 
 from courses.models import Skill, Task
 from courses.typing import GetStatsDict, WeekStatsDict
-from progress.services import (
-    DBObjectStatusFilters,
-    get_user_available_week,
-)
-from progress.models import (
-    CustomUser,
-    TaskObjUserResult,
-    UserWeekStat,
-)
-from progress.services import get_rounded_percentage
+from progress.models import CustomUser, TaskObjUserResult, UserWeekStat
+from progress.services import (DBObjectStatusFilters, get_rounded_percentage,
+                               get_user_available_week)
 
 
 def get_stats(skill: Skill, profile_id: int, request_user: CustomUser | None = None) -> GetStatsDict:

apps/courses/urls.py

@@ -1,6 +1,7 @@
 from django.urls import path
 
-from courses.views import SkillsList, SkillDetails, TaskList, TasksOfSkill, TaskStatsGet, DoneSkillsList
+from courses.views import (DoneSkillsList, SkillDetails, SkillsList, TaskList,
+                           TasksOfSkill, TaskStatsGet)
 
 urlpatterns = [
     path("<int:task_id>", TaskList.as_view(), name="task_list"),

apps/courses/views.py

@@ -1,48 +1,27 @@
+from django.db.models import (BooleanField, Case, Count, Exists, OuterRef,
+                              Prefetch, Q, QuerySet, Subquery, Sum, Value,
+                              When)
 from django.shortcuts import get_object_or_404
-
-from django.db.models import (
-    Sum, Q,
-    BooleanField,
-    Case,
-    Count,
-    Exists,
-    OuterRef,
-    Prefetch,
-    QuerySet,
-    Value,
-    Subquery,
-    When,
-)
-from rest_framework import generics, status
-from rest_framework.response import Response
 from drf_spectacular.utils import extend_schema
+from rest_framework import generics, status
 from rest_framework.permissions import IsAuthenticated
+from rest_framework.response import Response
 
 from progress.models import TaskObjUserResult, UserSkillDone
-from progress.services import (
-    DBObjectStatusFilters,
-    get_user_available_week,
-    get_rounded_percentage,
-)
-from subscription.permissions import (
-    SubscriptionObjectPermission,
-    SubscriptionSectionPermission,
-)
+from progress.pagination import DefaultPagination
+from progress.services import (DBObjectStatusFilters, get_rounded_percentage,
+                               get_user_available_week)
+from subscription.permissions import (SubscriptionObjectPermission,
+                                      SubscriptionSectionPermission)
+
 from .mapping import TYPE_TASK_OBJECT
-from .models import Task, Skill, TaskObject
+from .models import Skill, Task, TaskObject
+from .serializers import (CoursesResponseSerializer, IntegerListSerializer,
+                          SkillDetailsSerializer, SkillsBasicSerializer,
+                          SkillsDoneSerializer, TaskOfSkillProgressSerializer,
+                          TaskResult, TaskSerializer)
 from .services import get_stats
 from .typing import TaskResultData
-from .serializers import (
-    TaskSerializer,
-    SkillsBasicSerializer,
-    TaskOfSkillProgressSerializer,
-    TaskResult,
-    CoursesResponseSerializer,
-    SkillDetailsSerializer,
-    SkillsDoneSerializer,
-)
-from progress.pagination import DefaultPagination
-from .serializers import IntegerListSerializer
 
 
 class TaskList(generics.RetrieveAPIView):

apps/files/admin.py

@@ -1,10 +1,10 @@
 import reprlib
 
 from django.contrib import admin
-from django.forms import ModelForm, FileField
+from django.forms import FileField, ModelForm
 
-from files.service import CDN, SelectelSwiftStorage
 from files.models import FileModel
+from files.service import CDN, SelectelSwiftStorage
 
 
 class UserFileForm(ModelForm):

apps/files/service.py

@@ -3,7 +3,8 @@
 import requests
 from django.conf import settings
 from django.contrib.auth import get_user_model
-from django.core.files.uploadedfile import InMemoryUploadedFile, TemporaryUploadedFile
+from django.core.files.uploadedfile import (InMemoryUploadedFile,
+                                            TemporaryUploadedFile)
 from requests import Response
 
 from files.constants import SUPPORTED_IMAGES_TYPES

apps/files/views.py

@@ -1,12 +1,11 @@
 from django.db import transaction
-from rest_framework import generics
-from rest_framework import status
+from rest_framework import generics, status
 from rest_framework.generics import get_object_or_404
 from rest_framework.response import Response
 
-from files.service import CDN, SelectelSwiftStorage
 from files.models import FileModel
 from files.serializers import UserFileSerializer
+from files.service import CDN, SelectelSwiftStorage
 
 
 class FileView(generics.GenericAPIView):

apps/procollab_skills/__init__.py

@@ -1,4 +1,5 @@
 from __future__ import absolute_import, unicode_literals
+
 from .celery import app as celery_app
 from .schema import SimpleJWTTokenUserScheme