Fix date validator

Author: moisses89

safe_transaction_service/history/serializers.py

@@ -1343,6 +1343,11 @@ class SafeDeploymentSerializer(serializers.Serializer):
     contracts = SafeDeploymentContractSerializer(many=True)
 
 
+class SafeExportTransactionRequestParams(serializers.Serializer):
+    execution_date__gte = serializers.DateTimeField(required=False, allow_null=True)
+    execution_date__lte = serializers.DateTimeField(required=False, allow_null=True)
+
+
 class SafeExportTransactionSerializer(serializers.Serializer):
     """
     Serializer for the export endpoint that returns transaction data optimized for CSV export

safe_transaction_service/history/tests/test_views_v2.py

@@ -2,6 +2,7 @@
 import json
 from unittest import mock
 from unittest.mock import MagicMock
+from urllib.parse import urlencode
 
 from django.contrib.auth import get_user_model
 from django.contrib.auth.models import Permission
@@ -2684,9 +2685,9 @@ def test_safe_export_view(self):
 
         # Test date filtering
         future_date = timezone.now() + datetime.timedelta(days=1)
+        params = urlencode({"execution_date__gte": future_date.isoformat()})
         response = self.client.get(
-            reverse("v2:history:safe-export", args=(safe_address,))
-            + f"?execution_date__gte={future_date.isoformat()}",
+            reverse("v2:history:safe-export", args=(safe_address,)) + f"?{params}",
             format="json",
         )
         self.assertEqual(response.status_code, status.HTTP_200_OK)

safe_transaction_service/history/views_v2.py

@@ -1,10 +1,8 @@
 import hashlib
 import logging
-from datetime import datetime
 from typing import Optional
 
 from django.db.models import Q
-from django.utils import timezone
 
 import django_filters
 from drf_spectacular.types import OpenApiTypes
@@ -28,6 +26,7 @@
 from .cache import CacheSafeTxsView, cache_txs_view_for_address
 from .models import MultisigTransaction, SafeContract, SafeContractDelegate
 from .pagination import DummyPagination
+from .serializers import SafeExportTransactionRequestParams
 from .services import BalanceServiceProvider, TransactionServiceProvider
 from .services.balance_service import Balance
 from .services.collectibles_service import CollectiblesServiceProvider
@@ -682,6 +681,17 @@ class SafeExportView(GenericAPIView):
     serializer_class = serializers.SafeExportTransactionSerializer
     pagination_class = pagination.ListPagination
 
+    def get_query_params(self):
+        serializer = SafeExportTransactionRequestParams(
+            data=self.request.query_params.dict()
+        )
+        serializer.is_valid(raise_exception=True)
+
+        validated_data = serializer.validated_data
+        parsed_execution_date_gte = validated_data.get("execution_date__gte")
+        parsed_execution_date_lte = validated_data.get("execution_date__lte")
+        return parsed_execution_date_gte, parsed_execution_date_lte
+
     def get(self, request, address):
         """
         Get transactions optimized for CSV export with transfer information.
@@ -703,67 +713,14 @@ def get(self, request, address):
         except SafeContract.DoesNotExist:
             return Response(status=status.HTTP_404_NOT_FOUND)
 
-        # Parse query parameters
-        execution_date_gte = request.query_params.get("execution_date__gte")
-        execution_date_lte = request.query_params.get("execution_date__lte")
+        # Get query params
+        parsed_execution_date_gte, parsed_execution_date_lte = self.get_query_params()
+
+        # Get pagination
         paginator = pagination.ListPagination(self.request, max_limit=1000)
         limit = paginator.get_limit(request)
         offset = paginator.get_offset(request)
 
-        # Parse dates if provided
-        parsed_execution_date_gte = None
-        parsed_execution_date_lte = None
-
-        if execution_date_gte:
-            try:
-                # Handle different ISO format variations
-                date_str = execution_date_gte.replace("Z", "+00:00")
-                # Fix format issue where timezone offset has space instead of +
-                if " " in date_str:  # e.g., '2025-07-08T19:22:21.558887 00:00'
-                    parts = date_str.rsplit(" ", 1)
-                    if (
-                        len(parts) == 2 and ":" in parts[1] and len(parts[1]) == 5
-                    ):  # timezone format like '00:00'
-                        date_str = parts[0] + "+" + parts[1]
-                parsed_execution_date_gte = datetime.fromisoformat(date_str)
-                # Ensure timezone-aware
-                if parsed_execution_date_gte.tzinfo is None:
-                    parsed_execution_date_gte = timezone.make_aware(
-                        parsed_execution_date_gte
-                    )
-            except ValueError:
-                return Response(
-                    status=status.HTTP_400_BAD_REQUEST,
-                    data={
-                        "error": "Invalid execution_date__gte format. Use ISO format."
-                    },
-                )
-
-        if execution_date_lte:
-            try:
-                # Handle different ISO format variations
-                date_str = execution_date_lte.replace("Z", "+00:00")
-                # Fix format issue where timezone offset has space instead of +
-                if " " in date_str:  # e.g., '2025-07-08T19:22:21.558887 00:00'
-                    parts = date_str.rsplit(" ", 1)
-                    if (
-                        len(parts) == 2 and ":" in parts[1] and len(parts[1]) == 5
-                    ):  # timezone format like '00:00'
-                        date_str = parts[0] + "+" + parts[1]
-                parsed_execution_date_lte = datetime.fromisoformat(date_str)
-                # Ensure timezone-aware
-                if parsed_execution_date_lte.tzinfo is None:
-                    parsed_execution_date_lte = timezone.make_aware(
-                        parsed_execution_date_lte
-                    )
-            except ValueError:
-                return Response(
-                    status=status.HTTP_400_BAD_REQUEST,
-                    data={
-                        "error": "Invalid execution_date__lte format. Use ISO format."
-                    },
-                )
-
         # Get transactions from service
         transaction_service = TransactionServiceProvider()
         transactions, total_count = transaction_service.get_export_transactions(