Improve Sparse field handler

Author: etj

geonode/metadata/handlers/doi.py

@@ -45,4 +45,4 @@ def get_jsonschema_instance(self, resource, field_name, context, errors, lang=No
         return resource.doi
 
     def update_resource(self, resource, field_name, json_instance, context, errors, **kwargs):
-        resource.doi = json_instance[field_name]
+        resource.doi = json_instance.get(field_name, None)

geonode/metadata/handlers/sparse.py

@@ -88,6 +88,14 @@ def load_serialization_context(self, resource, jsonschema: dict, context: dict):
             "schema": jsonschema,
         }
 
+    @staticmethod
+    def get_sparse_field(context, fieldname):
+        return context[CONTEXT_ID]["fields"].get(fieldname, None)
+
+    @staticmethod
+    def set_sparse_field(context, fieldname, value):
+        context[CONTEXT_ID]["fields"][fieldname] = value
+
     @staticmethod
     def _check_type(declared, checked):
         return declared == checked or (type(declared) is list and checked in declared)

geonode/metadata/manager.py

@@ -92,6 +92,7 @@ def build_schema_instance(self, resource, lang=None):
 
         instance = {}
         errors = {}
+        required = schema.get("required", [])
         for fieldname, subschema in schema["properties"].items():
             # logger.debug(f"build_schema_instance: getting handler for property {fieldname}")
             handler_id = subschema.get("geonode:handler", None)
@@ -101,7 +102,8 @@ def build_schema_instance(self, resource, lang=None):
             handler = self.handlers[handler_id]
             try:
                 content = handler.get_jsonschema_instance(resource, fieldname, context, errors, lang)
-                instance[fieldname] = content
+                if content is not None or fieldname in required:
+                    instance[fieldname] = content
             except UnsetFieldException:
                 pass