udata 10.0.9.dev33787__py2.py3-none-any.whl → 10.0.9.dev33847__py2.py3-none-any.whl

udata/commands/fixtures.py

@@ -39,7 +39,7 @@ COMMUNITY_RES_URL = "/api/1/datasets/community_resources"
 DISCUSSION_URL = "/api/1/discussions"
 
 
-DEFAULT_FIXTURE_FILE_TAG: str = "v4.0.0"
+DEFAULT_FIXTURE_FILE_TAG: str = "v5.0.0"
 DEFAULT_FIXTURE_FILE: str = f"https://raw.githubusercontent.com/opendatateam/udata-fixtures/{DEFAULT_FIXTURE_FILE_TAG}/results.json"  # noqa
 
 DEFAULT_FIXTURES_RESULTS_FILENAME: str = "results.json"
@@ -113,14 +113,24 @@ def generate_fixtures_file(data_source: str, results_filename: str) -> None:
         for slug in bar:
             json_fixture = {}
 
-            json_dataset = requests.get(f"{data_source}{DATASET_URL}/{slug}/").json()
+            url = f"{data_source}{DATASET_URL}/{slug}/"
+            response = requests.get(url)
+            if not response.ok:
+                print(f"Got a status code {response.status_code} while getting {url}, skipping")
+                continue
+            json_dataset = response.json()
+            json_dataset = remove_unwanted_keys(json_dataset, "dataset")
             json_resources = json_dataset.pop("resources")
+            json_resources = remove_unwanted_keys(json_resources, "resources")
             if json_dataset["organization"] is None:
                 json_owner = json_dataset.pop("owner")
-                json_dataset["owner"] = json_owner["id"]
+                if json_owner:
+                    json_owner = remove_unwanted_keys(json_owner, "user")
+                    json_dataset["owner"] = json_owner["id"]
             else:
                 json_org = json_dataset.pop("organization")
                 json_org = requests.get(f"{data_source}{ORG_URL}/{json_org['id']}/").json()
+                json_org = remove_unwanted_keys(json_org, "organization")
                 json_fixture["organization"] = json_org
             json_fixture["resources"] = json_resources
             json_fixture["dataset"] = json_dataset
@@ -128,21 +138,29 @@ def generate_fixtures_file(data_source: str, results_filename: str) -> None:
             json_reuses = requests.get(
                 f"{data_source}{REUSE_URL}/?dataset={json_dataset['id']}"
             ).json()["data"]
+            for reuse in json_reuses:
+                reuse = remove_unwanted_keys(reuse, "reuse")
             json_fixture["reuses"] = json_reuses
 
             json_community = requests.get(
                 f"{data_source}{COMMUNITY_RES_URL}/?dataset={json_dataset['id']}"
             ).json()["data"]
+            for community_resource in json_community:
+                community_resource = remove_unwanted_keys(community_resource, "community")
             json_fixture["community_resources"] = json_community
 
             json_discussion = requests.get(
                 f"{data_source}{DISCUSSION_URL}/?for={json_dataset['id']}"
             ).json()["data"]
+            for discussion in json_discussion:
+                discussion = remove_unwanted_keys(discussion, "discussion")
             json_fixture["discussions"] = json_discussion
 
             json_dataservices = requests.get(
                 f"{data_source}{DATASERVICES_URL}/?dataset={json_dataset['id']}"
             ).json()["data"]
+            for dataservice in json_dataservices:
+                dataservice = remove_unwanted_keys(dataservice, "dataservice")
             json_fixture["dataservices"] = json_dataservices
 
             json_result.append(json_fixture)
@@ -153,7 +171,7 @@ def generate_fixtures_file(data_source: str, results_filename: str) -> None:
 
 
 def get_or_create(data, key, model, factory):
-    """Try getting the object. If it doesn't exist yet, create it with the provided factory."""
+    """Try getting the object from data[key]. If it doesn't exist yet, create it with the provided factory."""
     if key not in data or data[key] is None:
         return
     data[key] = remove_unwanted_keys(data[key], key)
@@ -175,6 +193,17 @@ def get_or_create_user(data):
     return get_or_create(data, "user", User, UserFactory)
 
 
+def get_or_create_contact_point(data):
+    obj = ContactPoint.objects(id=data["id"]).first()
+    if not obj:
+        if not data.get("role"):
+            data["role"] = (
+                "contact" if (data.get("email") or data.get("contact_form")) else "creator"
+            )
+        obj = ContactPointFactory(**data)
+    return obj
+
+
 @cli.command()
 @click.argument("source", default=DEFAULT_FIXTURE_FILE)
 def import_fixtures(source):
@@ -192,7 +221,11 @@ def import_fixtures(source):
             user = UserFactory()
             dataset = fixture["dataset"]
             dataset = remove_unwanted_keys(dataset, "dataset")
-            if fixture["organization"]:
+            contact_points = []
+            for contact_point in dataset.get("contact_points") or []:
+                contact_points.append(get_or_create_contact_point(contact_point))
+            dataset["contact_points"] = contact_points
+            if fixture.get("organization"):
                 organization = fixture["organization"]
                 organization["members"] = [
                     Member(user=get_or_create_user(member), role=member["role"])
@@ -229,8 +262,9 @@ def import_fixtures(source):
                 DiscussionFactory(**discussion, subject=dataset)
             for dataservice in fixture["dataservices"]:
                 dataservice = remove_unwanted_keys(dataservice, "dataservice")
-                dataservice["contact_point"] = get_or_create(
-                    dataservice, "contact_point", ContactPoint, ContactPointFactory
-                )
+                contact_points = []
+                for contact_point in dataservice.get("contact_points") or []:
+                    contact_points.append(get_or_create_contact_point(contact_point))
+                dataservice["contact_points"] = contact_points
                 dataservice["organization"] = get_or_create_organization(dataservice)
                 DataserviceFactory(**dataservice, datasets=[dataset])

udata/commands/tests/test_fixtures.py

@@ -6,6 +6,7 @@ from werkzeug.wrappers.response import Response
 
 import udata.commands.fixtures
 from udata import models
+from udata.core.contact_point.factories import ContactPointFactory
 from udata.core.dataservices.factories import DataserviceFactory
 from udata.core.dataset.factories import (
     CommunityResourceFactory,
@@ -31,9 +32,12 @@ class FixturesTest:
         org = OrganizationFactory(
             members=[Member(user=user, role="editor"), Member(user=admin, role="admin")]
         )
+        contact_point = ContactPointFactory(role="contact")
         # Set the same slug we're 'exporting' from the FIXTURE_DATASET_SLUG config, see the
         # @pytest.mark.options above.
-        dataset = DatasetFactory(slug="some-test-dataset-slug", organization=org)
+        dataset = DatasetFactory(
+            slug="some-test-dataset-slug", organization=org, contact_points=[contact_point]
+        )
         res = ResourceFactory()
         dataset.add_resource(res)
         ReuseFactory(datasets=[dataset], owner=user)
@@ -48,12 +52,13 @@ class FixturesTest:
             ],
             closed_by=admin,
         )
-        DataserviceFactory(datasets=[dataset], organization=org)
+        DataserviceFactory(datasets=[dataset], organization=org, contact_points=[contact_point])
 
         with NamedTemporaryFile(mode="w+", delete=True) as fixtures_fd:
             # Get the fixtures from the local instance.
             monkeypatch.setattr(requests, "get", lambda url: api.get(url))
             monkeypatch.setattr(Response, "json", Response.get_json)
+            Response.ok = True
             result = cli("generate-fixtures-file", "", fixtures_fd.name)
             fixtures_fd.flush()
             assert "Fixtures saved to file " in result.output
@@ -65,6 +70,7 @@ class FixturesTest:
             models.CommunityResource.drop_collection()
             models.User.drop_collection()
             models.Dataservice.drop_collection()
+            models.ContactPoint.drop_collection()
 
             assert models.Organization.objects(slug=org.slug).count() == 0
             assert models.Dataset.objects.count() == 0
@@ -72,6 +78,7 @@ class FixturesTest:
             assert models.CommunityResource.objects.count() == 0
             assert models.User.objects.count() == 0
             assert models.Dataservice.objects.count() == 0
+            assert models.ContactPoint.objects.count() == 0
 
             # Then load them in the database to make sure they're correct.
             result = cli("import-fixtures", fixtures_fd.name)
@@ -82,6 +89,8 @@ class FixturesTest:
         assert result_org.members[1].user.id == admin.id
         assert result_org.members[1].role == "admin"
         assert models.Dataset.objects.count() > 0
+        result_dataset = models.Dataset.objects.first()
+        assert result_dataset.contact_points == [contact_point]
         assert models.Discussion.objects.count() > 0
         result_discussion = models.Discussion.objects.first()
         assert result_discussion.user.id == user.id
@@ -95,6 +104,7 @@ class FixturesTest:
         # Make sure we also import the dataservice organization
         result_dataservice = models.Dataservice.objects.first()
         assert result_dataservice.organization == org
+        assert result_dataservice.contact_points == [contact_point]
 
     def test_import_fixtures_from_default_file(self, cli):
         """Test importing fixtures from udata.commands.fixture.DEFAULT_FIXTURE_FILE."""

udata/core/contact_point/api.py

@@ -4,8 +4,9 @@ from udata.api import API, api
 from udata.api.parsers import ModelApiParser
 from udata.core.dataset.permissions import OwnablePermission
 
-from .api_fields import contact_point_fields
+from .api_fields import contact_point_fields, contact_point_roles_fields
 from .forms import ContactPointForm
+from .models import CONTACT_ROLES
 
 
 class ContactPointApiParser(ModelApiParser):
@@ -69,3 +70,14 @@ class ContactPointAPI(API):
 
         contact_point.delete()
         return "", 204
+
+
+@ns.route("/roles/", endpoint="contact_point_roles")
+class ContactPointRolesAPI(API):
+    """Contact point roles endpoint"""
+
+    @api.doc("contact_point_roles")
+    @api.marshal_list_with(contact_point_roles_fields)
+    def get(self):
+        """List all contact point roles"""
+        return [{"id": id, "label": label} for id, label in CONTACT_ROLES.items()]

udata/core/contact_point/api_fields.py

@@ -2,7 +2,15 @@ from udata.api import api, fields
 from udata.core.organization.api_fields import org_ref_fields
 from udata.core.user.api_fields import user_ref_fields
 
-DEFAULT_MASK = ",".join(("id", "name", "email", "contact_form"))
+DEFAULT_MASK = ",".join(("id", "name", "email", "contact_form", "role"))
+
+contact_point_roles_fields = api.model(
+    "ContactPointRoles",
+    {
+        "id": fields.String(description="The contact role identifier"),
+        "label": fields.String(description="The contact role display name"),
+    },
+)
 
 contact_point_fields = api.model(
     "ContactPoint",
@@ -17,6 +25,7 @@ contact_point_fields = api.model(
         "owner": fields.Nested(
             user_ref_fields, allow_null=True, description="The user information"
         ),
+        "role": fields.String(description="The role of the contact", required=True),
     },
     mask=DEFAULT_MASK,
 )

udata/core/contact_point/factories.py

@@ -1,8 +1,9 @@
 import factory
+import factory.fuzzy
 
 from udata.factories import ModelFactory
 
-from .models import ContactPoint
+from .models import CONTACT_ROLES, ContactPoint
 
 
 class ContactPointFactory(ModelFactory):
@@ -12,3 +13,4 @@ class ContactPointFactory(ModelFactory):
     name = factory.Faker("name")
     contact_form = factory.Faker("url")
     email = factory.Sequence(lambda n: "contact_point{}@example.com".format(n))
+    role = factory.fuzzy.FuzzyChoice(CONTACT_ROLES.keys())

udata/core/contact_point/forms.py

@@ -18,3 +18,4 @@ class ContactPointForm(ModelForm):
     )
     owner = fields.CurrentUserField()
     organization = fields.PublishAsField(_("Publish as"))
+    role = fields.StringField(_("Role"))

udata/core/contact_point/models.py

@@ -5,15 +5,23 @@ from udata.mongo import db
 __all__ = ("ContactPoint",)
 
 
+CONTACT_ROLES = {
+    "contact": _("Contact"),
+    "creator": _("Creator"),
+    "publisher": _("Publisher"),
+}
+
+
 class ContactPoint(db.Document, Owned):
     name = db.StringField(max_length=255, required=True)
     email = db.StringField(max_length=255)
     contact_form = db.URLField()
+    role = db.StringField(required=True, choices=list(CONTACT_ROLES))
 
     meta = {"queryset_class": OwnedQuerySet}
 
     def validate(self, clean=True):
-        if not self.email and not self.contact_form:
+        if self.role == "contact" and not self.email and not self.contact_form:
             raise db.ValidationError(
                 _("At least an email or a contact form is required for a contact point")
             )

udata/core/dataservices/models.py

@@ -162,10 +162,17 @@ class Dataservice(WithMetrics, Owned, db.Document):
 
     extras = field(db.ExtrasField())
 
-    contact_point = field(
-        db.ReferenceField("ContactPoint", reverse_delete_rule=db.NULLIFY),
-        nested_fields=contact_api_fields.contact_point_fields,
-        allow_null=True,
+    contact_points = field(
+        db.ListField(
+            field(
+                db.ReferenceField("ContactPoint", reverse_delete_rule=db.PULL),
+                nested_fields=contact_api_fields.contact_point_fields,
+                allow_null=True,
+            ),
+        ),
+        filterable={
+            "key": "contact_point",
+        },
     )
 
     created_at = field(

udata/core/dataservices/rdf.py

@@ -6,13 +6,14 @@ from udata.core.dataservices.models import HarvestMetadata as HarvestDataservice
 from udata.core.dataset.models import Dataset, License
 from udata.core.dataset.rdf import dataset_to_graph_id, sanitize_html
 from udata.rdf import (
+    CONTACT_POINT_ENTITY_TO_ROLE,
     DCAT,
     DCATAP,
     DCT,
     HVD_LEGISLATION,
     TAG_TO_EU_HVD_CATEGORIES,
-    contact_point_from_rdf,
-    contact_point_to_rdf,
+    contact_points_from_rdf,
+    contact_points_to_rdf,
     namespace_manager,
     rdf_value,
     remote_url_from_rdf,
@@ -43,7 +44,13 @@ def dataservice_from_rdf(
     dataservice.base_api_url = url_from_rdf(d, DCAT.endpointURL)
     dataservice.endpoint_description_url = url_from_rdf(d, DCAT.endpointDescription)
 
-    dataservice.contact_point = contact_point_from_rdf(d, dataservice) or dataservice.contact_point
+    roles = [  # Imbricated list of contact points for each role
+        contact_points_from_rdf(d, rdf_entity, role, dataservice)
+        for rdf_entity, role in CONTACT_POINT_ENTITY_TO_ROLE.items()
+    ]
+    dataservice.contact_points = [  # Flattened list of contact points
+        contact_point for role in roles for contact_point in role
+    ] or dataservice.contact_points
 
     datasets = []
     for dataset_node in d.objects(DCAT.servesDataset):
@@ -176,9 +183,8 @@ def dataservice_to_rdf(dataservice: Dataservice, graph=None):
         for dataset in dataservice.datasets:
             d.add(DCAT.servesDataset, dataset_to_graph_id(dataset))
 
-    contact_point = contact_point_to_rdf(dataservice.contact_point, graph)
-    if contact_point:
-        d.set(DCAT.contactPoint, contact_point)
+    for contact_point, predicate in contact_points_to_rdf(dataservice.contact_points, graph):
+        d.set(predicate, contact_point)
 
     return d
 

udata/core/dataset/api.py

@@ -108,6 +108,7 @@ class DatasetApiParser(ModelApiParser):
         self.parser.add_argument("schema", type=str, location="args")
         self.parser.add_argument("schema_version", type=str, location="args")
         self.parser.add_argument("topic", type=str, location="args")
+        self.parser.add_argument("credit", type=str, location="args")
         self.parser.add_argument("dataservice", type=str, location="args")
 
     @staticmethod

udata/core/dataset/api_fields.py

@@ -272,7 +272,7 @@ DEFAULT_MASK = ",".join(
         "archived",
         "quality",
         "internal",
-        "contact_point",
+        "contact_points",
     )
 )
 
@@ -386,8 +386,8 @@ dataset_fields = api.model(
             readonly=True,
             description="Site internal and specific object's data",
         ),
-        "contact_point": fields.Nested(
-            contact_point_fields, allow_null=True, description="The dataset's contact points"
+        "contact_points": fields.List(
+            fields.Nested(contact_point_fields, description="The dataset contact points"),
         ),
     },
     mask=DEFAULT_MASK,

udata/core/dataset/apiv2.py

@@ -66,7 +66,7 @@ DEFAULT_MASK_APIV2 = ",".join(
         "quality",
         "harvest",
         "internal",
-        "contact_point",
+        "contact_points",
     )
 )
 
@@ -206,8 +206,10 @@ dataset_fields = apiv2.model(
             readonly=True,
             description="Site internal and specific object's data",
         ),
-        "contact_point": fields.Nested(
-            contact_point_fields, allow_null=True, description="The dataset's contact point"
+        "contact_points": fields.List(
+            fields.Nested(contact_point_fields),
+            required=False,
+            description="The dataset contact points",
         ),
     },
     mask=DEFAULT_MASK_APIV2,

udata/core/dataset/forms.py

@@ -122,13 +122,13 @@ def validate_contact_point(form, field):
     """Validates contact point with dataset's org or owner"""
     from udata.models import ContactPoint
 
-    if field.data:
+    for contact_point in field.data or []:
         if form.organization.data:
             contact_point = ContactPoint.objects(
-                id=field.data.id, organization=form.organization.data
+                id=contact_point.id, organization=form.organization.data
             ).first()
         elif form.owner.data:
-            contact_point = ContactPoint.objects(id=field.data.id, owner=form.owner.data).first()
+            contact_point = ContactPoint.objects(id=contact_point.id, owner=form.owner.data).first()
         if not contact_point:
             raise validators.ValidationError(
                 _("Wrong contact point id or contact point ownership mismatch")
@@ -175,7 +175,7 @@ class DatasetForm(ModelForm):
     organization = fields.PublishAsField(_("Publish as"))
     extras = fields.ExtrasField()
     resources = fields.NestedModelList(ResourceForm)
-    contact_point = fields.ContactPointField(validators=[validate_contact_point])
+    contact_points = fields.ContactPointListField(validators=[validate_contact_point])
 
 
 class ResourcesListForm(ModelForm):

udata/core/dataset/models.py

@@ -563,7 +563,7 @@ class Dataset(WithMetrics, DatasetBadgeMixin, Owned, db.Document):
 
     featured = db.BooleanField(required=True, default=False)
 
-    contact_point = db.ReferenceField("ContactPoint", reverse_delete_rule=db.NULLIFY)
+    contact_points = db.ListField(db.ReferenceField("ContactPoint", reverse_delete_rule=db.PULL))
 
     created_at_internal = DateTimeField(
         verbose_name=_("Creation date"), default=datetime.utcnow, required=True

udata/core/dataset/rdf.py

@@ -23,12 +23,14 @@ from udata.harvest.exceptions import HarvestSkipException
 from udata.models import db
 from udata.rdf import (
     ADMS,
+    CONTACT_POINT_ENTITY_TO_ROLE,
     DCAT,
     DCATAP,
     DCT,
     EUFORMAT,
     EUFREQ,
     FREQ,
+    GEODCAT,
     HVD_LEGISLATION,
     IANAFORMAT,
     SCHEMA,
@@ -36,8 +38,8 @@ from udata.rdf import (
     SKOS,
     SPDX,
     TAG_TO_EU_HVD_CATEGORIES,
-    contact_point_from_rdf,
-    contact_point_to_rdf,
+    contact_points_from_rdf,
+    contact_points_to_rdf,
     namespace_manager,
     rdf_unique_values,
     rdf_value,
@@ -174,10 +176,9 @@ def ogc_service_to_rdf(
         if dataset.license.url:
             service.add(DCT.license, URIRef(dataset.license.url))
 
-    if dataset and dataset.contact_point:
-        contact_point = contact_point_to_rdf(dataset.contact_point, graph)
-        if contact_point:
-            service.set(DCAT.contactPoint, contact_point)
+    if dataset and dataset.contact_points:
+        for contact_point, predicate in contact_points_to_rdf(dataset.contact_points, graph):
+            service.set(predicate, contact_point)
 
     if is_hvd:
         # DCAT-AP HVD applicable legislation is also expected at the distribution > accessService level
@@ -361,13 +362,16 @@ def dataset_to_rdf(dataset: Dataset, graph: Optional[Graph] = None) -> RdfResour
     if frequency:
         d.set(DCT.accrualPeriodicity, frequency)
 
-    publisher = owner_to_rdf(dataset, graph)
-    if publisher:
-        d.set(DCT.publisher, publisher)
+    owner_role = DCT.publisher
+    if any(contact_point.role == "publisher" for contact_point in dataset.contact_points):
+        # There's already a publisher, so the owner should instead be a distributor.
+        owner_role = GEODCAT.distributor
+    owner = owner_to_rdf(dataset, graph)
+    if owner:
+        d.set(owner_role, owner)
 
-    contact_point = contact_point_to_rdf(dataset.contact_point, graph)
-    if contact_point:
-        d.set(DCAT.contactPoint, contact_point)
+    for contact_point, predicate in contact_points_to_rdf(dataset.contact_points, graph):
+        d.set(predicate, contact_point)
 
     return d
 
@@ -748,7 +752,13 @@ def dataset_from_rdf(graph: Graph, dataset=None, node=None, remote_url_prefix: s
     description = d.value(DCT.description) or d.value(DCT.abstract)
     dataset.description = sanitize_html(description)
     dataset.frequency = frequency_from_rdf(d.value(DCT.accrualPeriodicity))
-    dataset.contact_point = contact_point_from_rdf(d, dataset) or dataset.contact_point
+    roles = [  # Imbricated list of contact points for each role
+        contact_points_from_rdf(d, rdf_entity, role, dataset)
+        for rdf_entity, role in CONTACT_POINT_ENTITY_TO_ROLE.items()
+    ]
+    dataset.contact_points = [  # Flattened list of contact points
+        contact_point for role in roles for contact_point in role
+    ] or dataset.contact_points
     schema = schema_from_rdf(d)
     if schema:
         dataset.schema = schema

udata/forms/fields.py

@@ -787,12 +787,9 @@ class PublishAsField(ModelFieldMixin, Field):
         return True
 
 
-class ContactPointField(ModelFieldMixin, Field):
+class ContactPointListField(ModelList, Field):
     model = ContactPoint
 
-    def __init__(self, *args, **kwargs):
-        super(ContactPointField, self).__init__(*args, **kwargs)
-
 
 def field_parse(cls, value, *args, **kwargs):
     kwargs["_form"] = WTForm()

udata/harvest/api.py

@@ -36,7 +36,11 @@ error_fields = api.model(
             description="The error creation date", required=True, readonly=True
         ),
         "message": fields.String(description="The error short message", required=True),
-        "details": fields.String(description="Optional details (ie. stacktrace)"),
+        "details": fields.Raw(
+            attribute=lambda o: o.details if admin_permission else None,
+            description="Optional details (only for super-admins)",
+            readonly=True,
+        ),
     },
 )
 

udata/harvest/tests/dcat/evian.json

@@ -461,4 +461,4 @@
 			]
 		}
 	]
-}
+}

udata/harvest/tests/test_dcat_backend.py

@@ -517,9 +517,9 @@ class DcatBackendTest:
         assert dataset.temporal_coverage is not None
         assert dataset.temporal_coverage.start == date(2016, 1, 1)
         assert dataset.temporal_coverage.end == date(2016, 12, 5)
-        assert dataset.contact_point.email == "hello@its.me"
-        assert dataset.contact_point.name == "Organization contact"
-        assert dataset.contact_point.contact_form == "https://data.support.com"
+        assert dataset.contact_points[0].email == "hello@its.me"
+        assert dataset.contact_points[0].name == "Organization contact"
+        assert dataset.contact_points[0].contact_form == "https://data.support.com"
         assert dataset.frequency is None
         # test dct:license nested in distribution
         assert dataset.license.id == "lov1"
@@ -866,10 +866,10 @@ class CswIso19139DcatBackendTest:
             ],
         }
         assert (
-            dataset.contact_point.name
+            dataset.contact_points[0].name
             == "DDTM 80 (Direction Départementale des Territoires et de la Mer de la Somme)"
         )
-        assert dataset.contact_point.email == "ddtm-sap-bsig@somme.gouv.fr"
+        assert dataset.contact_points[0].email == "ddtm-sap-bsig@somme.gouv.fr"
 
         # License is not properly mapped in XSLT conversion
         assert dataset.license is None

udata/migrations/2024-12-05-contact-point-is-now-a-list.py

@@ -0,0 +1,33 @@
+"""
+The purpose here is to change the contact_point reference field
+to a list of reference field and rename it to contact_points
+"""
+
+import logging
+
+from mongoengine.connection import get_db
+
+log = logging.getLogger(__name__)
+
+
+def migrate(db):
+    log.info("Processing Contact Point references.")
+
+    db = get_db()
+
+    # Add a `contact` role to each existing contact point.
+    db.contact_point.update_many({}, {"$set": {"role": "contact"}})
+
+    count = 0
+    for collection in [db.dataset, db.dataservice]:
+        for obj in collection.find({"contact_point": {"$exists": True}}):
+            # Change `contact_point` to be a list of contact points.
+            collection.update_one(
+                {"_id": obj["_id"]}, {"$set": {"contact_point": [obj["contact_point"]]}}
+            )
+        # If we rename after updating the field to be a list, then we can re-run the migration.
+        count += collection.update_many(
+            {}, {"$rename": {"contact_point": "contact_points"}}
+        ).modified_count
+
+    log.info(f"Completed {count} objects")