Merge pull request #128 from odscjames/2023-12-06

Links to codelists - rewrite to OCDS Standard

Author: jpmckinney

cove_oc4ids/views.py

@@ -1,5 +1,6 @@
 import json
 import logging
+import re
 from decimal import Decimal
 
 from cove.views import cove_web_input_error, explore_data_context
@@ -84,6 +85,14 @@ def explore_oc4ids(request, pk):
 
     context = common_checks_oc4ids(context, upload_dir, json_data, schema_oc4ids, lib_cove_oc4ids_config)
 
+    for key in ("additional_closed_codelist_values", "additional_open_codelist_values"):
+        for path_string, codelist_info in context[key].items():
+            if codelist_info["codelist_url"].startswith(schema_oc4ids.codelists):
+                codelist_info["codelist_url"] = (
+                    "https://standard.open-contracting.org/infrastructure/latest/en/reference/codelists/#"
+                    + re.sub(r"([A-Z])", r"\1", codelist_info["codelist"].split(".")[0]).lower()
+                )
+
     if not db_data.rendered:
         db_data.rendered = True
     db_data.save()

requirements.txt

@@ -38,8 +38,6 @@ django-bootstrap3==15.0.0
     # via
     #   -r requirements.in
     #   libcoveweb
-django-environ==0.6.0
-    # via libcoveweb
 et-xmlfile==1.1.0
     # via openpyxl
 flattentool==0.24.0
@@ -70,7 +68,7 @@ libcoveoc4ids[perf]==0.4.2
     # via -r requirements.in
 libcoveocds==0.11.0
     # via libcoveoc4ids
-libcoveweb==0.26.0
+libcoveweb==0.30.1
     # via -r requirements.in
 lxml==4.9.1
     # via flattentool

requirements_dev.txt

@@ -73,10 +73,6 @@ django-bootstrap3==15.0.0
     # via
     #   -r requirements.txt
     #   libcoveweb
-django-environ==0.6.0
-    # via
-    #   -r requirements.txt
-    #   libcoveweb
 docopt==0.6.2
     # via coveralls
 et-xmlfile==1.1.0
@@ -138,7 +134,7 @@ libcoveocds==0.11.0
     # via
     #   -r requirements.txt
     #   libcoveoc4ids
-libcoveweb==0.26.0
+libcoveweb==0.30.1
     # via -r requirements.txt
 libsass==0.21.0
     # via -r requirements_dev.in

tests/fixtures/codelists.json

@@ -0,0 +1,24 @@
+{
+  "version": "0.9",
+  "uri": "https://standard.open-contracting.org/infrastructure/0.9/en/_static/example.json",
+  "publishedDate": "2018-12-10T15:53:00Z",
+  "publisher": {
+    "name": "Open Data Services Co-operative Limited",
+    "scheme": "GB-COH",
+    "uid": "9506232",
+    "uri": "http://data.companieshouse.gov.uk/doc/company/09506232"
+  },
+  "license": "http://opendatacommons.org/licenses/pddl/1.0/",
+  "publicationPolicy": "https://standard.open-contracting.org/1.1/en/implementation/publication_policy/",
+  "projects": [
+    {
+      "id": "proj1",
+      "status": "Bad news captain",
+      "sector": [
+        "little square buildings",
+        "pointy roofs"
+      ],
+      "type": "shiny and new"
+    }
+  ]
+}

tests/test_basic.py

@@ -1,3 +1,5 @@
+import os
+
 import pytest
 from cove.input.models import SuppliedData
 from django.core.files.base import ContentFile
@@ -21,3 +23,25 @@ def test_explore_page(client, json_data):
     data.current_app = "cove_oc4ids"
     resp = client.get(data.get_absolute_url())
     assert resp.status_code == 200
+
+
+@pytest.mark.django_db
+def test_codelist_url_extension_codelists(client):
+    file_name = os.path.join(
+        "tests",
+        "fixtures",
+        "codelists.json",
+    )
+    with open(os.path.join(file_name)) as fp:
+        user_data = fp.read()
+    data = SuppliedData.objects.create()
+    data.original_file.save("test.json", ContentFile(user_data))
+    data.current_app = "cove_oc4ids"
+    resp = client.get(data.get_absolute_url())
+
+    assert resp.status_code == 200
+    assert len(resp.context["additional_open_codelist_values"]) == 1
+    assert (
+        resp.context["additional_open_codelist_values"]["projects/sector"]["codelist_url"]
+        == "https://standard.open-contracting.org/infrastructure/latest/en/reference/codelists/#projectsector"
+    )