[Fixes #12362] Maintenance Frequency is not imported from ISO metadata

Author: etj

geonode/base/fixtures/test_xml.xml

@@ -251,9 +251,18 @@
            </gmd:role>
          </gmd:CI_ResponsibleParty>
        </gmd:pointOfContact>
-       
 
-       
+       <gmd:resourceMaintenance>
+         <gmd:MD_MaintenanceInformation>
+           <gmd:maintenanceAndUpdateFrequency>
+             <gmd:MD_MaintenanceFrequencyCode
+                     codeSpace="ISOTC211/19115"
+                     codeList="http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#MD_MaintenanceFrequencyCode"
+                     codeListValue="daily">daily</gmd:MD_MaintenanceFrequencyCode>
+           </gmd:maintenanceAndUpdateFrequency>
+         </gmd:MD_MaintenanceInformation>
+       </gmd:resourceMaintenance>
+
        <gmd:graphicOverview>
          <gmd:MD_BrowseGraphic>
            <gmd:fileName>

geonode/layers/metadata.py

@@ -22,18 +22,19 @@
 # Standard Modules
 import logging
 import datetime
-from owslib.etree import etree as dlxml
-from django.conf import settings
-
-# Geonode functionality
-from geonode import GeoNodeException
 
 # OWSLib functionality
+from owslib import iso, util
 from owslib.csw import CswRecord
-from owslib.iso import MD_Metadata, MD_Keywords
+from owslib.etree import etree as dlxml
 from owslib.fgdc import Metadata
+
+from django.conf import settings
 from django.utils import timezone
 
+from geonode import GeoNodeException
+
+
 LOGGER = logging.getLogger(__name__)
 
 
@@ -76,7 +77,7 @@ def iso2dict(exml):
     regions = []
     keywords = []
 
-    mdata = MD_Metadata(exml)
+    mdata = iso.MD_Metadata(exml)
     identifier = mdata.identifier
     vals["language"] = mdata.language or mdata.languagecode or "eng"
     if mdata.identification[0].spatialrepresentationtype:
@@ -112,6 +113,15 @@ def iso2dict(exml):
 
         vals["purpose"] = mdata.identification[0].purpose
 
+        freq_elem = exml.find(
+            util.nspath_eval(
+                "gmd:identificationInfo/gmd:MD_DataIdentification/gmd:resourceMaintenance/gmd:MD_MaintenanceInformation/gmd:maintenanceAndUpdateFrequency/gmd:MD_MaintenanceFrequencyCode",
+                iso.namespaces,
+            )
+        )
+        freq = freq_elem.attrib.get("codeListValue", None) if freq_elem is not None else None
+        vals["maintenance_frequency"] = freq or "unknown"
+
     if mdata.dataquality is not None:
         vals["data_quality_statement"] = mdata.dataquality.lineage
 
@@ -258,7 +268,7 @@ def convert_keyword(keywords, iso2dict=False, theme="theme"):
 def convert_iso_keywords(keywords):
     _keywords = []
     for kw in keywords:
-        if isinstance(kw, MD_Keywords):
+        if isinstance(kw, iso.MD_Keywords):
             _keywords.append([_kw.name for _kw in kw.keywords])
         else:
             _keywords.append(kw)

geonode/layers/tests.py

@@ -1124,6 +1124,7 @@ def test_set_metadata_return_expected_values_from_xml(self):
             "data_quality_statement": "Created with GeoNode",
             "date": datetime.datetime(2021, 4, 9, 9, 0, 46),
             "language": "eng",
+            "maintenance_frequency": "daily",
             "purpose": None,
             "spatial_representation_type": "vector",
             "supplemental_information": "No information provided",
@@ -1184,6 +1185,7 @@ def setUp(self):
             "data_quality_statement": "Created with GeoNode",
             "date": datetime.datetime(2021, 4, 9, 9, 0, 46),
             "language": "eng",
+            "maintenance_frequency": "daily",
             "purpose": None,
             "spatial_representation_type": "vector",
             "supplemental_information": "No information provided",

geonode/resource/utils.py

@@ -170,15 +170,18 @@ def update_resource(
     if vals:
         for key, value in vals.items():
             if key == "spatial_representation_type":
-                defaults[key] = SpatialRepresentationType.objects.filter(identifier=value).first() if value else None
+                value = SpatialRepresentationType.objects.filter(identifier=value).first() if value else None
             elif key == "topic_category":
                 value, created = TopicCategory.objects.get_or_create(
                     identifier=value, defaults={"description": "", "gn_description": value}
                 )
                 key = "category"
-                defaults[key] = value
-            else:
-                defaults[key] = value
+            elif key == "maintenance_frequency":
+                if value not in dict(enumerations.UPDATE_FREQUENCIES).keys():
+                    logger.warning(f"Bad frequency parsed: {value}")
+                    value = "unknown"
+
+            defaults[key] = value
 
     contact_roles = {
         contact_role.name: defaults.pop(contact_role.name, getattr(instance, contact_role.name))