diff --git a/greg/management/commands/import_usernames_from_cerebrum.py b/greg/management/commands/import_usernames_from_cerebrum.py
new file mode 100644
index 0000000000000000000000000000000000000000..fc27a115614a8c501f136bab7de43027db6bff0c
--- /dev/null
+++ b/greg/management/commands/import_usernames_from_cerebrum.py
@@ -0,0 +1,104 @@
+"""
+Command for running or scheduling the django-q task for importing
+usernames from Cerebrum
+"""
+import logging
+
+from django.conf import settings
+from django.core.management.base import BaseCommand, CommandParser
+from django.db import transaction
+from django_q.tasks import schedule
+
+from greg.tasks.usernames import UsernameImporter
+from greg.models import Identity, Person
+
+logger = logging.getLogger(__name__)
+
+
+class Command(BaseCommand):
+ help = __doc__
+
+ def add_arguments(self, parser: CommandParser) -> None:
+ group = parser.add_mutually_exclusive_group()
+ group.add_argument(
+ "--all-persons",
+ action="store_true",
+ default=False,
+ help="Import username for all persons in GREG",
+ )
+ group.add_argument(
+ "--without-usernames",
+ action="store_true",
+ default=False,
+ help="Only import those without usernames in GREG",
+ )
+ group.add_argument(
+ "--with-usernames",
+ action="store_true",
+ default=False,
+ help="Only import those with usernames in GREG",
+ )
+ parser.add_argument(
+ "--schedule",
+ action="store_true",
+ default=False,
+ help="Add a scheduled task for running the import",
+ )
+ parser.add_argument(
+ "--commit",
+ action="store_true",
+ default=False,
+ help="Commit the changes done by running the import once",
+ )
+
+ def schedule_task(self, all_persons, schedule_type, logger_msg):
+ logger.info(logger_msg)
+ schedule(
+ func="greg.tasks.usernames.import_usernames",
+ persons=all_persons,
+ schedule_type=schedule_type,
+ )
+ logger.info("Username import scheduled")
+
+ def handle(self, *args, **options):
+ """Schedule or run import of usernames"""
+
+ if options["with_usernames"]:
+ all_persons = Person.objects.filter(
+ identities__type=Identity.IdentityType.FEIDE_ID,
+ identities__source="cerebrum",
+ )
+ schedule_type = settings.USERNAME_SCHEDULE_WITH_USERNAME
+ logger_msg = "Scheduling import of usernames for persons with username..."
+ elif options["without_usernames"]:
+ all_persons = Person.objects.exclude(
+ identities__type=Identity.IdentityType.FEIDE_ID,
+ identities__source="cerebrum",
+ )
+ schedule_type = settings.USERNAME_SCHEDULE_WITHOUT_USERNAME
+ logger_msg = (
+ "Scheduling import of usernames for persons without username..."
+ )
+ else:
+ all_persons = Person.objects.all()
+ schedule_type = settings.USERNAME_SCHEDULE_ALL
+ logger_msg = "Scheduling import of usernames for all persons..."
+
+ if options["schedule"]:
+ self.schedule_task(
+ all_persons=all_persons,
+ schedule_type=schedule_type,
+ logger_msg=logger_msg,
+ )
+ return
+
+ # Will assume to run once if schedule is not given
+ with transaction.atomic():
+ logger.info("Importing usernames...")
+ importer = UsernameImporter()
+ importer.update_usernames(all_persons)
+ if not options["commit"]:
+ logger.info("Rolling back changes...")
+ transaction.set_rollback(True)
+ else:
+ logger.info("Changes committed")
diff --git a/greg/migrations/0030_remove_identity_identity_type_value_unique_and_more.py b/greg/migrations/0030_remove_identity_identity_type_value_unique_and_more.py
new file mode 100644
index 0000000000000000000000000000000000000000..676362b1671fd3b228b1889798f700afa9fb00da
--- /dev/null
+++ b/greg/migrations/0030_remove_identity_identity_type_value_unique_and_more.py
@@ -0,0 +1,22 @@
+# Generated by Django 4.1.4 on 2023-08-25 12:10
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+ dependencies = [
+ ("greg", "0029_alter_identity_type_add_national_id_card_number"),
+ ]
+
+ operations = [
+ migrations.RemoveConstraint(
+ model_name="identity",
+ name="identity_type_value_unique",
+ ),
+ migrations.AddConstraint(
+ model_name="identity",
+ constraint=models.UniqueConstraint(
+ fields=("type", "value", "source"), name="identity_type_value_unique"
+ ),
+ ),
+ ]
diff --git a/greg/models.py b/greg/models.py
index 7149144d31a91c5b239acaa522f432c4fae9ffd2..70a3af830cad656fc4de3e6723888413a5c52445 100644
--- a/greg/models.py
+++ b/greg/models.py
@@ -344,7 +344,7 @@ class Identity(BaseModel):
verbose_name_plural = "identities"
constraints = (
models.UniqueConstraint(
- fields=["type", "value"],
+ fields=["type", "value", "source"],
name="identity_type_value_unique",
),
)
diff --git a/greg/tasks/usernames.py b/greg/tasks/usernames.py
new file mode 100644
index 0000000000000000000000000000000000000000..537173042a2172a5564eb74ca2f9e0163bf42fbd
--- /dev/null
+++ b/greg/tasks/usernames.py
@@ -0,0 +1,116 @@
+import logging
+
+from cerebrum_client import CerebrumClient
+from django.conf import settings
+
+from greg.models import Identity
+
+logger = logging.getLogger(__name__)
+
+
+class UsernameImporter:
+ def __init__(self):
+ self.client = CerebrumClient(**settings.CEREBRUM_CLIENT)
+
+ self.source = "GREG"
+ self.cerebrum_id_type = "gregPersonId"
+ self.id_type = Identity.IdentityType.FEIDE_ID
+
+ def get_username(self, person):
+ person_id = person.person_id
+ username = self.client.get_person_primary_account_name(person_id)
+ return username
+
+ def update_or_create_person_feide_id(self, person, username):
+ existing_feide_id = person.identities.filter(
+ type=self.id_type, source="cerebrum"
+ )
+ feide_id = f"{username}@{settings.INSTANCE_NAME}.no"
+ if not existing_feide_id:
+ logger.info("Creating Feide-ID for person_id=%s", person.pk)
+ Identity.objects.create(
+ person=person,
+ type=self.id_type,
+ source="cerebrum",
+ value=feide_id,
+ verified=Identity.Verified.AUTOMATIC,
+ )
+ return
+ existing_feide_id_obj = existing_feide_id.first()
+ existing_feide_id_value = existing_feide_id_obj.value
+ old_username, _ = existing_feide_id_value.split("@")
+ if old_username != username:
+ logger.info(
+ "Updating Feide-ID for person_id=%s from %s to %s",
+ person.pk,
+ existing_feide_id_value,
+ feide_id,
+ )
+ existing_feide_id.update(value=feide_id)
+
+ def update_usernames(self, all_persons):
+ for person in all_persons:
+ logger.info(
+ "Looking up username for person_id=%s from cerebrum",
+ person.pk,
+ )
+ try:
+ persons = list(
+ self.client.search_person_external_ids(
+ source_system=self.source,
+ id_type=self.cerebrum_id_type,
+ external_id=person.pk,
+ )
+ )
+ except ConnectionError as e: # noqa: W0703
+ logger.exception(
+ "Failed to get person with person_id=%s. Got error=%s. Skipping person",
+ person.pk,
+ e,
+ )
+ continue
+ if not persons:
+ logger.info(
+ "Found no person in cerebrum matching id_type=%s and person_id=%s from source=%s. Skipping person",
+ self.cerebrum_id_type,
+ person.pk,
+ self.source,
+ )
+ continue
+ if len(persons) > 1:
+ logger.info(
+ "Found %s persons with same id_type=%s and person_id=%s in source_system=%s. Skipping person",
+ len(persons),
+ self.cerebrum_id_type,
+ person.pk,
+ self.source,
+ )
+ continue
+
+ try:
+ username = self.get_username(persons[0])
+ except ConnectionError as e:
+ logger.exception(
+ "Failed to get username for person_id=%s. Got error=%s. Skipping person",
+ person.pk,
+ e,
+ )
+ continue
+ if not username:
+ logger.info(
+ "Found no username in cerebrum for person_id=%s. Skipping person",
+ person.pk,
+ )
+ continue
+
+ logger.info(
+ "Found username=%s for person_id=%s in cerebrum.",
+ username,
+ person.pk,
+ )
+ self.update_or_create_person_feide_id(person, username)
+
+
+def update_usernames(persons):
+ importer = UsernameImporter()
+ importer.update_usernames(persons)
diff --git a/greg/tests/conftest.py b/greg/tests/conftest.py
index 22f0ddff674a7c86721619384d01767d38006152..bcf3ba58062ff5cc633392219f86f73c57210077 100644
--- a/greg/tests/conftest.py
+++ b/greg/tests/conftest.py
@@ -113,6 +113,25 @@ def person_bar() -> Person:
return Person.objects.get(id=person.id)
+@pytest.fixture
+def person_foobar() -> Person:
+ with transaction.atomic():
+ person = Person.objects.create(
+ first_name="Foo", last_name="Bar", date_of_birth="1999-02-05"
+ )
+ Identity.objects.create(
+ person=person,
+ type=Identity.IdentityType.PRIVATE_EMAIL,
+ value="foobar@example.org",
+ )
+ Identity.objects.create(
+ person=person,
+ type=Identity.IdentityType.PRIVATE_MOBILE_NUMBER,
+ value="+4712345689",
+ )
+ return Person.objects.get(id=person.id)
+
+
@pytest.fixture
def sponsor_guy() -> Sponsor:
sp = Sponsor.objects.create(
diff --git a/greg/tests/management/test_import_usernames.py b/greg/tests/management/test_import_usernames.py
new file mode 100644
index 0000000000000000000000000000000000000000..16735e1aded43d69507834df39e615754cc36255
--- /dev/null
+++ b/greg/tests/management/test_import_usernames.py
@@ -0,0 +1,291 @@
+import pytest
+
+from django.core.management import call_command
+from django.core.management.base import CommandError
+from django.test import override_settings
+from django_q.tasks import Schedule
+
+from greg.models import Person, Identity
+
+
+@pytest.fixture
+def search_response():
+ return {
+ "external_ids": [
+ {
+ "person_id": 1,
+ "source_system": "GREG",
+ "external_id": 1,
+ "id_type": "gregPersonId",
+ }
+ ]
+ }
+
+
+@pytest.fixture
+def search_response_bar():
+ return {
+ "external_ids": [
+ {
+ "person_id": 2,
+ "source_system": "GREG",
+ "external_id": 2,
+ "id_type": "gregPersonId",
+ }
+ ]
+ }
+
+
+@pytest.fixture
+def search_response_foobar():
+ return {
+ "external_ids": [
+ {
+ "person_id": 3,
+ "source_system": "GREG",
+ "external_id": 3,
+ "id_type": "gregPersonId",
+ }
+ ]
+ }
+
+
+@pytest.fixture
+def person_one(person_foo):
+ Identity.objects.create(
+ person=person_foo,
+ type=Identity.IdentityType.PASSPORT_NUMBER,
+ value="HHH111111",
+ )
+ return Person.objects.get(id=person_foo.id)
+
+
+@pytest.fixture
+def person_two(person_bar):
+ Identity.objects.create(
+ person=person_bar,
+ type=Identity.IdentityType.FEIDE_ID,
+ source="cerebrum",
+ value="not_bar@inst.no",
+ )
+ return Person.objects.get(id=person_bar.id)
+
+
+@pytest.fixture
+def person_three(person_foobar):
+ Identity.objects.create(
+ person=person_foobar,
+ type=Identity.IdentityType.FEIDE_ID,
+ source="feide",
+ value="foobar@test.no",
+ )
+ return Person.objects.get(id=person_foobar.id)
+
+
+@pytest.fixture
+def person_account_response():
+ return {
+ "accounts": [
+ {
+ "href": "",
+ "primary": True,
+ "id": 1,
+ "name": "foo",
+ }
+ ]
+ }
+
+
+@pytest.fixture
+def person_account_response_bar():
+ return {
+ "accounts": [
+ {
+ "href": "",
+ "primary": True,
+ "id": 1,
+ "name": "bar",
+ }
+ ]
+ }
+
+
+@pytest.fixture
+def person_account_response_foobar():
+ return {
+ "accounts": [
+ {
+ "href": "",
+ "primary": True,
+ "id": 2,
+ "name": "foobar",
+ }
+ ]
+ }
+
+
+@pytest.mark.django_db
+def test_schedule(person_one, person_two, person_three):
+ assert Schedule.objects.all().count() == 0
+ call_command("import_usernames_from_cerebrum", "--all-persons", "--schedule")
+ assert Schedule.objects.all().count() == 1
+ sc = Schedule.objects.first()
+ assert sc.func == "greg.tasks.usernames.import_usernames"
+ call_command("import_usernames_from_cerebrum", "--without-usernames", "--schedule")
+ assert Schedule.objects.all().count() == 2
+ call_command("import_usernames_from_cerebrum", "--with-username", "--schedule")
+ assert Schedule.objects.all().count() == 3
+
+
+@pytest.mark.django_db
+def test_only_one_import_argument_allowed():
+ with pytest.raises(CommandError):
+ call_command(
+ "import_usernames_from_cerebrum",
+ "--without-usernames",
+ "--with-username",
+ "--schedule",
+ )
+
+
+@override_settings(INSTANCE_NAME="inst")
+@pytest.mark.django_db
+def test_import_wo_feide_id(
+ requests_mock,
+ search_response,
+ person_account_response,
+ person_one,
+):
+ requests_mock.get(
+ "http://example.com/cerebrum/v1/search/persons/external-ids?source_system=GREG&id_type=gregPersonId&external_id=1",
+ json=search_response,
+ )
+ requests_mock.get(
+ "http://example.com/cerebrum/v1/persons/1/accounts",
+ json=person_account_response,
+ )
+ usr_id_type = Identity.IdentityType.FEIDE_ID
+ assert not person_one.identities.filter(type=usr_id_type)
+
+ call_command("import_usernames_from_cerebrum", "--without-usernames", "--commit")
+ person_identities = person_one.identities.filter(type=usr_id_type)
+ assert len(person_identities) == 1
+ assert person_identities[0].value == "foo@inst.no"
+
+
+@override_settings(INSTANCE_NAME="inst")
+@pytest.mark.django_db
+def test_import_w_feide_id(
+ requests_mock,
+ search_response_bar,
+ person_account_response_bar,
+ person_two,
+):
+ requests_mock.get(
+ "http://example.com/cerebrum/v1/search/persons/external-ids?source_system=GREG&id_type=gregPersonId&external_id=1",
+ json=search_response_bar,
+ )
+ requests_mock.get(
+ "http://example.com/cerebrum/v1/persons/2/accounts",
+ json=person_account_response_bar,
+ )
+ usr_id_type = Identity.IdentityType.FEIDE_ID
+ person_identities = person_two.identities.filter(type=usr_id_type)
+ assert len(person_identities) == 1
+ assert person_identities[0].value == "not_bar@inst.no"
+ call_command("import_usernames_from_cerebrum", "--with-usernames", "--commit")
+ person_identities = person_two.identities.filter(type=usr_id_type)
+ assert len(person_identities) == 1
+ assert person_identities[0].value == "bar@inst.no"
+
+
+@override_settings(INSTANCE_NAME="inst")
+@pytest.mark.django_db
+def test_different_feide_id_already_exists(
+ requests_mock,
+ search_response_foobar,
+ person_account_response_foobar,
+ person_three,
+):
+ requests_mock.get(
+ "http://example.com/cerebrum/v1/search/persons/external-ids?source_system=GREG&id_type=gregPersonId&external_id=1",
+ json=search_response_foobar,
+ )
+ requests_mock.get(
+ "http://example.com/cerebrum/v1/persons/3/accounts",
+ json=person_account_response_foobar,
+ )
+ usr_id_type = Identity.IdentityType.FEIDE_ID
+ person_identities = person_three.identities.filter(type=usr_id_type)
+ assert len(person_identities) == 1
+ assert person_identities[0].value == "foobar@test.no"
+ call_command("import_usernames_from_cerebrum", "--without-usernames", "--commit")
+ person_identities = person_three.identities.filter(type=usr_id_type)
+ print(person_identities)
+ assert len(person_identities) == 2
+ assert person_identities[0].value == "foobar@test.no"
+ assert person_identities[1].value == "foobar@inst.no"
+
+
+@override_settings(INSTANCE_NAME="inst")
+@pytest.mark.django_db
+def test_import_usernames(
+ requests_mock,
+ search_response,
+ search_response_bar,
+ search_response_foobar,
+ person_account_response,
+ person_account_response_bar,
+ person_account_response_foobar,
+ person_one,
+ person_two,
+ person_three,
+):
+ """
+ This test is mostly just all the other three tests in one to check that all-persons does all the same stuff
+ """
+ requests_mock.get(
+ "http://example.com/cerebrum/v1/search/persons/external-ids?source_system=GREG&id_type=gregPersonId&external_id=1",
+ json=search_response,
+ )
+ requests_mock.get(
+ "http://example.com/cerebrum/v1/search/persons/external-ids?source_system=GREG&id_type=gregPersonId&external_id=2",
+ json=search_response_bar,
+ )
+ requests_mock.get(
+ "http://example.com/cerebrum/v1/search/persons/external-ids?source_system=GREG&id_type=gregPersonId&external_id=3",
+ json=search_response_foobar,
+ )
+ requests_mock.get(
+ "http://example.com/cerebrum/v1/persons/1/accounts",
+ json=person_account_response,
+ )
+ requests_mock.get(
+ "http://example.com/cerebrum/v1/persons/2/accounts",
+ json=person_account_response_bar,
+ )
+ requests_mock.get(
+ "http://example.com/cerebrum/v1/persons/3/accounts",
+ json=person_account_response_foobar,
+ )
+ usr_id_type = Identity.IdentityType.FEIDE_ID
+ person_identities_two = person_two.identities.filter(type=usr_id_type)
+ person_identities_three = person_three.identities.filter(type=usr_id_type)
+ assert not person_one.identities.filter(type=usr_id_type)
+ assert len(person_identities_two) == 1
+ assert person_identities_two[0].value == "not_bar@inst.no"
+ assert len(person_identities_three) == 1
+ assert person_identities_three[0].value == "foobar@test.no"
+
+ call_command("import_usernames_from_cerebrum", "--all-persons", "--commit")
+ person_identities_one = person_one.identities.filter(type=usr_id_type)
+ person_identities_two = person_two.identities.filter(type=usr_id_type)
+ person_identities_three = person_three.identities.filter(type=usr_id_type)
+
+ assert len(person_identities_one) == 1
+ assert person_identities_one[0].value == "foo@inst.no"
+ assert len(person_identities_two) == 1
+ assert person_identities_two[0].value == "bar@inst.no"
+ assert len(person_identities_three) == 2
+ assert person_identities_three[0].value == "foobar@test.no"
+ assert person_identities_three[1].value == "foobar@inst.no"
diff --git a/gregsite/settings/base.py b/gregsite/settings/base.py
index dc8e9ae533542a38f19eeac3a4c5522d19d4085e..f9b878b4e44e016d15f2c0e3a961dfa90fcab698 100644
--- a/gregsite/settings/base.py
+++ b/gregsite/settings/base.py
@@ -317,6 +317,11 @@ ORGREG_ACRONYMS = []
# scheduled by running the management command
ORGREG_SCHEDULE_TYPE = "D"
+# Controls how often the usernames import should be scheduled
+USERNAME_SCHEDULE_ALL = "M"
+USERNAME_SCHEDULE_WITHOUT_USERNAME = "H"
+USERNAME_SCHEDULE_WITH_USERNAME = "D"
+
# List of stedkode for units where Sponsors are handled manually
CEREBRUM_MANUAL_SPONSOR_UNITS = []