Fix the ActivityStream ingest

activity_stream/tests/test_utils.py

@@ -6,36 +6,63 @@
 from core.utils.boto import StaffSSOS3Ingest
 
 
+class TestStaffSSOS3Ingest(StaffSSOS3Ingest):
+    def get_files_to_ingest(self):
+        return ["1"]
+
+
 @pytest.mark.django_db
 class TestIngestStaffSsoS3:
     @override_settings(S3_LOCAL_ENDPOINT_URL=None)
     def test_no_items(self):
-        class Test1StaffSSOS3Ingest(StaffSSOS3Ingest):
+        class Test1StaffSSOS3Ingest(TestStaffSSOS3Ingest):
             def get_data_to_ingest(self):
                 return []
 
         ingest_staff_sso_s3(ingest_manager_class=Test1StaffSSOS3Ingest)
 
         assert ActivityStreamStaffSSOUser.objects.filter(available=True).count() == 0
 
+    @override_settings(S3_LOCAL_ENDPOINT_URL=None, APP_ENV="production")
+    def test_no_files(self, sso_user_factory):
+        class Test2StaffSSOS3Ingest(TestStaffSSOS3Ingest):
+            def get_files_to_ingest(self):
+                return []
+
+            def get_data_to_ingest(self):
+                assert False
+
+        ingest_staff_sso_s3(ingest_manager_class=Test2StaffSSOS3Ingest)
+
+        assert ActivityStreamStaffSSOUser.objects.filter(available=True).count() == 0
+
+        class Test3StaffSSOS3Ingest(TestStaffSSOS3Ingest):
+            def get_data_to_ingest(self):
+                yield sso_user_factory(1)
+                yield sso_user_factory(2)
+
+        ingest_staff_sso_s3(ingest_manager_class=Test3StaffSSOS3Ingest)
+
+        assert ActivityStreamStaffSSOUser.objects.filter(available=True).count() == 2
+
     @override_settings(S3_LOCAL_ENDPOINT_URL=None, APP_ENV="production")
     def test_some_items(self, sso_user_factory):
-        class Test2StaffSSOS3Ingest(StaffSSOS3Ingest):
+        class Test4StaffSSOS3Ingest(TestStaffSSOS3Ingest):
             def get_data_to_ingest(self):
                 yield sso_user_factory(1)
                 yield sso_user_factory(2)
                 yield sso_user_factory(3)
 
-        ingest_staff_sso_s3(ingest_manager_class=Test2StaffSSOS3Ingest)
+        ingest_staff_sso_s3(ingest_manager_class=Test4StaffSSOS3Ingest)
 
         assert ActivityStreamStaffSSOUser.objects.filter(available=True).count() == 3
 
-        class Test3StaffSSOS3Ingest(StaffSSOS3Ingest):
+        class Test5StaffSSOS3Ingest(TestStaffSSOS3Ingest):
             def get_data_to_ingest(self):
                 yield sso_user_factory(1)
                 yield sso_user_factory(2)
 
-        ingest_staff_sso_s3(ingest_manager_class=Test3StaffSSOS3Ingest)
+        ingest_staff_sso_s3(ingest_manager_class=Test5StaffSSOS3Ingest)
 
         assert ActivityStreamStaffSSOUser.objects.filter(available=True).count() == 2
         assert not ActivityStreamStaffSSOUser.objects.get(user_id=3).available

activity_stream/utils.py

@@ -51,6 +51,11 @@ def ingest_staff_sso_s3(ingest_manager_class=StaffSSOS3Ingest) -> None:
 
     created_updated_ids: list[int] = []
     ingest_manager = ingest_manager_class()
+
+    if not ingest_manager.get_files_to_ingest():
+        logger.info("ingest_staff_sso_s3: No files to ingest")
+        return
+
     for item in ingest_manager.get_data_to_ingest():
         created_updated_id = staff_sso_s3_to_db(item)
         created_updated_ids.append(created_updated_id)

manage.py

@@ -2,7 +2,6 @@
 import os
 import sys
 
-
 if __name__ == "__main__":
     os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings.prod")