unit tests

koku/masu/database/report_manifest_db_accessor.py

@@ -245,14 +245,6 @@ def mark_s3_parquet_cleared(self, manifest: CostUsageReportManifest, report_key:
             update_fields = ["s3_parquet_cleared"]
         manifest.save(update_fields=update_fields)
 
-    def mark_s3_parquet_to_be_cleared(self, manifest_id):
-        """Mark manifest to clear parquet files."""
-        manifest = self.get_manifest_by_id(manifest_id)
-        if manifest:
-            # Set this to false to reprocesses a full month of files for AWS/Azure
-            manifest.s3_parquet_cleared = False
-            manifest.save(update_fields=["s3_parquet_cleared"])
-
     def set_manifest_daily_start_date(self, manifest_id, date):
         """
         Mark manifest processing daily archive start date.

koku/masu/test/database/test_report_manifest_db_accessor.py

@@ -182,33 +182,21 @@ def test_get_s3_parquet_cleared_no_manifest(self):
         status = self.manifest_accessor.get_s3_parquet_cleared(None)
         self.assertFalse(status)
 
-    def test_get_s3_parquet_cleared_non_ocp(self):
-        """Test that s3 CSV clear status is reported."""
-        status = self.manifest_accessor.get_s3_parquet_cleared(self.manifest)
-        self.assertTrue(status)
-
-        self.manifest_accessor.mark_s3_parquet_to_be_cleared(self.manifest.id)
-        fetch_manifest = self.manifest_accessor.get_manifest_by_id(self.manifest.id)
-
-        status = self.manifest_accessor.get_s3_parquet_cleared(fetch_manifest)
-        self.assertFalse(status)
-
     def test_get_s3_parquet_cleared_ocp_no_key(self):
         """Test that s3 CSV clear status is reported."""
         self.manifest_dict["cluster_id"] = "cluster_id"
         self.manifest_dict["assembly_id"] = uuid.uuid4()
         manifest = self.baker.make("CostUsageReportManifest", **self.manifest_dict)
         status = self.manifest_accessor.get_s3_parquet_cleared(manifest)
-        self.assertTrue(status)
+        self.assertFalse(status)
 
-        self.manifest_accessor.mark_s3_parquet_to_be_cleared(manifest.id)
-        fetch_manifest = self.manifest_accessor.get_manifest_by_id(manifest.id)
+        self.manifest_accessor.mark_s3_parquet_cleared(manifest)
 
-        self.assertDictEqual(fetch_manifest.s3_parquet_cleared_tracker, {})
-        self.assertFalse(fetch_manifest.s3_parquet_cleared)
+        self.assertDictEqual(manifest.s3_parquet_cleared_tracker, {})
+        self.assertTrue(manifest.s3_parquet_cleared)
 
-        status = self.manifest_accessor.get_s3_parquet_cleared(fetch_manifest)
-        self.assertFalse(status)
+        status = self.manifest_accessor.get_s3_parquet_cleared(manifest)
+        self.assertTrue(status)
 
     def test_get_s3_parquet_cleared_ocp_with_key(self):
         """Test that s3 CSV clear status is reported."""
@@ -222,7 +210,7 @@ def test_get_s3_parquet_cleared_ocp_with_key(self):
         self.manifest_accessor.mark_s3_parquet_cleared(manifest, key)
 
         self.assertDictEqual(manifest.s3_parquet_cleared_tracker, {key: True})
-        self.assertTrue(manifest.s3_parquet_cleared)
+        self.assertFalse(manifest.s3_parquet_cleared)
 
         status = self.manifest_accessor.get_s3_parquet_cleared(manifest, key)
         self.assertTrue(status)

koku/masu/util/aws/common.py

@@ -870,8 +870,9 @@ def clear_s3_files(
                     exc_info=err,
                 )
     delete_s3_objects(request_id, to_delete, context)
-    manifest = ReportManifestDBAccessor().get_manifest_by_id(manifest_id)
-    ReportManifestDBAccessor().mark_s3_parquet_cleared(manifest)
+    manifest_accessor = ReportManifestDBAccessor()
+    manifest = manifest_accessor.get_manifest_by_id(manifest_id)
+    manifest_accessor.mark_s3_parquet_cleared(manifest)
 
 
 def remove_files_not_in_set_from_s3_bucket(request_id, s3_path, manifest_id, context=None):