Merge branch 'current_branch' into 'dev'

storage update

See merge request !213

progress/views.py

@@ -201,10 +201,10 @@ class StudentUpdateProgress(APIView):
                 else:
                     raise ValueError("Этого никогда не должно происходить, но я уверен, что произойдёт")
 
-                pv.save()
+            elif not comment is None:
+                pv.comment_tokens.append(comment)
 
-            else:
+            pv.save()
-                pass
 
             return Response(SecureProgressSerializer(pv.progress).data, status=200)
 

storage/views.py

@@ -1,3 +1,6 @@
+import base64
+import json
+
 from rest_framework.renderers import JSONRenderer
 from rest_framework.response import Response
 from rest_framework.views import APIView
@@ -44,12 +47,19 @@ class CommentView(APIView):
 
     @staticmethod
     def get(request):
-        token = request.GET.get('token', None)
+        base64_tokens = request.GET.get('base64_tokens', None)
 
-        if not token:
+        if not base64_tokens:
             return Response("Attribute token not set", status=400)
 
-        try:
+        tokens = json.loads(base64.b64decode(base64_tokens).decode('utf-8'))
-            return Response(CommentSerializer(Comment.objects.get(token=token)).data, status=200)
+        comments = []
-        except Comment.DoesNotExist:
+
-            return Response("Comment not found", status=404)
+        for token in tokens:
+            try:
+                comment = Comment.objects.get(token=token)
+                comments.append(comment)
+            except Comment.DoesNotExist:
+                pass
+
+        return Response([CommentSerializer(comment).data for comment in comments], status=200)