GeoNode
diff --git a/‎geonode/base/api/serializers.py‎
Lines changed: 56 additions & 11 deletions b/‎geonode/base/api/serializers.py‎
Lines changed: 56 additions & 11 deletions
diff --git a/‎geonode/base/forms.py‎
Lines changed: 79 additions & 14 deletions b/‎geonode/base/forms.py‎
Lines changed: 79 additions & 14 deletions
diff --git a/‎geonode/base/migrations/0086_linkedresource.py‎
Lines changed: 19 additions & 7 deletions b/‎geonode/base/migrations/0086_linkedresource.py‎
Lines changed: 19 additions & 7 deletions
@@ -28,12 +28,14 @@
 from django.forms.models import model_to_dict
 from django.contrib.auth import get_user_model
 from django.db.models.query import QuerySet
+from geonode.people import Roles
 from django.http import QueryDict
 
 from deprecated import deprecated
 from rest_framework import serializers
 from rest_framework_gis import fields
 from rest_framework.reverse import reverse, NoReverseMatch
+from rest_framework.exceptions import ParseError
 
 from dynamic_rest.serializers import DynamicEphemeralSerializer, DynamicModelSerializer
 from dynamic_rest.fields.fields import DynamicRelationField, DynamicComputedField
@@ -379,15 +381,44 @@ def to_representation(self, instance):
 
 
 class ContactRoleField(DynamicComputedField):
-    def __init__(self, contat_type, **kwargs):
-        self.contat_type = contat_type
+    default_error_messages = {
+        "required": ("ContactRoleField This field is required."),
+    }
+
+    def __init__(self, contact_type, **kwargs):
+        self.contact_type = contact_type
         super().__init__(**kwargs)
 
     def get_attribute(self, instance):
-        return getattr(instance, self.contat_type)
+        return getattr(instance, self.contact_type)
 
     def to_representation(self, value):
-        return UserSerializer(embed=True, many=False).to_representation(value)
+        return [UserSerializer(embed=True, many=False).to_representation(v) for v in value]
+
+    def get_pks_of_users_to_set(self, value):
+        pks_of_users_to_set = []
+        for val in value:
+            # make it possible to set contact roles via username or pk through API
+            if "username" in val and "pk" in val:
+                pk = val["pk"]
+                username = val["username"]
+                pk_user = get_user_model().objects.get(pk=pk)
+                username_user = get_user_model().objects.get(username=username)
+                if pk_user.pk != username_user.pk:
+                    raise ParseError(
+                        detail=f"user with pk: {pk} and username: {username} is not the same ... ", code=403
+                    )
+                pks_of_users_to_set.append(pk)
+            elif "username" in val:
+                username = val["username"]
+                username_user = get_user_model().objects.get(username=[username])
+                pks_of_users_to_set.append(username_user.pk)
+            elif "pk" in val:
+                pks_of_users_to_set.append(val["pk"])
+        return pks_of_users_to_set
+
+    def to_internal_value(self, value):
+        return get_user_model().objects.filter(pk__in=self.get_pks_of_users_to_set(value))
 
 
 class ExtentBboxField(DynamicComputedField):
@@ -479,16 +510,22 @@ def __init__(self, *args, **kwargs):
         self.fields["uuid"] = serializers.CharField(read_only=True)
         self.fields["resource_type"] = serializers.CharField(required=False)
         self.fields["polymorphic_ctype_id"] = serializers.CharField(read_only=True)
-        self.fields["owner"] = DynamicRelationField(
-            UserSerializer, embed=True, many=False, read_only=True, required=False
-        )
-        self.fields["poc"] = ContactRoleField("poc", read_only=True)
-        self.fields["metadata_author"] = ContactRoleField("metadata_author", read_only=True)
-        self.fields["title"] = serializers.CharField()
+        self.fields["owner"] = DynamicRelationField(UserSerializer, embed=True, many=False, read_only=True)
+        self.fields["metadata_author"] = ContactRoleField(Roles.METADATA_AUTHOR.name, required=False)
+        self.fields["processor"] = ContactRoleField(Roles.PROCESSOR.name, required=False)
+        self.fields["publisher"] = ContactRoleField(Roles.PUBLISHER.name, required=False)
+        self.fields["custodian"] = ContactRoleField(Roles.CUSTODIAN.name, required=False)
+        self.fields["poc"] = ContactRoleField(Roles.POC.name, required=False)
+        self.fields["distributor"] = ContactRoleField(Roles.DISTRIBUTOR.name, required=False)
+        self.fields["resource_user"] = ContactRoleField(Roles.RESOURCE_USER.name, required=False)
+        self.fields["resource_provider"] = ContactRoleField(Roles.RESOURCE_PROVIDER.name, required=False)
+        self.fields["originator"] = ContactRoleField(Roles.ORIGINATOR.name, required=False)
+        self.fields["principal_investigator"] = ContactRoleField(Roles.PRINCIPAL_INVESTIGATOR.name, required=False)
+        self.fields["title"] = serializers.CharField(required=False)
         self.fields["abstract"] = serializers.CharField(required=False)
         self.fields["attribution"] = serializers.CharField(required=False)
         self.fields["doi"] = serializers.CharField(required=False)
-        self.fields["alternate"] = serializers.CharField(read_only=True)
+        self.fields["alternate"] = serializers.CharField(read_only=True, required=False)
         self.fields["date"] = serializers.DateTimeField(required=False)
         self.fields["date_type"] = serializers.CharField(required=False)
         self.fields["temporal_extent_start"] = serializers.DateTimeField(required=False)
@@ -559,6 +596,14 @@ class Meta:
             "owner",
             "poc",
             "metadata_author",
+            "processor",
+            "publisher",
+            "custodian",
+            "distributor",
+            "resource_user",
+            "resource_provider",
+            "originator",
+            "principal_investigator",
             "keywords",
             "tkeywords",
             "regions",
 
@@ -57,11 +57,12 @@
     ThesaurusLabel,
     TopicCategory,
 )
-from geonode.base.widgets import TaggitSelect2Custom
+from geonode.base.widgets import TaggitSelect2Custom, TaggitProfileSelect2Custom
 from geonode.base.fields import MultiThesauriField
 from geonode.documents.models import Document
 from geonode.layers.models import Dataset
 from geonode.base.utils import validate_extra_metadata, remove_country_from_languagecode
+from geonode.people import Roles
 
 logger = logging.getLogger(__name__)
 
@@ -348,6 +349,16 @@ def _get_thesauro_title_label(item, lang):
         return tname.first()
 
 
+class ContactRoleMultipleChoiceField(forms.ModelMultipleChoiceField):
+    def clean(self, value) -> QuerySet:
+        try:
+            users = get_user_model().objects.filter(username__in=value)
+        except TypeError:
+            # value of not supported type ...
+            raise forms.ValidationError(_("Something went wrong in finding the profile(s) in a contact role form ..."))
+        return users
+
+
 class LinkedResourceForm(forms.ModelForm):
     linked_resources = forms.ModelMultipleChoiceField(
         label=_("Related resources"),
@@ -418,8 +429,8 @@ class ResourceBaseForm(TranslationModelForm, LinkedResourceForm):
     data_quality_statement = forms.CharField(label=_("Data quality statement"), required=False, widget=TinyMCE())
 
     owner = forms.ModelChoiceField(
-        empty_label=_("Owner"),
-        label=_("Owner"),
+        empty_label=_(Roles.OWNER.label),
+        label=_(Roles.OWNER.label),
         required=True,
         queryset=get_user_model().objects.exclude(username="AnonymousUser"),
         widget=autocomplete.ModelSelect2(url="autocomplete_profile"),
@@ -448,20 +459,74 @@ class ResourceBaseForm(TranslationModelForm, LinkedResourceForm):
         widget=ResourceBaseDateTimePicker(options={"format": "YYYY-MM-DD HH:mm a"}),
     )
 
-    poc = forms.ModelChoiceField(
-        empty_label=_("Person outside GeoNode (fill form)"),
-        label=_("Point of Contact"),
-        required=False,
+    metadata_author = ContactRoleMultipleChoiceField(
+        label=_(Roles.METADATA_AUTHOR.label),
+        required=Roles.METADATA_AUTHOR.is_required,
         queryset=get_user_model().objects.exclude(username="AnonymousUser"),
-        widget=autocomplete.ModelSelect2(url="autocomplete_profile"),
+        widget=TaggitProfileSelect2Custom(url="autocomplete_profile"),
     )
 
-    metadata_author = forms.ModelChoiceField(
-        empty_label=_("Person outside GeoNode (fill form)"),
-        label=_("Metadata Author"),
-        required=False,
+    processor = ContactRoleMultipleChoiceField(
+        label=_(Roles.PROCESSOR.label),
+        required=Roles.PROCESSOR.is_required,
         queryset=get_user_model().objects.exclude(username="AnonymousUser"),
-        widget=autocomplete.ModelSelect2(url="autocomplete_profile"),
+        widget=TaggitProfileSelect2Custom(url="autocomplete_profile"),
+    )
+
+    publisher = ContactRoleMultipleChoiceField(
+        label=_(Roles.PUBLISHER.label),
+        required=Roles.PUBLISHER.is_required,
+        queryset=get_user_model().objects.exclude(username="AnonymousUser"),
+        widget=TaggitProfileSelect2Custom(url="autocomplete_profile"),
+    )
+
+    custodian = ContactRoleMultipleChoiceField(
+        label=_(Roles.CUSTODIAN.label),
+        required=Roles.CUSTODIAN.is_required,
+        queryset=get_user_model().objects.exclude(username="AnonymousUser"),
+        widget=TaggitProfileSelect2Custom(url="autocomplete_profile"),
+    )
+
+    poc = ContactRoleMultipleChoiceField(
+        label=_(Roles.POC.label),
+        required=Roles.POC.is_required,
+        queryset=get_user_model().objects.exclude(username="AnonymousUser"),
+        widget=TaggitProfileSelect2Custom(url="autocomplete_profile"),
+    )
+
+    distributor = ContactRoleMultipleChoiceField(
+        label=_(Roles.DISTRIBUTOR.label),
+        required=Roles.DISTRIBUTOR.is_required,
+        queryset=get_user_model().objects.exclude(username="AnonymousUser"),
+        widget=TaggitProfileSelect2Custom(url="autocomplete_profile"),
+    )
+
+    resource_user = ContactRoleMultipleChoiceField(
+        label=_(Roles.RESOURCE_USER.label),
+        required=Roles.RESOURCE_USER.is_required,
+        queryset=get_user_model().objects.exclude(username="AnonymousUser"),
+        widget=TaggitProfileSelect2Custom(url="autocomplete_profile"),
+    )
+
+    resource_provider = ContactRoleMultipleChoiceField(
+        label=_(Roles.RESOURCE_PROVIDER.label),
+        required=Roles.RESOURCE_PROVIDER.is_required,
+        queryset=get_user_model().objects.exclude(username="AnonymousUser"),
+        widget=TaggitProfileSelect2Custom(url="autocomplete_profile"),
+    )
+
+    originator = ContactRoleMultipleChoiceField(
+        label=_(Roles.ORIGINATOR.label),
+        required=Roles.ORIGINATOR.is_required,
+        queryset=get_user_model().objects.exclude(username="AnonymousUser"),
+        widget=TaggitProfileSelect2Custom(url="autocomplete_profile"),
+    )
+
+    principal_investigator = ContactRoleMultipleChoiceField(
+        label=_(Roles.PRINCIPAL_INVESTIGATOR.label),
+        required=Roles.PRINCIPAL_INVESTIGATOR.is_required,
+        queryset=get_user_model().objects.exclude(username="AnonymousUser"),
+        widget=TaggitProfileSelect2Custom(url="autocomplete_profile"),
     )
 
     keywords = TagField(
@@ -512,7 +577,7 @@ def __init__(self, *args, **kwargs):
                     }
                 )
 
-            if field in ["poc", "owner"] and not self.can_change_perms:
+            if field in ["owner"] and not self.can_change_perms:
                 self.fields[field].disabled = True
 
     def disable_keywords_widget_for_non_superuser(self, user):
 
@@ -5,19 +5,31 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('base', '0085_alter_resourcebase_uuid'),
+        ("base", "0085_alter_resourcebase_uuid"),
     ]
 
     operations = [
         migrations.CreateModel(
-            name='LinkedResource',
+            name="LinkedResource",
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('source', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='linked_to', to='base.resourcebase')),
-                ('target', models.ForeignKey(blank=True, on_delete=django.db.models.deletion.CASCADE, related_name='linked_by', to='base.resourcebase')),
-                ('internal', models.BooleanField(default=False)),
+                ("id", models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name="ID")),
+                (
+                    "source",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, related_name="linked_to", to="base.resourcebase"
+                    ),
+                ),
+                (
+                    "target",
+                    models.ForeignKey(
+                        blank=True,
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="linked_by",
+                        to="base.resourcebase",
+                    ),
+                ),
+                ("internal", models.BooleanField(default=False)),
             ],
         ),
     ]