Update based on failed tests

django_project/gap/admin/crop_insight.py

@@ -117,7 +117,7 @@ class CropInsightRequestAdmin(admin.ModelAdmin):
     """Admin for CropInsightRequest."""
 
     list_display = (
-        'requested_date', 'farm_count', 'file_url', 'last_task_status',
+        'requested_at', 'farm_count', 'file_url', 'last_task_status',
         'background_tasks'
     )
     filter_horizontal = ('farms',)

django_project/gap/models/crop_insight.py

@@ -7,7 +7,7 @@
 
 import json
 import uuid
-from datetime import date
+from datetime import date, timedelta
 
 from django.conf import settings
 from django.contrib.auth import get_user_model
@@ -438,7 +438,10 @@ def background_task_running(self):
     def today_reports():
         """Return query of today reports."""
         now = timezone.now()
-        return CropInsightRequest.objects.filter(requested_date=now.date())
+        return CropInsightRequest.objects.filter(
+            requested_at__gte=now.date(),
+            requested_at__lte=now.date() + timedelta(days=1),
+        )
 
     @property
     def skip_run(self):
@@ -471,10 +474,10 @@ def skip_run(self):
 
         now = timezone.now()
         try:
-            if self.requested_date.date() != now.date():
+            if self.requested_at.date() != now.date():
                 return True
         except AttributeError:
-            if self.requested_date != now.date():
+            if self.requested_at != now.date():
                 return True
         return False
 
@@ -503,7 +506,7 @@ def title(self) -> str:
             f"({east_africa_timezone})"
         )
 
-    def generate_report(self):
+    def _generate_report(self):
         """Generate reports."""
         from spw.generator.crop_insight import CropInsightFarmGenerator
         output = []

django_project/gap/tests/crop_insight/test_task_crop_insight.py

@@ -26,9 +26,9 @@ class CropInsideTaskRUDTest(TestCase):
     def test_today_reports(self):
         """Test query today reports."""
         now = timezone.now()
-        self.Factory(requested_date=now)
-        self.Factory(requested_date=now)
-        self.Factory(requested_date=now + datetime.timedelta(days=-1))
+        self.Factory(requested_at=now)
+        self.Factory(requested_at=now)
+        self.Factory(requested_at=now + datetime.timedelta(days=-1))
         self.assertEqual(CropInsightRequest.today_reports().count(), 2)
 
     @patch('gap.models.crop_insight.CropInsightRequest._generate_report')
@@ -147,7 +147,7 @@ def test_retry(self, mock_generate_report):
 
         # Report 8 is the older one
         report_8 = self.Factory(
-            requested_date=now + datetime.timedelta(days=-1)
+            requested_at=now + datetime.timedelta(days=-1)
         )
 
         # Below is older tasks