ds-caselaw-marklogic-api-client 41.0.0__tar.gz → 41.1.1__tar.gz

{ds_caselaw_marklogic_api_client-41.0.0 → ds_caselaw_marklogic_api_client-41.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: ds-caselaw-marklogic-api-client
-Version: 41.0.0
+Version: 41.1.1
 Summary: An API client for interacting with the underlying data in Find Caselaw.
 Keywords: national archives,caselaw
 Author: The National Archives

{ds_caselaw_marklogic_api_client-41.0.0 → ds_caselaw_marklogic_api_client-41.1.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "ds-caselaw-marklogic-api-client"
-version = "41.0.0"
+version = "41.1.1"
 description = "An API client for interacting with the underlying data in Find Caselaw."
 authors = ["The National Archives"]
 homepage = "https://github.com/nationalarchives/ds-caselaw-custom-api-client"
@@ -33,13 +33,13 @@ defusedxml = "^0.7.1"
 
 [tool.poetry.group.dev.dependencies]
 coverage = "7.10.6"
-pytest = "8.4.1"
-pytest-cov = "6.2.1"
+pytest = "8.4.2"
+pytest-cov = "6.3.0"
 beautifulsoup4 = "4.13.5"
 responses = "0.25.8"
 python-dotenv = "1.1.1"
 time-machine = "2.19.0"
-moto = {version = "5.1.11", extras = ["all"]}
+moto = {version = "5.1.12", extras = ["all"]}
 
 [tool.poetry.group.docs]
 optional = true

{ds_caselaw_marklogic_api_client-41.0.0 → ds_caselaw_marklogic_api_client-41.1.1}/src/caselawclient/factories.py

@@ -61,6 +61,8 @@ class DocumentFactory:
         "source_name": "Example Uploader",
         "source_email": "uploader@example.com",
         "consignment_reference": "TDR-12345",
+        "first_published_datetime": None,
+        "has_ever_been_published": False,
         "assigned_to": "",
         "versions": [],
     }

{ds_caselaw_marklogic_api_client-41.0.0 → ds_caselaw_marklogic_api_client-41.1.1}/src/caselawclient/models/documents/__init__.py

@@ -312,10 +312,37 @@ class Document:
 
     @cached_property
     def first_published_datetime(self) -> Optional[datetime.datetime]:
+        """
+        Return the database value for the date and time this document was first published.
+
+        :return: The datetime value in the database for "first published".
+        """
         return self.api_client.get_datetime_property(self.uri, "first_published_datetime")
 
+    @cached_property
+    def first_published_datetime_display(self) -> Optional[datetime.datetime]:
+        """
+        Return the display value for the date and time this document was first published.
+
+        A value of 1970-01-01 00:00 indicates that the document has been published previously, but the exact date and time is unknown. In this case, return `None`. This can be used alongside `has_ever_been_published` to indicate an "unknown" state.
+
+        :return: The datetime value to be displayed to end users for "first published".
+        """
+
+        if self.first_published_datetime == datetime.datetime(1970, 1, 1, 0, 0, tzinfo=datetime.timezone.utc):
+            return None
+
+        return self.first_published_datetime
+
     @cached_property
     def has_ever_been_published(self) -> bool:
+        """
+        Do we consider this document to have ever been published?
+
+        This is `True` if either the document is currently published, or if `first_published_datetime` has any value (including the sentinel value).
+
+        :return: A boolean indicating if the document has ever been published.
+        """
         return self.is_published or self.first_published_datetime is not None
 
     @cached_property

{ds_caselaw_marklogic_api_client-41.0.0 → ds_caselaw_marklogic_api_client-41.1.1}/src/caselawclient/xquery/check_content_hash_unique_by_uri.xqy

@@ -5,5 +5,11 @@ declare variable $uri as xs:string external;
 
 let $doc := doc($uri)
 let $hash := $doc//uk:hash/text()
-let $count := count(cts:search(fn:doc(), cts:element-value-query(xs:QName("uk:hash"), $hash)))
-return $count = 1
+let $count := count(cts:uris(
+  (), (),
+  cts:and-query((
+    cts:element-value-query(xs:QName("uk:hash"), $hash),
+    cts:collection-query("http://marklogic.com/collections/dls/latest-version")
+  ))
+))
+return $count