Fix Cloud-CV#1986 (Cloud-CV#1987)

Fixes Cloud-CV#1986

Author: Ayukha

apps/analytics/views.py

@@ -89,13 +89,14 @@ def get_submission_count(request, challenge_pk, duration):
     q_params = {'challenge_phase__id__in': challenge_phase_ids}
     since_date = None
     if duration.lower() == 'daily':
-        since_date = timezone.now().date()
+        # Get the midnight time of the day
+        since_date = timezone.now().replace(hour=0, minute=0, second=0, microsecond=0)
 
     elif duration.lower() == 'weekly':
-        since_date = (timezone.now() - timedelta(days=7)).date()
+        since_date = (timezone.now() - timedelta(days=7)).replace(hour=0, minute=0, second=0, microsecond=0)
 
     elif duration.lower() == 'monthly':
-        since_date = (timezone.now() - timedelta(days=30)).date()
+        since_date = (timezone.now() - timedelta(days=30)).replace(hour=0, minute=0, second=0, microsecond=0)
     # for `all` we dont need any condition in `q_params`
     if since_date:
         q_params['submitted_at__gte'] = since_date

apps/challenges/views.py

@@ -84,7 +84,7 @@ def challenge_list(request, challenge_host_team_pk):
         return Response(response_data, status=status.HTTP_406_NOT_ACCEPTABLE)
 
     if request.method == 'GET':
-        challenge = Challenge.objects.filter(creator=challenge_host_team, is_disabled=False)
+        challenge = Challenge.objects.filter(creator=challenge_host_team, is_disabled=False).order_by('-id')
         paginator, result_page = paginated_queryset(challenge, request)
         serializer = ChallengeSerializer(
             result_page, many=True, context={'request': request})
@@ -294,7 +294,7 @@ def get_featured_challenges(request):
         featured=True,
         published=True,
         approved_by_admin=True,
-        is_disabled=False)
+        is_disabled=False).order_by('-id')
     paginator, result_page = paginated_queryset(challenge, request)
     serializer = ChallengeSerializer(result_page, many=True, context={'request': request})
     response_data = serializer.data
@@ -356,7 +356,7 @@ def get_challenges_based_on_teams(request):
         host_team_ids = get_challenge_host_teams_for_user(request.user)
         q_params['creator__id__in'] = host_team_ids
 
-    challenge = Challenge.objects.filter(**q_params)
+    challenge = Challenge.objects.filter(**q_params).order_by('id')
     paginator, result_page = paginated_queryset(challenge, request)
     serializer = ChallengeSerializer(
         result_page, many=True, context={'request': request})

apps/hosts/views.py

@@ -28,7 +28,7 @@ def challenge_host_team_list(request):
 
     if request.method == 'GET':
         challenge_host_team_ids = ChallengeHost.objects.filter(user=request.user).values_list('team_name', flat=True)
-        challenge_host_teams = ChallengeHostTeam.objects.filter(id__in=challenge_host_team_ids)
+        challenge_host_teams = ChallengeHostTeam.objects.filter(id__in=challenge_host_team_ids).order_by('-id')
         paginator, result_page = paginated_queryset(challenge_host_teams, request)
         serializer = HostTeamDetailSerializer(result_page, many=True)
         response_data = serializer.data
@@ -105,7 +105,7 @@ def challenge_host_list(request, challenge_host_team_pk):
             challenge_host_status = challenge_host_status.split(',')
             filter_condition.update({'status__in': challenge_host_status})
 
-        challenge_host = ChallengeHost.objects.filter(**filter_condition)
+        challenge_host = ChallengeHost.objects.filter(**filter_condition).order_by('-id')
         paginator, result_page = paginated_queryset(challenge_host, request)
         serializer = ChallengeHostSerializer(result_page, many=True)
         response_data = serializer.data

apps/jobs/models.py

@@ -1,6 +1,5 @@
 from __future__ import unicode_literals
 
-import datetime
 import logging
 
 from django.contrib.auth.models import User
@@ -9,6 +8,7 @@
 from rest_framework.exceptions import PermissionDenied
 from django.db.models.signals import post_save, pre_save
 from django.dispatch import receiver
+from django.utils import timezone
 
 
 from base.models import (TimeStampedModel, )
@@ -138,13 +138,15 @@ def save(self, *args, **kwargs):
                     challenge_phase__challenge=self.challenge_phase.challenge,
                     participant_team=self.participant_team,
                     challenge_phase=self.challenge_phase,
-                    submitted_at__gte=datetime.date.today()).count()
+                    # Get the midnight time of the day
+                    submitted_at__gte=timezone.now().replace(hour=0, minute=0, second=0, microsecond=0)).count()
 
                 failed_count = Submission.objects.filter(
                     challenge_phase=self.challenge_phase,
                     participant_team=self.participant_team,
                     status=Submission.FAILED,
-                    submitted_at__gte=datetime.date.today()).count()
+                    # Get the midnight time of the day
+                    submitted_at__gte=timezone.now().replace(hour=0, minute=0, second=0, microsecond=0)).count()
 
                 if ((submissions_done_today_count + 1 - failed_count > self.challenge_phase.max_submissions_per_day) or
                         (self.challenge_phase.max_submissions_per_day == 0)):

apps/jobs/views.py

@@ -428,9 +428,9 @@ def get_remaining_submissions(request, challenge_phase_pk, challenge_pk):
 
     failed_submissions = submissions_done.filter(
         status=Submission.FAILED)
-
+    # Get the submissions_done_today by midnight time of the day
     submissions_done_today = submissions_done.filter(
-        submitted_at__gte=timezone.now().date())
+        submitted_at__gte=timezone.now().replace(hour=0, minute=0, second=0, microsecond=0))
 
     failed_submissions_done_today = submissions_done_today.filter(
         status=Submission.FAILED)

apps/participants/views.py

@@ -37,7 +37,7 @@ def participant_team_list(request):
     if request.method == 'GET':
         participant_teams_id = Participant.objects.filter(user_id=request.user).values_list('team_id', flat=True)
         participant_teams = ParticipantTeam.objects.filter(
-            id__in=participant_teams_id)
+            id__in=participant_teams_id).order_by('-id')
         paginator, result_page = paginated_queryset(participant_teams, request)
         serializer = ParticipantTeamDetailSerializer(result_page, many=True)
         response_data = serializer.data
@@ -74,7 +74,7 @@ def get_participant_team_challenge_list(request, participant_team_pk):
         return Response(response_data, status=status.HTTP_404_NOT_FOUND)
 
     if request.method == 'GET':
-        challenge = Challenge.objects.filter(participant_teams=participant_team)
+        challenge = Challenge.objects.filter(participant_teams=participant_team).order_by('-id')
         paginator, result_page = paginated_queryset(challenge, request)
         serializer = ChallengeSerializer(
             result_page, many=True, context={'request': request})

settings/dev.py

@@ -1,5 +1,7 @@
 from .common import *  # noqa: ignore=F405
 
+import warnings
+
 # Database
 # https://docs.djangoproject.com/en/1.10.2/ref/settings/#databases
 
@@ -53,3 +55,9 @@
 ]
 
 SILKY_PYTHON_PROFILER = True
+
+# Prevents Datetime warning by showing errors
+warnings.filterwarnings(
+    'error', r"DateTimeField .* received a naive datetime",
+    RuntimeWarning, r'django\.db\.models\.fields',
+)