Merge pull request #2032 from laws-africa/gazettes-fix

don't force a sub-type on gazettes

peachjam/adapters/gazettes.py

@@ -90,7 +90,6 @@ def update_document(self, url):
             "frbr_uri_actor": frbr_uri.actor,
             "frbr_uri_number": frbr_uri.number,
             "frbr_uri_date": frbr_uri.date,
-            "nature": None,  # see https://github.com/laws-africa/gazettemachine/issues/172
             "language": language,
             "date": date.fromisoformat(document["date"]),
             "title": document["name"],

peachjam/models/gazette.py

@@ -32,11 +32,6 @@ class Meta(CoreDocument.Meta):
         verbose_name_plural = _("gazettes")
         permissions = [("api_gazette", "API gazette access")]
 
-    def set_frbr_uri_subtype(self):
-        # preserve the existing subtype if nature is not set
-        if self.nature:
-            self.frbr_uri_subtype = self.nature.code
-
     def pre_save(self):
         self.frbr_uri_doctype = "officialGazette"
         self.doc_type = "gazette"

peachjam/tests/test_documents.py

@@ -1,12 +1,21 @@
 from datetime import date
 
+from cobalt.uri import FrbrUri
 from django.test import TestCase
 
-from peachjam.models import Book, CoreDocument, Country, Journal, Language
+from peachjam.models import (
+    Book,
+    CoreDocument,
+    Country,
+    Gazette,
+    Journal,
+    Language,
+    get_country_and_locality,
+)
 
 
 class CoreDocumentTestCase(TestCase):
-    fixtures = ["tests/countries", "documents/sample_documents"]
+    fixtures = ["tests/countries", "tests/languages", "documents/sample_documents"]
 
     def test_document_text_from_html(self):
         doc = CoreDocument.objects.get(
@@ -116,3 +125,28 @@ def test_clean_content_html(self):
         self.assertEqual(
             doc.clean_content_html("""<div>test</div>"""), """<div>test</div>"""
         )
+
+    def test_gazette(self):
+        frbr_uri = FrbrUri.parse(
+            "/akn/za/officialGazette/provincial-gazette/2024-09-13/3585/eng@2024-09-13"
+        )
+        country, locality = get_country_and_locality("za")
+
+        gazette = Gazette.objects.create(
+            **{
+                "expression_frbr_uri": frbr_uri.expression_uri(),
+                "jurisdiction": country,
+                "locality": locality,
+                "frbr_uri_doctype": frbr_uri.doctype,
+                "frbr_uri_subtype": frbr_uri.subtype,
+                "frbr_uri_actor": frbr_uri.actor,
+                "frbr_uri_number": frbr_uri.number,
+                "frbr_uri_date": frbr_uri.date,
+                "language": Language.objects.get(pk="en"),
+                "date": date.fromisoformat("2024-09-13"),
+                "title": "gazette title",
+                "publication": "Provincial Gazette",
+                "key": "key",
+            }
+        )
+        self.assertEqual(frbr_uri.expression_uri(), gazette.expression_frbr_uri)