WIP bonares metadata schema implementation

Author: mwallschlaeger

.devcontainer/.env

@@ -43,7 +43,6 @@ ASYNC_SIGNALS=True
 SITEURL=http://localhost:8000/
 
 ALLOWED_HOSTS="['django', '*']"
-PORXY_URL=""
 
 # Data Uploader
 DEFAULT_BACKEND_UPLOADER=geonode.importer
@@ -165,7 +164,7 @@ SECRET_KEY='myv-y4#7j-d*p-__@j#*3z@!y24fz8%^z2v6atuy4bo9vqr1_a'
 # GEOIP_PATH=/mnt/volumes/statics/geoip.db
 
 CACHE_BUSTING_STATIC_ENABLED=False
-PROXY_URL=""
+
 MEMCACHED_ENABLED=False
 MEMCACHED_BACKEND=django.core.cache.backends.memcached.MemcachedCache
 MEMCACHED_LOCATION=127.0.0.1:11211

entrypoint.sh

@@ -16,7 +16,6 @@ invoke () {
 
 # Start cron && memcached services
 service cron restart
-service memcached restart
 
 echo $"\n\n\n"
 echo "-----------------------------------------------------"
@@ -64,8 +63,8 @@ else
     invoke statics
     invoke waitforgeoserver
     invoke geoserverfixture
+
     echo "Executing UWSGI server $cmd for Production"
-    #invoke initzalf
 fi
 
 echo "-----------------------------------------------------"

examples/create_funder.py

@@ -0,0 +1,19 @@
+# create funder example
+
+import sys, os, django
+sys.path.append("/") #here store is root folder(means parent).
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "store.settings")
+django.setup()
+
+from geonode.base.models import FundingReference, Funder, ResourceBase
+
+fr = FundingReference.objects.all()[0]
+f = Funder( funding_reference=fr,
+        award_number="25132", 
+        award_uri="http://cordis.europa.eu/project/rcn/100180_en.html", 
+        award_title="The human readable title of the award (grant). (e.g. MOTivational strength of ecosystem service)")
+
+r = ResourceBase.objects.all()[0]
+r.funders.add(f)
+r.save()
+

examples/create_related_identifier.py

@@ -0,0 +1,16 @@
+
+import sys, os, django
+sys.path.append("/") #here store is root folder(means parent).
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "store.settings")
+django.setup()
+
+from geonode.base.models import RelationType, RelatedIdentifier, ResourceBase, RelatedIdentifierType
+
+rt = RelationType.objects.all()[0]
+rit = RelatedIdentifierType.objects.all()[0]
+ri = RelatedIdentifier.objects.create(related_identifier="test",
+                                 related_identifier_type=rit,
+                                 relation_type=rt
+                                 )
+rb = ResourceBase.objects.all()[0]
+rb.related_identifier.add(ri)

examples/test_rest.py

@@ -0,0 +1,18 @@
+import sys, os, django
+sys.path.append("/") #here store is root folder(means parent).
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "store.settings")
+django.setup()
+
+import io
+from rest_framework.renderers import JSONRenderer
+from geonode.base.models import ResourceBase
+from geonode.base.api.serializers import ResourceBaseSerializer
+from rest_framework.parsers import JSONParser
+
+r = ResourceBase.objects.all()[0]
+s = ResourceBaseSerializer(r)
+json = JSONRenderer().render(s.data)
+stream = io.BytesIO(json)
+data = JSONParser().parse(stream)
+se = ResourceBaseSerializer(data=data)
+se.is_valid()

geonode/base/api/fields.py

@@ -23,50 +23,45 @@
 from rest_framework.exceptions import ParseError
 from dynamic_rest.fields.fields import DynamicRelationField
 
-from geonode.base.models import (
-              RelatedIdentifierType, 
-              RelationType, 
-              RelatedIdentifier,
-              FundingReference,
-              Funder
-            )
+from geonode.base.models import RelatedIdentifierType, RelationType, RelatedIdentifier, FundingReference, Funder
 
-class RelatedIdentifierDynamicRelationField(DynamicRelationField):
 
+class RelatedIdentifierDynamicRelationField(DynamicRelationField):
     def to_internal_value_single(self, data, serializer):
         try:
-            rit = RelatedIdentifierType.objects.get(**data['related_identifier_type'])
-            rt = RelationType.objects.get(**data['relation_type'])
-            RelatedIdentifier.objects.get_or_create(related_identifier=data['related_identifier'],
-                                                related_identifier_type=rit,
-                                                relation_type=rt)[0].save()
-            r = RelatedIdentifier.objects.get(related_identifier=data['related_identifier'], related_identifier_type=rit, relation_type=rt)
+            rit = RelatedIdentifierType.objects.get(**data["related_identifier_type"])
+            rt = RelationType.objects.get(**data["relation_type"])
+            RelatedIdentifier.objects.get_or_create(
+                related_identifier=data["related_identifier"], related_identifier_type=rit, relation_type=rt
+            )[0].save()
+            r = RelatedIdentifier.objects.get(
+                related_identifier=data["related_identifier"], related_identifier_type=rit, relation_type=rt
+            )
         except TypeError:
             raise ParseError(detail="Could not convert related_identifier to internal object ...", code=400)
-        return r 
+        return r
 
-class FundersDynamicRelationField(DynamicRelationField):
 
+class FundersDynamicRelationField(DynamicRelationField):
     def to_internal_value_single(self, data, serializer):
         try:
-            funding_reference = FundingReference.objects.get(**data['funding_reference'])
-            data['funding_reference'] = funding_reference
+            funding_reference = FundingReference.objects.get(**data["funding_reference"])
+            data["funding_reference"] = funding_reference
         except TypeError:
             raise ParseError(detail="Missing funding_reference object in funders ...", code=400)
         try:
             funder = Funder.objects.get_or_create(**data)
         except TypeError:
             raise ParseError(detail="Could not convert related_identifier to internal object ...", code=400)
         return funder
-                
+
 
 class ComplexDynamicRelationField(DynamicRelationField):
-  
     def to_internal_value_single(self, data, serializer):
         """Overwrite of DynamicRelationField implementation to handle complex data structure initialization
 
         Args:
-            data (Union[str, Dict]}): serialized or deserialized data from http calls (POST, GET ...), 
+            data (Union[str, Dict]}): serialized or deserialized data from http calls (POST, GET ...),
                                       if content-type application/json is used, data shows up as dict
             serializer (DynamicModelSerializer): Serializer for the given data
 
@@ -81,7 +76,7 @@ def to_internal_value_single(self, data, serializer):
                 data = json.loads(data)
         except ValueError:
             return super().to_internal_value_single(data, serializer)
-          
+
         if isinstance(data, dict):
             try:
                 if hasattr(serializer, "many") and serializer.many is True:

geonode/base/api/serializers.py

@@ -57,7 +57,11 @@
     Funder,
 )
 from geonode.groups.models import GroupCategory, GroupProfile
-from geonode.base.api.fields import ComplexDynamicRelationField, RelatedIdentifierDynamicRelationField, FundersDynamicRelationField
+from geonode.base.api.fields import (
+    ComplexDynamicRelationField,
+    RelatedIdentifierDynamicRelationField,
+    FundersDynamicRelationField,
+)
 from geonode.utils import build_absolute_uri
 from geonode.security.utils import get_resources_with_perms
 from geonode.resource.models import ExecutionRequest
@@ -66,6 +70,7 @@
 
 logger = logging.getLogger(__name__)
 
+
 class BaseDynamicModelSerializer(DynamicModelSerializer):
     def to_representation(self, instance):
         data = super().to_representation(instance)
@@ -159,7 +164,6 @@ def to_representation(self, value):
         return {"name": value.name, "slug": value.slug}
 
 
-
 class _ThesaurusKeywordSerializerMixIn:
     def to_representation(self, value):
         _i18n = {}
@@ -183,7 +187,7 @@ class Meta:
         model = ThesaurusKeyword
         name = "ThesaurusKeyword"
         fields = ("alt_label",)
-    
+
 
 class SimpleRegionSerializer(DynamicModelSerializer):
     class Meta:
@@ -197,7 +201,7 @@ class Meta:
         model = RelatedIdentifierType
         name = "RelatedIdentifierType"
         fields = ("label", "description")
-    
+
 
 class SimpleRelationType(DynamicModelSerializer):
     class Meta:
@@ -214,8 +218,8 @@ class Meta:
 
     related_identifier_type = DynamicRelationField(SimpleRelatedIdentifierType, embed=True, many=False)
     relation_type = DynamicRelationField(SimpleRelationType, embed=True, many=False)
-  
-  
+
+
 class FundingReferenceSerializer(DynamicModelSerializer):
     class Meta:
         model = FundingReference
@@ -236,7 +240,14 @@ class SimpleRelatedProjectSerializer(DynamicModelSerializer):
     class Meta:
         model = RelatedProject
         name = "RelatedProject"
-        fields = ("label","display_name")
+        fields = ("label", "display_name")
+
+
+class SimpleResourceSerializer(DynamicModelSerializer):
+    class Meta:
+        model = ResourceBase
+        name = "resource"
+        fields = ("pk", "title")  # TODO add UUID
 
 
 class SimpleTopicCategorySerializer(DynamicModelSerializer):
@@ -357,7 +368,7 @@ class Meta:
         model = get_user_model()
         name = "user"
         view_name = "users-list"
-        fields = ("pk", "username", "first_name", "last_name", "avatar", "perms", "is_superuser", "is_staff")
+        fields = ("pk", "username", "first_name", "last_name", "avatar", "perms", "is_superuser", "is_staff", "orcid_identifier")
 
     @classmethod
     def setup_eager_loading(cls, queryset):
@@ -483,6 +494,7 @@ def __init__(self, *args, **kwargs):
         self.fields["title_translated"] = serializers.CharField()
 
         self.fields["abstract"] = serializers.CharField(required=False)
+        # BONARES ELEMENTS
         self.fields["abstract_translated"] = serializers.CharField(required=False)
 
         self.fields["subtitle"] = serializers.CharField(required=False)
@@ -493,13 +505,30 @@ def __init__(self, *args, **kwargs):
         self.fields["other_description"] = serializers.CharField(required=False)
 
         self.fields["related_identifier"] = RelatedIdentifierDynamicRelationField(
-            SimpleRelatedIdentifierSerializer, embed=True, many=True)
-        self.fields["funders"] = FundersDynamicRelationField(
-            SimpleFunderSerializer, embed=True, many=True)
+            SimpleRelatedIdentifierSerializer, embed=True, many=True
+        )
+        self.fields["funders"] = FundersDynamicRelationField(SimpleFunderSerializer, embed=True, many=True)
         self.fields["related_projects"] = ComplexDynamicRelationField(
-            SimpleRelatedProjectSerializer, embed=True, many=True)
+            SimpleRelatedProjectSerializer, embed=True, many=True
+        )
+        self.fields["conformity_results"] = serializers.CharField(required=False)
+        self.fields["conformity_explanation"] = serializers.CharField(required=False)
+        self.fields["parent_identifier"] = ComplexDynamicRelationField(
+            SimpleResourceSerializer, embed=True, many=False, required=False
+        )
+        self.fields["date_available"] = serializers.DateField(required=True)
+        self.fields["date_updated"] = serializers.DateField(required=True)
+        self.fields["date_created"] = serializers.DateField(required=True)
+        self.fields["date_issued"] = serializers.DateField(required=True)
+
+        self.fields["date_accepted"] = serializers.DateField(required=False)
+        self.fields["date_collected"] = serializers.DateField(required=False)
+        self.fields["date_copyrighted"] = serializers.DateField(required=False)
+        self.fields["date_submitted"] = serializers.DateField(required=False)
+        self.fields["date_valid"] = serializers.DateField(required=False)
 
-        
+        self.fields["metadata_standard_name"] = serializers.CharField(read_only=True)
+        self.fields["metadata_standard_version"] = serializers.CharField(read_only=True)
 
         self.fields["attribution"] = serializers.CharField(required=False)
         self.fields["doi"] = serializers.CharField(required=False)
@@ -540,7 +569,9 @@ def __init__(self, *args, **kwargs):
 
         self.fields["embed_url"] = EmbedUrlField(required=False)
         self.fields["thumbnail_url"] = ThumbnailUrlField(read_only=True)
-        self.fields["keywords"] = ComplexDynamicRelationField(SimpleHierarchicalKeywordSerializer, embed=False, many=True)
+        self.fields["keywords"] = ComplexDynamicRelationField(
+            SimpleHierarchicalKeywordSerializer, embed=False, many=True
+        )
         self.fields["tkeywords"] = ComplexDynamicRelationField(SimpleThesaurusKeywordSerializer, embed=False, many=True)
         self.fields["regions"] = DynamicRelationField(SimpleRegionSerializer, embed=True, many=True, read_only=True)
         self.fields["category"] = ComplexDynamicRelationField(SimpleTopicCategorySerializer, embed=True, many=False)
@@ -552,7 +583,7 @@ def __init__(self, *args, **kwargs):
         )
         self.fields["license"] = ComplexDynamicRelationField(LicenseSerializer, embed=True, many=False)
         self.fields["spatial_representation_type"] = ComplexDynamicRelationField(
-           SpatialRepresentationTypeSerializer, embed=True, many=False
+            SpatialRepresentationTypeSerializer, embed=True, many=False
         )
         self.fields["blob"] = serializers.JSONField(required=False, write_only=True)
         self.fields["is_copyable"] = serializers.BooleanField(read_only=True)
@@ -594,6 +625,20 @@ class Meta:
             "other_description",
             "related_identifier",
             "funders",
+            "conformity_results",
+            "conformity_explanation",
+            "parent_identifier",
+            "date_accepted",
+            "date_available",
+            "date_collected",
+            "date_copyrighted",
+            "date_created",
+            "date_issued",
+            "date_submitted",
+            "date_updated",
+            "date_valid",
+            "metadata_standard_name",
+            "metadata_standard_version",
             "doi",
             "bbox_polygon",
             "ll_bbox_polygon",
@@ -782,8 +827,8 @@ class Meta:
         count_type = "category"
         view_name = "categories-list"
         fields = "__all__"
-        
-  
+
+
 class RelationTypeSerializer(DynamicModelSerializer):
     class Meta:
         name = "relationtypes"
@@ -807,13 +852,15 @@ class Meta:
         count_type = "fundingreferences"
         fields = "__all__"
 
+
 class RelatedProjectSerializer(DynamicModelSerializer):
     class Meta:
         name = "relatedprojects"
         model = RelatedProject
         count_type = "relatedprojects"
         fields = "__all__"
 
+
 class OwnerSerializer(BaseResourceCountSerializer):
     class Meta:
         name = "owners"