move ratification models into peachjam

TODO: rename db table in africanlii
laws-africa · Oct 15, 2024 · 058050f · 058050f
1 parent a51b2a4
commit 058050f
Show file tree

Hide file tree

Showing 9 changed files with 159 additions and 8 deletions.
diff --git a/africanlii/admin.py b/africanlii/admin.py
@@ -6,12 +6,11 @@
     AfricanUnionInstitution,
     AfricanUnionOrgan,
     MemberState,
-    Ratification,
-    RatificationCountry,
     RegionalEconomicCommunity,
 )
 from africanlii.resources import RatificationResource
 from peachjam.admin import EntityProfileInline, ImportExportMixin
+from peachjam.models import Ratification, RatificationCountry
 
 
 class RatificationCountryAdmin(admin.TabularInline):

diff --git a/africanlii/forms.py b/africanlii/forms.py
@@ -1,8 +1,8 @@
 from dal import autocomplete
 from django import forms
 
-from africanlii.models import Ratification
 from peachjam.forms import BaseDocumentFilterForm
+from peachjam.models import Ratification
 
 
 class ESDocumentFilterForm(BaseDocumentFilterForm):

diff --git a/africanlii/migrations/0009_remove_ratificationcountry_country_and_more.py b/africanlii/migrations/0009_remove_ratificationcountry_country_and_more.py
@@ -0,0 +1,32 @@
+# Generated by Django 4.2.14 on 2024-10-15 14:21
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("africanlii", "0008_africanunioninstitution"),
+    ]
+
+    operations = [
+        migrations.SeparateDatabaseAndState(
+            database_operations=[],
+            state_operations=[
+                migrations.RemoveField(
+                    model_name="ratificationcountry",
+                    name="country",
+                ),
+                migrations.RemoveField(
+                    model_name="ratificationcountry",
+                    name="ratification",
+                ),
+                migrations.DeleteModel(
+                    name="Ratification",
+                ),
+                migrations.DeleteModel(
+                    name="RatificationCountry",
+                ),
+            ],
+        )
+    ]
diff --git a/africanlii/models/__init__.py b/africanlii/models/__init__.py
@@ -1,3 +1,2 @@
 # flake8: noqa
 from .au import *
-from .ratification import *
diff --git a/africanlii/resources.py b/africanlii/resources.py
@@ -1,8 +1,7 @@
 from countries_plus.models import Country
 from import_export import fields, resources, widgets
 
-from africanlii.models import Ratification, RatificationCountry
-from peachjam.models import Work
+from peachjam.models import Ratification, RatificationCountry, Work
 
 
 class RatificationField(widgets.ForeignKeyWidget):

diff --git a/africanlii/views/au.py b/africanlii/views/au.py
@@ -6,10 +6,9 @@
     AfricanUnionInstitution,
     AfricanUnionOrgan,
     MemberState,
-    RatificationCountry,
     RegionalEconomicCommunity,
 )
-from peachjam.models import CourtClass
+from peachjam.models import CourtClass, RatificationCountry
 from peachjam.views import AuthorDetailView, CoreDocument, PlaceDetailView
 
 

diff --git a/peachjam/migrations/0167_ratification_ratificationcountry_and_more.py b/peachjam/migrations/0167_ratification_ratificationcountry_and_more.py
@@ -0,0 +1,120 @@
+# Generated by Django 4.2.14 on 2024-10-15 14:21
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("countries_plus", "0005_auto_20160224_1804"),
+        ("peachjam", "0166_coredocument_ingestor"),
+    ]
+
+    operations = [
+        migrations.SeparateDatabaseAndState(
+            database_operations=[],
+            state_operations=[
+                migrations.CreateModel(
+                    name="Ratification",
+                    fields=[
+                        (
+                            "id",
+                            models.BigAutoField(
+                                auto_created=True,
+                                primary_key=True,
+                                serialize=False,
+                                verbose_name="ID",
+                            ),
+                        ),
+                        (
+                            "source_url",
+                            models.URLField(
+                                blank=True, null=True, verbose_name="source URL"
+                            ),
+                        ),
+                        (
+                            "last_updated",
+                            models.DateField(
+                                blank=True, null=True, verbose_name="last updated"
+                            ),
+                        ),
+                        (
+                            "work",
+                            models.OneToOneField(
+                                on_delete=django.db.models.deletion.CASCADE,
+                                related_name="ratification",
+                                to="peachjam.work",
+                                verbose_name="work",
+                            ),
+                        ),
+                    ],
+                    options={
+                        "verbose_name": "ratification",
+                        "verbose_name_plural": "ratifications",
+                    },
+                ),
+                migrations.CreateModel(
+                    name="RatificationCountry",
+                    fields=[
+                        (
+                            "id",
+                            models.BigAutoField(
+                                auto_created=True,
+                                primary_key=True,
+                                serialize=False,
+                                verbose_name="ID",
+                            ),
+                        ),
+                        (
+                            "ratification_date",
+                            models.DateField(
+                                blank=True, null=True, verbose_name="ratification date"
+                            ),
+                        ),
+                        (
+                            "deposit_date",
+                            models.DateField(
+                                blank=True, null=True, verbose_name="deposit date"
+                            ),
+                        ),
+                        (
+                            "signature_date",
+                            models.DateField(
+                                blank=True, null=True, verbose_name="signature date"
+                            ),
+                        ),
+                        (
+                            "country",
+                            models.ForeignKey(
+                                on_delete=django.db.models.deletion.CASCADE,
+                                to="countries_plus.country",
+                                verbose_name="country",
+                            ),
+                        ),
+                        (
+                            "ratification",
+                            models.ForeignKey(
+                                on_delete=django.db.models.deletion.CASCADE,
+                                related_name="countries",
+                                to="peachjam.ratification",
+                                verbose_name="ratification",
+                            ),
+                        ),
+                    ],
+                    options={
+                        "verbose_name": "ratification country",
+                        "verbose_name_plural": "ratification countries",
+                        "ordering": ["country__name"],
+                    },
+                ),
+                migrations.AddConstraint(
+                    model_name="ratificationcountry",
+                    constraint=models.UniqueConstraint(
+                        fields=("ratification", "country"),
+                        name="unique_ratification_country",
+                    ),
+                ),
+            ],
+        )
+    ]
diff --git a/peachjam/models/__init__.py b/peachjam/models/__init__.py
@@ -10,6 +10,7 @@
 from .journals_books import *
 from .judgment import *
 from .profile import *
+from .ratification import *
 from .relationships import *
 from .save_document import *
 from .settings import *

diff --git a/africanlii/models/ratification.py → peachjam/models/ratification.py b/africanlii/models/ratification.py → peachjam/models/ratification.py
@@ -21,6 +21,7 @@ class Ratification(models.Model):
     class Meta:
         verbose_name = _("ratification")
         verbose_name_plural = _("ratifications")
+        db_table = "africanlii_ratification"
 
     @cached_property
     def n_ratified(self):
@@ -62,6 +63,7 @@ class Meta:
         verbose_name = _("ratification country")
         verbose_name_plural = _("ratification countries")
         ordering = ["country__name"]
+        db_table = "africanlii_ratificationcountry"
 
         constraints = [
             models.UniqueConstraint(