Skip to content

Commit

Permalink
Merge pull request #1605 from laws-africa/indigo-v2-to-v3
Browse files Browse the repository at this point in the history
Switch indigo api from v2 to v3
  • Loading branch information
nickmwangemi authored Nov 2, 2023
2 parents 55fc039 + fb29f03 commit ed63382
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 4 deletions.
5 changes: 3 additions & 2 deletions peachjam/adapters/adapters.py
Original file line number Diff line number Diff line change
Expand Up @@ -395,8 +395,9 @@ def fetch_relationships(self, imported_document, created_document):
object_work=amending_work,
)

if imported_document["commencements"]:
for commencement in imported_document["commencements"]:
commencements = created_document.commencements_json
if commencements:
for commencement in commencements:
if (
commencement["commencing_frbr_uri"]
and commencement["commencing_title"]
Expand Down
26 changes: 26 additions & 0 deletions peachjam/migrations/0108_update_ingestor_api_url.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# Generated by Django 3.2.19 on 2023-11-02 13:24
from django.db import migrations


def update_ingestor_api_url(apps, schema_editor):
"""Update the ingestor API URL to use the new API indigo v3."""
Ingestor = apps.get_model("peachjam", "Ingestor")
IngestorSetting = apps.get_model("peachjam", "IngestorSetting")

for ingestor in Ingestor.objects.all():
setting = IngestorSetting.objects.filter(
ingestor=ingestor, name="api_url"
).first()
if setting:
setting.value = "https://api.laws.africa/v3"
setting.save()


class Migration(migrations.Migration):
dependencies = [
("peachjam", "0107_delete_stubs_without_publication_documents"),
]

operations = [
migrations.RunPython(update_ingestor_api_url, migrations.RunPython.noop)
]
3 changes: 1 addition & 2 deletions peachjam/views/legislation.py
Original file line number Diff line number Diff line change
Expand Up @@ -235,8 +235,7 @@ def get_timeline(self):
# set publication_url
publication_date = work.get("publication_date")
if publication_date:
# TODO: update to v3 throughout
api_url = "https://api.laws.africa/v2/"
api_url = "https://api.laws.africa/v3/"
commons_url = "https://commons.laws.africa/"
publication_url = (work.get("publication_document") or {}).get("url")
if publication_url and api_url in publication_url:
Expand Down

0 comments on commit ed63382

Please sign in to comment.