fix(api): Solved merge conflicts after updating branch.

freelawproject · May 14, 2024 · 2650a4a · 2650a4a
1 parent 2ed601e
commit 2650a4a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/cl/search/api_serializers.py b/cl/search/api_serializers.py
@@ -617,8 +617,8 @@ class Meta:
 class PersonESResultSerializer(DocumentSerializer):
     """The serializer for Person Search results."""
 
-    dob = DateField(read_only=True)
-    dod = DateField(read_only=True)
+    dob = CoerceDateField(read_only=True)
+    dod = CoerceDateField(read_only=True)
     date_created = serializers.DateTimeField(
         read_only=True, default_timezone=timezone.utc
     )

diff --git a/cl/search/api_views.py b/cl/search/api_views.py
@@ -22,8 +22,8 @@
     OpinionsCitedSerializer,
     OpinionSerializer,
     OriginalCourtInformationSerializer,
-    RECAPDocumentSerializer,
     PersonESResultSerializer,
+    RECAPDocumentSerializer,
     RECAPESResultSerializer,
     SearchResultSerializer,
     TagSerializer,