feat(test): Add changes on e2e testing for find project

Author: susilnem

apps/common/utils.py

@@ -72,19 +72,19 @@ def compare_csv_files(
             gzip.GzipFile(fileobj=file, mode="rb") as gz,
             io.TextIOWrapper(gz, encoding="utf-8") as text_stream,
         ):
-            actual_data = list(csv.DictReader(text_stream))
+            generated_data = list(csv.DictReader(text_stream))
     else:
         with project_asset.file.open(mode="r") as file:
-            actual_data = list(csv.DictReader(file))
+            generated_data = list(csv.DictReader(file))
 
     with expected_csv_path.open(mode="r", newline="", encoding="utf-8") as file:
         expected_data = list(csv.DictReader(file))
 
     if keys_to_ignore:
-        actual_data = remove_object_keys(actual_data, keys_to_ignore)
+        generated_data = remove_object_keys(generated_data, keys_to_ignore)
         expected_data = remove_object_keys(expected_data, keys_to_ignore)
 
-    assert actual_data == expected_data, message
+    assert generated_data == expected_data, message
 
 
 def compare_geojson_files(
@@ -104,16 +104,16 @@ def compare_geojson_files(
             gzip.GzipFile(fileobj=file, mode="rb") as gz,
             io.TextIOWrapper(gz, encoding="utf-8") as text_stream,
         ):
-            actual_data = json.load(text_stream)
+            generated_data = json.load(text_stream)
     else:
-        with project_asset.file.open("r", encoding="utf-8") as file:
-            actual_data = json.load(file)
+        with project_asset.file.open("r") as file:
+            generated_data = json.load(file)
 
     with expected_geojson_path.open("r", encoding="utf-8") as file:
         expected_data = json.load(file)
 
     if keys_to_ignore:
-        actual_data = remove_object_keys(actual_data, keys_to_ignore)
+        generated_data = remove_object_keys(generated_data, keys_to_ignore)
         expected_data = remove_object_keys(expected_data, keys_to_ignore)
 
-    assert actual_data == expected_data, message
+    assert generated_data == expected_data, message

apps/project/tests/e2e_create_project_tile_map_service_test.py

@@ -640,6 +640,11 @@ def _test_project(self, projectKey: str, filename: str):
             aggregated_results_project_asset,
             aggregated_results_filename,
             is_gzip_file=True,
+            keys_to_ignore={
+                "project_internal_id",
+                "group_internal_id",
+                "task_internal_id",
+            },
             message="Difference found for aggregated results export file.",
         )
 
@@ -653,10 +658,20 @@ def _test_project(self, projectKey: str, filename: str):
         if not aggregated_results_with_geometry_project_asset:
             raise AssertionError("Aggregated results with geometry project asset not found")
 
+        expected_aggregated_results_with_geometry_filename = Path(
+            settings.BASE_DIR,
+            test_data["expected_project_exports_data"]["aggregated_results_with_geometry"],
+        )
         compare_geojson_files(
             aggregated_results_with_geometry_project_asset,
-            test_data["expected_project_exports_data"]["aggregated_results_with_geometry"],
+            expected_aggregated_results_with_geometry_filename,
             is_gzip_file=True,
+            keys_to_ignore={
+                "name",
+                "project_internal_id",
+                "group_internal_id",
+                "task_internal_id",
+            },
             message="Difference found for aggregated results with geometry export file.",
         )
 
@@ -670,10 +685,20 @@ def _test_project(self, projectKey: str, filename: str):
         if not results_project_asset:
             raise AssertionError("Results project asset not found")
 
+        results_filename = Path(settings.BASE_DIR) / test_data["expected_project_exports_data"]["results"]
         compare_csv_files(
             results_project_asset,
-            test_data["expected_project_exports_data"]["results"],
+            results_filename,
             is_gzip_file=True,
+            keys_to_ignore={
+                "project_internal_id",
+                "group_internal_id",
+                "task_internal_id",
+                "user_internal_id",
+                "timestamp",
+                "start_time",
+                "end_time",
+            },
             message="Difference found for results export file.",
         )
         # NOTE: Test HISTORY
@@ -683,13 +708,13 @@ def _test_project(self, projectKey: str, filename: str):
             export_type=ProjectAssetExportTypeEnum.HISTORY,
         ).first()
 
+        history_filename = Path(settings.BASE_DIR) / test_data["expected_project_exports_data"]["history"]
         if not history_project_asset:
             raise AssertionError("History project asset not found")
 
         compare_csv_files(
             history_project_asset,
-            test_data["expected_project_exports_data"]["history"],
-            is_gzip_file=True,
+            history_filename,
             message="Difference found for history export file.",
         )
 
@@ -702,11 +727,15 @@ def _test_project(self, projectKey: str, filename: str):
 
         if not groups_project_asset:
             raise AssertionError("Groups project asset not found")
-
+        groups_filename = Path(settings.BASE_DIR) / test_data["expected_project_exports_data"]["groups"]
         compare_csv_files(
             groups_project_asset,
-            test_data["expected_project_exports_data"]["groups"],
+            groups_filename,
             is_gzip_file=True,
+            keys_to_ignore={
+                "project_internal_id",
+                "group_internal_id",
+            },
             message="Difference found for groups export file.",
         )
 
@@ -719,11 +748,16 @@ def _test_project(self, projectKey: str, filename: str):
 
         if not tasks_project_asset:
             raise AssertionError("Tasks project asset not found")
-
+        tasks_filename = Path(settings.BASE_DIR) / test_data["expected_project_exports_data"]["tasks"]
         compare_csv_files(
             tasks_project_asset,
-            test_data["expected_project_exports_data"]["tasks"],
+            tasks_filename,
             is_gzip_file=True,
+            keys_to_ignore={
+                "project_internal_id",
+                "group_internal_id",
+                "task_internal_id",
+            },
             message="Difference found for tasks export file.",
         )
 
@@ -736,10 +770,10 @@ def _test_project(self, projectKey: str, filename: str):
 
         if not users_project_asset:
             raise AssertionError("Users project asset not found")
-
+        users_filename = Path(settings.BASE_DIR) / test_data["expected_project_exports_data"]["users"]
         compare_csv_files(
             users_project_asset,
-            test_data["expected_project_exports_data"]["users"],
+            users_filename,
             is_gzip_file=True,
             message="Difference found for users export file.",
         )
@@ -753,16 +787,21 @@ def _test_project(self, projectKey: str, filename: str):
 
         if not aoi_project_asset:
             raise AssertionError("AOI Geometry project asset not found")
-
+        aoi_geometry_export_filename = Path(
+            settings.BASE_DIR,
+            test_data["expected_project_exports_data"]["area_of_interest"],
+        )
         compare_geojson_files(
             aoi_project_asset,
-            aoi_geometry_filename,
+            aoi_geometry_export_filename,
             message="Difference found for AOI Geometry export file.",
         )
 
         # NOTE: TEST HOT TASKING MANAGER GEOMETRY
-        if "hot_tasking_manager_aoi" in test_data["assets"]:
-            htm_aoi_filename = Path(settings.BASE_DIR) / test_data["assets"]["hot_tasking_manager_aoi"]
+        if "hot_tasking_manager_geometry" in test_data["expected_project_exports_data"]:
+            htm_aoi_filename = (
+                Path(settings.BASE_DIR) / test_data["expected_project_exports_data"]["hot_tasking_manager_geometry"]
+            )
             htm_aoi_project_asset = ProjectAsset.objects.filter(
                 project=project,
                 type=AssetTypeEnum.EXPORT,