Merge branch 'upgrade-orgreg' into 'master'

Upgrade orgreg client

See merge request !359

greg/importers/orgreg.py

@@ -12,7 +12,7 @@ orgreg/v3/ as the url argument (note the trailing slash).
 """
 import datetime
 import logging
-from typing import Mapping, Optional, Union
+from typing import Mapping, Optional, Union, Any
 
 from django.conf import settings
 import orgreg_client
@@ -167,7 +167,9 @@ class OrgregImporter:
             )
 
     def _get_or_create_and_set_values(
-        self, ou: OrgUnit, values: Mapping[str, Union[str, int, bool]]
+        self,
+        ou: OrgUnit,
+        values: Mapping[str, Union[str, int, bool, OrganizationalUnit]],
     ):
         """Upsert ou with latest values and store in processed dict."""
 
@@ -215,8 +217,7 @@ class OrgregImporter:
         # parent)
         if ou.ou_id in self.processed:
             return
-
-        values = {"deleted": False}
+        values: dict[str, Any] = {"deleted": False}
         # add names if present
         if ou.name:
             if ou.name.nob:

greg/tests/management/test_import_from_orgreg.py

@@ -4,7 +4,7 @@ import pytest
 from django.core.management import call_command
 from django.test import override_settings
 from django_q.models import Schedule
-from orgreg_client.models import OrgUnit
+from orgreg_client.models import OrgUnit, ExternalKey, LocalisedValue
 
 from greg.importers.orgreg import OrgregImporter, OrganizationalUnit
 from greg.models import OuIdentifier
@@ -16,9 +16,21 @@ def org_unit():
         ou_id=1,
         valid_from=datetime.date(year=2020, month=2, day=6),
         external_keys=[
-            {"type": "legacy_stedkode", "source_system": "sapuio", "value": "1"}
+            ExternalKey(type="legacy_stedkode", source_system="sapuio", value="1")
         ],
-        shortname={"nob": "FOO"},
+        short_name=LocalisedValue(nob="FOO", sme=None, nno=None, eng=None),
+        start_date=None,
+        category=None,
+        valid_to=None,
+        end_date=None,
+        email=None,
+        note=None,
+        postal_address=None,
+        visit_address=None,
+        building=None,
+        phone=None,
+        fax=None,
+        parent=None,
     )
     return org_unit
 
@@ -37,6 +49,7 @@ def test_upsert_extra_identities(org_unit):
     organizational_unit = OrganizationalUnit.objects.create(
         name_nb="foo_nb", name_en="foo_en"
     )
+
     org_importer = OrgregImporter()
     org_importer.processed[org_unit.ou_id] = organizational_unit
     org_importer.upsert_extra_identities(org_unit)

gregsite/settings/testing.py

@@ -23,7 +23,7 @@ ORGREG_CLIENT = {
     "headers": {"X-Gravitee-Api-Key": "foo"},
 }
 ORGREG_EXTRA_IDS = [
-    {"fieldname": "shortname", "subfield": "nob"},
+    {"fieldname": "short_name", "subfield": "nob"},
     {"type": "legacy_stedkode", "source": "sapuio"},
 ]
 ORGREG_ACRONYMS = []

gregui/tests/conftest.py

@@ -85,7 +85,7 @@ def unit_bar() -> OrganizationalUnit:
 def unit_foo3() -> OrganizationalUnit:
     ou = OrganizationalUnit.objects.create(name_en="foo_unit3")
     OuIdentifier.objects.create(
-        source="orgreg", name="shortname", value="FOO", orgunit=ou
+        source="orgreg", name="short_name", value="FOO", orgunit=ou
     )
     OuIdentifier.objects.create(
         source="sapuio", name="legacy_stedkode", value="123456", orgunit=ou

pyproject.toml

@@ -15,7 +15,7 @@ djangorestframework = "*"
 drf-spectacular = "*"
 pika-context-manager = {git = "https://git.app.uib.no/it-bott-integrasjoner/pika-context-manager.git", rev = "v1.2.0"}
 psycopg2-binary = "*"
-orgreg-client = {git = "https://git.app.uib.no/it-bott-integrasjoner/orgreg-client.git", rev = "v0.2.3" }
+orgreg-client = {git = "https://git.app.uib.no/it-bott-integrasjoner/orgreg-client.git", rev = "v2.0.1" }
 python = "^3.9"
 python-json-logger = "*"
 sentry-sdk = "*"