feat: Modify conditions in Answer View

Author: bismitaguha

osp/views/answer.py

@@ -17,11 +17,18 @@ class AnswerView(viewsets.ModelViewSet):
     queryset = Answer.objects.all()
 
     def get_queryset(self):
-        queryset = self.queryset
+        queryset = self.queryset.order_by('question__order')
         form_id = self.request.query_params.get('form_id', None)
+        question_id = self.request.query_params.get('question_id', None)
         user = self.request.user
-        if form_id and user:
-            queryset = queryset.filter(form_answers__user_id=user.id, form_answers__form_id=form_id)
+        if form_id is not None:
+            queryset = queryset.filter(form_answers__form_id=form_id)
+        if user is not None:
+            queryset = queryset.filter(form_answers__user_id=user.id)
+        if question_id is not None:
+            queryset = queryset.filter(question_id=question_id)
+        
+        # response
         return queryset
 
     # GET request
@@ -36,6 +43,7 @@ def list(self, request):
             instance = model.objects.get(id=obj.id)
             results.append(serializer(instance).data)
 
+        # response
         return Response(results, status=status.HTTP_200_OK)
 
     # POST request