Merge pull request #52 from HE-Arc/mbu-49-routes-user-iq-by-category

Mbu 49 routes user iq by category

api/masteriqapp/tests/test_routes.py

@@ -54,6 +54,6 @@ def test_route(self):
         assert response.json()['user_rank'] is not None
         assert response.json()['user_iq'] is not None
 
-
-
-
+        response = c.get("/api/category/2/user_iq/")
+        assert response.status_code == 200
+        assert response.json()['user_iq'] is not None

api/masteriqapp/views/IQView.py

@@ -1,3 +1,5 @@
+import random
+
 from django.http import HttpResponse
 from django.http import JsonResponse
 from rest_framework import viewsets
@@ -33,5 +35,8 @@ def category_with_iq(self, request):
                 "user_iq": 100 #TODO: REPLACE WITH USER IQ
             }
             answer_dict[category.id] = cat_dict
-        return JsonResponse(answer_dict)
+        return Response(status=status.HTTP_200_OK, data=answer_dict)
 
+    @action(detail=True, methods=["GET"])
+    def user_iq(self, request, pk):
+        return Response(status=status.HTTP_200_OK, data={"user_iq":random.randint(1,200)})

api/masteriqapp/views/QuestionView.py

@@ -33,7 +33,6 @@ def new(self, request, pk):
         new_question = random.choice(questions)
         request.session['question'] = new_question.id
         request.session['options_asked'] = False
-        print(request.session['question'])
         serializer = QuestionSerializer(new_question)
         return Response(serializer.data, status=status.HTTP_200_OK)
 
@@ -60,7 +59,6 @@ def new_community(self, request):
             if option_serializer.is_valid():
                 option_serializer.save()
             else:
-                print(option_serializer.data)
                 return Response(data={"field": "Option", "error": option_serializer.errors},
                                 status=status.HTTP_400_BAD_REQUEST)
 
@@ -81,15 +79,13 @@ def options(self, request):
         question_id = request.session['question']
         request.session['options_asked'] = True
         question = self.question_model.objects.get(pk=question_id)
-        print(question.options.all())
         data_to_send = {'question_id': question.id, 'number_of_question': len(question.options.all()), 'options': {}}
         for option in question.options.all():
             data_to_send['options'][option.id] = option.text
         return Response(status=status.HTTP_200_OK, data=data_to_send)
 
     @action(detail=False, methods=["POST"], url_path="answer_text")
     def answer_text(self, request):
-        print(request.session['options_asked'])
         if not 'answer' in request.data:
             return Response(status=status.HTTP_400_BAD_REQUEST, data={"error": "No answer given"})
         if not 'question' in request.session or not 'options_asked' in request.session: