From f2f0f8cc44d1f14fc5ff464345b42f396a63df5e Mon Sep 17 00:00:00 2001 From: Andrey Date: Mon, 12 Mar 2018 16:33:43 +0300 Subject: [PATCH] Yandex_update --- access/serializers.py | 6 ++-- courses/models.py | 21 +++++++---- courses/serializers.py | 5 +++ courses/tasks.py | 12 +++++++ courses/urls.py | 2 +- courses/views.py | 77 ++++++++++++++++++++++++++--------------- progress/serializers.py | 1 - 7 files changed, 85 insertions(+), 39 deletions(-) create mode 100644 courses/tasks.py diff --git a/access/serializers.py b/access/serializers.py index 5d29a96..2aea54b 100644 --- a/access/serializers.py +++ b/access/serializers.py @@ -21,13 +21,13 @@ class AccountSerializer(serializers.ModelSerializer): class UserSelfSerializer(serializers.ModelSerializer): account = serializers.SerializerMethodField() groups = serializers.SerializerMethodField() - progress = serializers.SerializerMethodField() + progresses = serializers.SerializerMethodField() diplomas = serializers.SerializerMethodField() achievements = serializers.SerializerMethodField() class Meta: model = get_user_model() - fields = ('out_key', 'email', 'first_name', 'last_name', 'progress', 'achievements', + fields = ('out_key', 'email', 'first_name', 'last_name', 'progresses', 'achievements', 'account', 'groups', 'is_staff', 'is_superuser', 'diplomas', 'is_active') @staticmethod @@ -47,7 +47,7 @@ class UserSelfSerializer(serializers.ModelSerializer): return [group.name for group in self.groups.all()] @staticmethod - def get_progress(self): + def get_progresses(self): return [SecureProgressSerializer(i).data for i in self.progress_set.all()] diff --git a/courses/models.py b/courses/models.py index 7785b4c..934a43b 100755 --- a/courses/models.py +++ b/courses/models.py @@ -154,19 +154,26 @@ class Course(models.Model): lesson_list += list(topic.lesson_set.all()) return lesson_list - def get_next(self, lesson: Lesson) -> Lesson: + def get_next(self, lesson: Lesson, f=None) -> Lesson: lessons = self.get_lesson_list() try: - return lessons[lessons.index(lesson)] + n = lessons[lessons.index(lesson)+1] + if f is None or f(lesson): + return n + else: + return self.get_next(lesson, f) except IndexError: pass - def get_previous(self, lesson: Lesson): + def get_previous(self, lesson: Lesson, f=None): lessons = self.get_lesson_list() - try: - return lessons[lessons.index(lesson) - 2] - except IndexError: - pass + idx = lessons.index(lesson) - 1 + if idx > -1: + prev = lessons[idx] + if f is None or f(lesson): + return prev + else: + return self.get_previous(prev, f) def get_first_lesson(self) -> Lesson: lessons = self.get_lesson_list() diff --git a/courses/serializers.py b/courses/serializers.py index 70e4ba6..359386b 100644 --- a/courses/serializers.py +++ b/courses/serializers.py @@ -23,11 +23,16 @@ class MiniLessonSerializer(serializers.ModelSerializer): class LessonSerializer(MiniLessonSerializer): + course_slug = serializers.SerializerMethodField() class Meta: model = Lesson exclude = ('id', 'topic', 'key') + @staticmethod + def get_course_slug(self): + return self.topic.course.slug + class TeacherLessonSerializer(MiniLessonSerializer): topic_sort = serializers.SerializerMethodField() diff --git a/courses/tasks.py b/courses/tasks.py new file mode 100644 index 0000000..9d00b7f --- /dev/null +++ b/courses/tasks.py @@ -0,0 +1,12 @@ +from progress.models import ProgressLesson, Progress + + +def add_lesson(user_out_key: str, course_token: str, lesson_token: str, teacher_key: str, is_hm: bool): + + p = Progress.objects.get(course_token=course_token, user__out_key=user_out_key) + + ProgressLesson.objects.get_or_create( + progress=p, + lesson_token=lesson_token, + checker=user_out_key if is_hm else teacher_key, + ) \ No newline at end of file diff --git a/courses/urls.py b/courses/urls.py index d30f49b..819f814 100644 --- a/courses/urls.py +++ b/courses/urls.py @@ -3,8 +3,8 @@ from django.conf.urls import url from courses import views as views urlpatterns = [ - url(r'vertex/(?P.+)/$', views.LessonDetail.as_view()), url(r'lesson/teacher/(?P.+)/$', views.LessonInfoView.as_view()), + url(r'lesson/(?P.+)/$', views.LessonDetail.as_view()), url(r'tree/(?P.+)/$', views.TreeView.as_view()), url(r'detail/(?P.+)/$', views.CourseDetailView.as_view()), url(r'^$', views.CourseListView.as_view()), diff --git a/courses/views.py b/courses/views.py index ea9536f..90450b6 100644 --- a/courses/views.py +++ b/courses/views.py @@ -1,3 +1,5 @@ +from jwt import DecodeError + from courses.models import Course, Lesson from rest_framework.renderers import JSONRenderer from rest_framework.response import Response @@ -5,7 +7,10 @@ from rest_framework.views import APIView from django.contrib.auth import get_user_model from courses.serializers import CourseDetailSerializer, CourseTreeSerializer, LessonSerializer, TeacherLessonSerializer -from progress.models import ProgressLesson +import jwt + +from courses.tasks import add_lesson +from lms import settings class TreeView(APIView): @@ -93,33 +98,51 @@ class LessonDetail(APIView): renderer_classes = (JSONRenderer,) @staticmethod - def get(request, token): + def post(request, token): + jwt_token = request.JSON.get('jwt_token', None) try: lesson = Lesson.objects.get(token=token) except Lesson.DoesNotExist: - return Response("Lesson doesn't exist", status=404) - - if not lesson.free and not ProgressLesson.objects.filter(lesson_token=lesson.token).exists(): - previous_lesson = lesson.topic.course.get_previous(lesson) - - if not previous_lesson is None or not ProgressLesson.objects.filter( - lesson_token=previous_lesson.token, status=ProgressLesson.STATUSES.done).exists(): - return Response("Lesson doesn't access", status=403) - - # TODO: Доделать систему прав на курс - - res = LessonSerializer(lesson).data - # progress = vertex.course.progress_set.filter(user=request.user) - # try: - # if progress.exists(): - # next_vertex = vertex.get_next(progress[0].get_template()) - # if next_vertex: - # res['next'] = MiniVertexSerializer(next_vertex).data - # res['is_in_progress'] = vertex in progress[0].get_objects_in_progress() - # else: - # res['next'] = MiniVertexSerializer(vertex.get_next(vertex.course.route)).data - # except Thread.DoesNotExist or Vertex.DoesNotExist: - # res['next'] = MiniVertexSerializer(vertex.get_next(vertex.course.route)).data - - return Response(res, status=200) + return Response("Урока не существует", status=404) + + l = LessonSerializer(lesson).data + + if not lesson.free: + if jwt_token is None: + return Response("Ошибка доступа", status=403) + + try: + payload = jwt.decode(jwt_token, settings.COURSE_PROGRESS_SECRET_KEY, algorithms=['HS256']) + except DecodeError: + return Response("Bad token", status=400) + + try: + course = Course.objects.get(token=payload['course_token']) + except Course.DoesNotExist: + return Response("Course not found", status=404) + + prev_lesson = course.get_previous(lesson, (lambda x: not x.is_hm) if payload['only_watch'] else None) + next_lesson = course.get_next(lesson, (lambda x: not x.is_hm) if payload['only_watch'] else None) + + if not prev_lesson is None: + l['prev_token'] = prev_lesson.token + + if not next_lesson is None: + l['next_token'] = next_lesson.token + + new_lesson = False + for payload_lesson in payload['lessons']: + if payload_lesson['lesson_token'] == str(lesson.token): + return Response(l, status=200) + new_lesson = True if prev_lesson is None else \ + ((payload_lesson['status'] == "done" or payload_lesson['status'] == "wait") + if prev_lesson.token == payload_lesson['lesson_token'] else False) + + if not new_lesson: + return Response("Permission denied", status=403) + + #TODO Задача для селери + add_lesson(request.user.out_key, course.token, lesson.token, course.get_teacher(), lesson.is_hm) + + return Response(l, status=200) diff --git a/progress/serializers.py b/progress/serializers.py index a7a9e65..c2570e9 100644 --- a/progress/serializers.py +++ b/progress/serializers.py @@ -30,7 +30,6 @@ class SecureProgressSerializer(serializers.ModelSerializer): 'lessons': [ProgressLessonSerializer(i).data for i in self.progresslesson_set.all()], 'course_token': str(self.course_token), 'only_watch': self.only_watch, - 'is_finish': self.is_finish, } return jwt.encode(payload, settings.COURSE_PROGRESS_SECRET_KEY, algorithm='HS256')