Merge pull request #3996 from NicholasTurner23/update-fix/Analytics-data-export-cleanup

Update fix/analytics data export cleanup

Author: Baalmart

src/analytics/api/views/data.py

@@ -99,7 +99,10 @@ def post(self):
                 json_data
             )
             if error_message:
-                return error_message, AirQoRequests.Status.HTTP_400_BAD_REQUEST
+                return (
+                    AirQoRequests.create_response(error_message, success=False),
+                    AirQoRequests.Status.HTTP_400_BAD_REQUEST,
+                )
         except Exception as e:
             logger.exception(f"An error has occured; {e}")
 
@@ -189,7 +192,7 @@ def post(self):
             logger.exception(f"An error occurred: {ex}")
             return (
                 AirQoRequests.create_response(
-                    f"An Error occurred while processing your request. Please contact support. {ex}",
+                    f"An Error occurred while processing your request. Please contact support.",
                     success=False,
                 ),
                 AirQoRequests.Status.HTTP_500_INTERNAL_SERVER_ERROR,
@@ -209,8 +212,9 @@ def _get_validated_filter(self, json_data):
         Raises:
             ValueError: If more than one or none of the filters are provided.
         """
-        error_message: str = ""
+        filter_type: str = None
         validated_data: List[str] = None
+        error_message: str = ""
 
         # TODO Lias with device registry to cleanup this makeshift implementation
         devices = ["devices", "device_ids", "device_names"]
@@ -227,9 +231,9 @@ def _get_validated_filter(self, json_data):
         ]
         provided_filters = [key for key in valid_filters if json_data.get(key)]
         if len(provided_filters) != 1:
-            raise ValueError(
-                "Specify exactly one of 'airqlouds', 'sites', 'device_names', or 'devices' in the request body."
-            )
+            error_message = "Specify exactly one of 'airqlouds', 'sites', 'device_names', or 'devices' in the request body."
+            return filter_type, validated_data, error_message
+
         filter_type = provided_filters[0]
         filter_value = json_data.get(filter_type)
 
@@ -246,7 +250,9 @@ def _get_validated_filter(self, json_data):
                 "sites" if filter_type in sites else "devices", []
             )
         else:
-            error_message = validated_value.get("message", "Validation failed")
+            error_message = validated_value.get(
+                "message", "Data filter validation failed"
+            )
 
         return filter_type, validated_data, error_message