config model fixes and slight improvements in api

Author: deadlycoder07

api/views.py

@@ -34,11 +34,19 @@ class getquestion(APIView):
 
     def get(self,request):
         player=UserScore.objects.filter(user=request.user)[0]
-        day=config.objects.all()[0].current_day
-        curr_question=player.current_question
-        question=Question.objects.filter(day=day,question_no=curr_question)[0]
-        serializer=QuestionSerializer(question)
-        return Response(serializer.data)
+        active=config.quiz_active(config)
+        if active:
+            day=config.objects.all()[0].current_day
+            curr_question=player.current_question
+            question=Question.objects.filter(day=day,question_no=curr_question)[0]
+            serializer=QuestionSerializer(question)
+            return Response(serializer.data)
+        else:
+            response= {
+                "error":"quiz has ended"
+            }
+            return Response(response)
+
 class Answer(APIView):
     permission_classes=(IsAuthenticated,)
 

quiz/models.py

@@ -1,7 +1,9 @@
 from django.db import models
 from django.contrib.auth.models import User
 import datetime
+import pytz
 
+utc=pytz.UTC
 # Create your models here.
 class Question(models.Model):
     question=models.CharField(max_length=550)
@@ -63,10 +65,15 @@ class config(models.Model):
 
     def quiz_active(self):
         curr_config=self.objects.all()[0]
-        current_time=datetime.datetime.now()    
-        if current_time==curr_config[0].quiz_endtime:
+        current_time=datetime.datetime.now().replace(tzinfo=utc)  
+        quiz_endtime=curr_config.quiz_endtime.replace(tzinfo=utc)
+        print(curr_config.quiz_endtime)
+        print(current_time)  
+        if current_time>quiz_endtime:
             curr_config.quiz_active=False
-    
+            print(current_time>quiz_endtime)
+            return False
+        return True
     def save(self, force_insert=False, force_update=False, *args, **kwargs):
         players=UserScore.objects.all()
         for player in players: