Fix: Cannot set omitMapResults when downloadAsCSV is true

Use df.drop instead of del with the pandas dataframe
hotosm · Aug 19, 2024 · db96a47 · db96a47
1 parent 760c656
commit db96a47
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/backend/api/projects/resources.py b/backend/api/projects/resources.py
@@ -700,6 +700,11 @@ def get(self):
 
             search_dto = self.setup_search_dto()
 
+            if search_dto.omit_map_results and search_dto.download_as_csv:
+                return {
+                    "Error": "omitMapResults and downloadAsCSV cannot be both set to true"
+                }, 400
+
             if (
                 search_dto.partnership_from is not None
                 or search_dto.partnership_to is not None

diff --git a/backend/services/project_search_service.py b/backend/services/project_search_service.py
@@ -215,11 +215,17 @@ def search_projects_as_csv(search_dto: ProjectSearchDTO, user) -> str:
         ]
 
         df = pd.json_normalize(results_as_dto)
-
-        del df["locale"]
-        del df["shortDescription"]
-        del df["organisationLogo"]
-        del df["campaigns"]
+        df.drop(
+            columns=[
+                "locale",
+                "shortDescription",
+                "organisationName",
+                "organisationLogo",
+                "campaigns",
+            ],
+            inplace=True,
+            axis=1,
+        )
 
         return df.to_csv(index=False)