geonetwork-ui 2.3.0-dev.376e0e90 → 2.3.0-dev.f736344f

package/src/libs/api/metadata-converter/src/lib/gn4/{gn4.converter.ts → gn4.metadata.mapper.ts}

@@ -2,14 +2,14 @@ import { Gn4FieldMapper } from './gn4.field.mapper'
 import { lastValueFrom } from 'rxjs'
 import { OrganizationsServiceInterface } from '../../../../../../libs/common/domain/src/lib/organizations.service.interface'
 import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/model/record'
-import { BaseConverter } from '../base.converter'
+import { MetadataBaseMapper } from '../metadata-base.mapper'
 import { Injectable } from '@angular/core'
 import { Gn4Record } from './types'
 
 @Injectable({
   providedIn: 'root',
 })
-export class Gn4Converter extends BaseConverter<Gn4Record> {
+export class Gn4MetadataMapper extends MetadataBaseMapper<Gn4Record> {
   constructor(
     private fieldMapper: Gn4FieldMapper,
     private orgsService: OrganizationsServiceInterface

package/src/libs/api/metadata-converter/src/lib/iso19139/converter.ts

@@ -0,0 +1,196 @@
+import {
+  CatalogRecord,
+  DatasetRecord,
+  ServiceRecord,
+} from '../../../../../../libs/common/domain/src/lib/model/record'
+import {
+  createDocument,
+  createElement,
+  getRootElement,
+  parseXmlString,
+  xmlToString,
+} from '../xml-utils'
+import {
+  writeAbstract,
+  writeContacts,
+  writeDatasetCreated,
+  writeDatasetUpdated,
+  writeDistributions,
+  writeGraphicOverviews,
+  writeKeywords,
+  writeKind,
+  writeLegalConstraints,
+  writeLicenses,
+  writeLineage,
+  writeOnlineResources,
+  writeOtherConstraints,
+  writeOwnerOrganization,
+  writeRecordUpdated,
+  writeSecurityConstraints,
+  writeSpatialRepresentation,
+  writeStatus,
+  writeTopics,
+  writeTitle,
+  writeUniqueIdentifier,
+  writeUpdateFrequency,
+} from './write-parts'
+import {
+  readAbstract,
+  readContacts,
+  readDatasetCreated,
+  readDatasetUpdated,
+  readDistributions,
+  readIsoTopics,
+  readKeywords,
+  readKind,
+  readLegalConstraints,
+  readLicenses,
+  readLineage,
+  readOnlineResources,
+  readOtherConstraints,
+  readOverviews,
+  readOwnerOrganization,
+  readRecordUpdated,
+  readRecordPublished,
+  readSecurityConstraints,
+  readSpatialExtents,
+  readSpatialRepresentation,
+  readStatus,
+  readTemporalExtents,
+  readTitle,
+  readUniqueIdentifier,
+  readUpdateFrequency,
+} from './read-parts'
+import { isEqual } from '../convert-utils'
+
+export function toModel(xml: string): CatalogRecord {
+  const doc = parseXmlString(xml)
+  const rootEl = getRootElement(doc)
+
+  const uniqueIdentifier = readUniqueIdentifier(rootEl)
+  const kind = readKind(rootEl)
+  const ownerOrganization = readOwnerOrganization(rootEl)
+  const title = readTitle(rootEl)
+  const abstract = readAbstract(rootEl)
+  const contacts = readContacts(rootEl)
+  const recordUpdated = readRecordUpdated(rootEl)
+  const recordCreated = recordUpdated
+  const recordPublished = readRecordPublished(rootEl)
+  const keywords = readKeywords(rootEl)
+  const topics = readIsoTopics(rootEl)
+  const legalConstraints = readLegalConstraints(rootEl)
+  const otherConstraints = readOtherConstraints(rootEl)
+  const securityConstraints = readSecurityConstraints(rootEl)
+  const licenses = readLicenses(rootEl)
+  const overviews = readOverviews(rootEl)
+
+  if (kind === 'dataset') {
+    const status = readStatus(rootEl)
+    const datasetCreated = readDatasetCreated(rootEl)
+    const datasetUpdated = readDatasetUpdated(rootEl)
+    const spatialRepresentation = readSpatialRepresentation(rootEl)
+    const spatialExtents = readSpatialExtents(rootEl)
+    const temporalExtents = readTemporalExtents(rootEl)
+    const lineage = readLineage(rootEl)
+    const distributions = readDistributions(rootEl)
+    const updateFrequency = readUpdateFrequency(rootEl)
+
+    return {
+      uniqueIdentifier,
+      kind,
+      languages: [],
+      recordCreated,
+      recordUpdated,
+      recordPublished,
+      status,
+      title,
+      abstract,
+      ownerOrganization,
+      contacts,
+      contactsForResource: [], // FIXME: is that really useful??
+      keywords,
+      topics,
+      licenses,
+      legalConstraints,
+      securityConstraints,
+      otherConstraints,
+      ...(datasetCreated && { datasetCreated }),
+      ...(datasetUpdated && { datasetUpdated }),
+      lineage,
+      ...(spatialRepresentation && { spatialRepresentation }),
+      overviews,
+      spatialExtents,
+      temporalExtents,
+      distributions,
+      updateFrequency,
+    } as DatasetRecord
+  } else {
+    const onlineResources = readOnlineResources(rootEl)
+    return {
+      uniqueIdentifier,
+      kind,
+      languages: [],
+      recordCreated,
+      recordUpdated,
+      recordPublished,
+      title,
+      abstract,
+      ownerOrganization,
+      contacts,
+      keywords,
+      topics,
+      licenses,
+      legalConstraints,
+      securityConstraints,
+      otherConstraints,
+      overviews,
+      onlineResources,
+    } as ServiceRecord
+  }
+}
+
+export function toXml(record: CatalogRecord, originalXml?: string): string {
+  const originalDoc = originalXml ? parseXmlString(originalXml) : null
+  const originalRecord = originalXml ? toModel(originalXml) : null
+  const rootEl = originalDoc
+    ? getRootElement(originalDoc)
+    : createElement('gmd:MD_Metadata')()
+
+  function fieldChanged(name: string) {
+    return originalRecord !== null
+      ? !isEqual(record[name], originalRecord[name])
+      : true
+  }
+
+  writeUniqueIdentifier(record, rootEl)
+  writeKind(record, rootEl)
+  fieldChanged('ownerOrganization') && writeOwnerOrganization(record, rootEl)
+  fieldChanged('recordUpdated') && writeRecordUpdated(record, rootEl)
+  writeTitle(record, rootEl)
+  writeAbstract(record, rootEl)
+  fieldChanged('contacts') && writeContacts(record, rootEl)
+  fieldChanged('keywords') && writeKeywords(record, rootEl)
+  fieldChanged('topics') && writeTopics(record, rootEl)
+  fieldChanged('legalConstraints') && writeLegalConstraints(record, rootEl)
+  fieldChanged('securityConstraints') &&
+    writeSecurityConstraints(record, rootEl)
+  fieldChanged('licenses') && writeLicenses(record, rootEl)
+  fieldChanged('otherConstraints') && writeOtherConstraints(record, rootEl)
+
+  if (record.kind === 'dataset') {
+    writeStatus(record, rootEl)
+    fieldChanged('updateFrequency') && writeUpdateFrequency(record, rootEl)
+    fieldChanged('datasetCreated') && writeDatasetCreated(record, rootEl)
+    fieldChanged('datasetUpdated') && writeDatasetUpdated(record, rootEl)
+    fieldChanged('spatialRepresentation') &&
+      writeSpatialRepresentation(record, rootEl)
+    fieldChanged('overviews') && writeGraphicOverviews(record, rootEl)
+    fieldChanged('distributions') && writeDistributions(record, rootEl)
+    writeLineage(record, rootEl)
+  } else {
+    fieldChanged('onlineResources') && writeOnlineResources(record, rootEl)
+  }
+
+  const newDocument = createDocument(rootEl)
+  return xmlToString(newDocument)
+}

package/src/libs/api/metadata-converter/src/lib/iso19139/read-parts.ts

@@ -1,6 +1,8 @@
 import {
   Constraint,
   DatasetDistribution,
+  DatasetSpatialExtent,
+  DatasetTemporalExtent,
   GraphicOverview,
   Individual,
   Keyword,
@@ -14,8 +16,8 @@ import {
   UpdateFrequency,
   UpdateFrequencyCustom,
 } from '../../../../../../libs/common/domain/src/lib/model/record'
-import { getStatusFromStatusCode } from './utils/status.mapper'
-import { getUpdateFrequencyFromFrequencyCode } from './utils/update-frequency.mapper'
+import { getStatusFromStatusCode } from './codelists/status.mapper'
+import { getUpdateFrequencyFromFrequencyCode } from './codelists/update-frequency.mapper'
 import {
   findChildElement,
   findChildrenElement,
@@ -37,15 +39,11 @@ import {
   mapArray,
   pipe,
 } from '../function-utils'
-import { getRoleFromRoleCode } from './utils/role.mapper'
+import { getRoleFromRoleCode } from './codelists/role.mapper'
 import { matchMimeType, matchProtocol } from '../common/distribution.mapper'
-import { getKeywordTypeFromKeywordTypeCode } from './utils/keyword.mapper'
-import { fullNameToParts } from './utils/individual-name'
+import { getKeywordTypeFromKeywordTypeCode } from './codelists/keyword.mapper'
 
-export function extractCharacterString(): ChainableFunction<
-  XmlElement,
-  string
-> {
+function extractCharacterString(): ChainableFunction<XmlElement, string> {
   return pipe(
     fallback(
       findChildElement('gco:CharacterString', false),
@@ -55,7 +53,7 @@ export function extractCharacterString(): ChainableFunction<
   )
 }
 
-export function extractDateTime(): ChainableFunction<XmlElement, Date> {
+function extractDateTime(): ChainableFunction<XmlElement, Date> {
   return pipe(
     fallback(
       findChildElement('gco:DateTime', false),
@@ -66,7 +64,7 @@ export function extractDateTime(): ChainableFunction<XmlElement, Date> {
   )
 }
 
-export function extractUrl(): ChainableFunction<XmlElement, URL> {
+function extractUrl(): ChainableFunction<XmlElement, URL> {
   const getUrl = pipe(findChildElement('gmd:URL', false), readText())
   const getCharacterString = pipe(
     findChildElement('gco:CharacterString', false),
@@ -88,12 +86,12 @@ export function extractUrl(): ChainableFunction<XmlElement, URL> {
   )
 }
 
-export function extractMandatoryUrl() {
+function extractMandatoryUrl() {
   return fallback(extractUrl(), () => new URL('http://missing'))
 }
 
 // from gmd:role
-export function extractRole(): ChainableFunction<XmlElement, Role> {
+function extractRole(): ChainableFunction<XmlElement, Role> {
   return pipe(
     findChildElement('gmd:CI_RoleCode'),
     readAttribute('codeListValue'),
@@ -102,10 +100,7 @@ export function extractRole(): ChainableFunction<XmlElement, Role> {
 }
 
 // from gmd:CI_ResponsibleParty
-export function extractOrganization(): ChainableFunction<
-  XmlElement,
-  Organization
-> {
+function extractOrganization(): ChainableFunction<XmlElement, Organization> {
   const getUrl = pipe(
     findNestedElements(
       'gmd:contactInfo',
@@ -133,7 +128,10 @@ export function extractOrganization(): ChainableFunction<
 }
 
 // from gmd:CI_ResponsibleParty
-export function extractIndividual(): ChainableFunction<XmlElement, Individual> {
+function extractIndividuals(): ChainableFunction<
+  XmlElement,
+  Array<Individual>
+> {
   const getRole = pipe(findChildElement('gmd:role'), extractRole())
   const getPosition = pipe(
     findChildElement('gmd:positionName'),
@@ -144,70 +142,40 @@ export function extractIndividual(): ChainableFunction<XmlElement, Individual> {
     extractCharacterString(),
     map((fullName) => {
       if (!fullName) return []
-      return fullNameToParts(fullName)
+      const parts = fullName.split(/\s+/)
+      if (!parts.length) return [fullName, null]
+      const first = parts.shift()
+      return [first, parts.join(' ')]
     })
   )
   const getOrganization = extractOrganization()
-  const getContactRoot = findNestedElement('gmd:contactInfo', 'gmd:CI_Contact')
   const getEmail = pipe(
-    getContactRoot,
     findChildElement('gmd:electronicMailAddress'),
     extractCharacterString(),
     map((email) => (email === null ? 'missing@missing.com' : email))
   )
-  const getAddress = pipe(
-    getContactRoot,
-    findNestedElement('gmd:address', 'gmd:CI_Address'),
-    combine(
-      pipe(
-        findChildElement('gmd:deliveryPoint', false),
-        extractCharacterString()
-      ),
-      pipe(findChildElement('gmd:city', false), extractCharacterString()),
-      pipe(findChildElement('gmd:postalCode', false), extractCharacterString()),
-      pipe(findChildElement('gmd:country', false), extractCharacterString())
-    ),
-    map((parts) => parts.filter((p) => !!p).join(', '))
-  )
-  const getPhone = pipe(
-    getContactRoot,
-    findNestedElement('gmd:phone', 'gmd:CI_Telephone', 'gmd:voice'),
-    extractCharacterString()
-  )
   return pipe(
     combine(
       getRole,
       getPosition,
       getNameParts,
       getOrganization,
-      getEmail,
-      getAddress,
-      getPhone
+      pipe(findChildrenElement('gmd:contactInfo'), mapArray(getEmail))
     ),
-    map(
-      ([
-        role,
-        position,
-        [firstName, lastName],
-        organization,
-        email,
-        address,
-        phone,
-      ]) => ({
+    map(([role, position, [firstName, lastName], organization, emails]) =>
+      emails.map((email) => ({
         email,
         role,
         organization,
         ...(position && { position }),
         ...(firstName && { firstName }),
         ...(lastName && { lastName }),
-        ...(address && { address }),
-        ...(phone && { phone }),
-      })
+      }))
     )
   )
 }
 
-export function extractStatus(): ChainableFunction<XmlElement, RecordStatus> {
+function extractStatus(): ChainableFunction<XmlElement, RecordStatus> {
   return pipe(
     findChildElement('gmd:MD_ProgressCode'),
     readAttribute('codeListValue'),
@@ -216,7 +184,7 @@ export function extractStatus(): ChainableFunction<XmlElement, RecordStatus> {
 }
 
 // from gmd:resourceConstraints
-export function extractLegalConstraints(): ChainableFunction<
+function extractLegalConstraints(): ChainableFunction<
   XmlElement,
   Array<Constraint>
 > {
@@ -246,7 +214,7 @@ export function extractLegalConstraints(): ChainableFunction<
 }
 
 // from gmd:resourceConstraints
-export function extractSecurityConstraints(): ChainableFunction<
+function extractSecurityConstraints(): ChainableFunction<
   XmlElement,
   Array<Constraint>
 > {
@@ -262,7 +230,7 @@ export function extractSecurityConstraints(): ChainableFunction<
 }
 
 // from gmd:resourceConstraints
-export function extractOtherConstraints(): ChainableFunction<
+function extractOtherConstraints(): ChainableFunction<
   XmlElement,
   Array<Constraint>
 > {
@@ -278,10 +246,7 @@ export function extractOtherConstraints(): ChainableFunction<
 }
 
 // from gmd:resourceConstraints
-export function extractLicenses(): ChainableFunction<
-  XmlElement,
-  Array<Constraint>
-> {
+function extractLicenses(): ChainableFunction<XmlElement, Array<Constraint>> {
   return pipe(
     findChildrenElement('gmd:MD_LegalConstraints', false),
     filterArray(
@@ -307,20 +272,18 @@ export function extractLicenses(): ChainableFunction<
   )
 }
 
-const getMimeType = pipe(
-  findParent('gmd:MD_Distribution'),
-  findNestedElement('gmd:distributionFormat', 'gmd:MD_Format', 'gmd:name'),
-  extractCharacterString(),
-  map(matchMimeType)
-)
+// from gmd:MD_Distribution
+function extractDatasetDistributions(): ChainableFunction<
+  XmlElement,
+  DatasetDistribution[]
+> {
+  const getFormat = pipe(
+    findParent('gmd:MD_Distribution'),
+    findNestedElement('gmd:distributionFormat', 'gmd:MD_Format', 'gmd:name'),
+    extractCharacterString(),
+    map(matchMimeType)
+  )
 
-/**
- * Extract distributions from a MD_Distribution element
- * @param getMimeTypeFn This function starts from a gmd:transferOptions element
- */
-export function extractDatasetDistributions(
-  getMimeTypeFn: ChainableFunction<XmlElement, string>
-): ChainableFunction<XmlElement, DatasetDistribution[]> {
   const getUrl = pipe(findChildElement('gmd:linkage'), extractMandatoryUrl())
   const getProtocolStr = pipe(
     findChildElement('gmd:protocol'),
@@ -363,11 +326,11 @@ export function extractDatasetDistributions(
         getUrl,
         getName,
         getDescription,
-        getMimeTypeFn
+        getFormat
       )
     ),
     mapArray(
-      ([isService, isDownload, protocol, url, name, description, mimeType]) => {
+      ([isService, isDownload, protocol, url, name, description, format]) => {
         if (isService) {
           const hasIdentifier = protocol === 'wms' || protocol === 'wfs'
           return {
@@ -379,6 +342,7 @@ export function extractDatasetDistributions(
             ...(description && { description }),
           }
         } else if (isDownload) {
+          const mimeType = format
           return {
             type: 'download',
             url: url,
@@ -399,7 +363,7 @@ export function extractDatasetDistributions(
   )
 }
 
-export function getUpdateFrequencyFromCustomPeriod(
+function getUpdateFrequencyFromCustomPeriod(
   isoPeriod: string
 ): UpdateFrequencyCustom {
   if (!isoPeriod) return null
@@ -451,7 +415,7 @@ export function getUpdateFrequencyFromCustomPeriod(
 }
 
 // from gmd:MD_MaintenanceInformation
-export function extractUpdateFrequency(): ChainableFunction<
+function extractUpdateFrequency(): ChainableFunction<
   XmlElement,
   UpdateFrequency
 > {
@@ -475,24 +439,18 @@ export function extractUpdateFrequency(): ChainableFunction<
 
 /**
  * Looks for srv:SV_ServiceIdentification or gmd:MD_DataIdentification element
- * Will find the first one that exists, not reading the type of the record
- * (this allows using this function in other similar schemas)
+ * depending on record type
  */
-export function findIdentification() {
-  return pipe(
-    findChildElement('gmd:identificationInfo', false),
-    combine(
-      findChildElement('gmd:MD_DataIdentification', false),
-      findChildElement('srv:SV_ServiceIdentification', false)
-    ),
-    filterArray((el) => el !== null),
-    getAtIndex(0)
-  )
+function findIdentification() {
+  return (rootEl: XmlElement) => {
+    const kind = readKind(rootEl)
+    let eltName = 'gmd:MD_DataIdentification'
+    if (kind === 'service') eltName = 'srv:SV_ServiceIdentification'
+    return findNestedElement('gmd:identificationInfo', eltName)(rootEl)
+  }
 }
 
-export function extractIdentificationDate(
-  type: 'creation' | 'revision' | 'publication'
-) {
+function extractCitationDate(type: 'creation' | 'revision' | 'publication') {
   return pipe(
     findIdentification(),
     findNestedElements('gmd:citation', 'gmd:CI_Citation', 'gmd:date'),
@@ -515,7 +473,7 @@ export function extractIdentificationDate(
   )
 }
 
-export function getSpatialRepresentationFromCode(
+function getSpatialRepresentationFromCode(
   spatialRepresentationCode: string
 ): SpatialRepresentationType | null {
   switch (spatialRepresentationCode) {
@@ -555,19 +513,11 @@ export function readOwnerOrganization(rootEl: XmlElement): Organization {
   )(rootEl)
 }
 
-export function readResourceUpdated(rootEl: XmlElement): Date {
-  return extractIdentificationDate('revision')(rootEl)
-}
-
-export function readResourceCreated(rootEl: XmlElement): Date {
-  return extractIdentificationDate('creation')(rootEl)
-}
-
-export function readResourcePublished(rootEl: XmlElement): Date {
-  return extractIdentificationDate('publication')(rootEl)
+export function readRecordUpdated(rootEl: XmlElement): Date {
+  return pipe(findChildElement('gmd:dateStamp'), extractDateTime())(rootEl)
 }
 
-export function readRecordUpdated(rootEl: XmlElement): Date {
+export function readRecordPublished(rootEl: XmlElement): Date {
   return pipe(findChildElement('gmd:dateStamp'), extractDateTime())(rootEl)
 }
 
@@ -587,29 +537,30 @@ export function readAbstract(rootEl: XmlElement): string {
   )(rootEl)
 }
 
-export function readContacts(rootEl: XmlElement): Individual[] {
-  return pipe(
-    findChildrenElement('gmd:contact', false),
-    mapArray(findChildElement('gmd:CI_ResponsibleParty', false)),
-    mapArray(extractIndividual())
-  )(rootEl)
+export function readDatasetCreated(rootEl: XmlElement): Date {
+  return extractCitationDate('creation')(rootEl)
 }
 
-export function readContactsForResource(rootEl: XmlElement): Individual[] {
+export function readDatasetUpdated(rootEl: XmlElement): Date {
+  return extractCitationDate('revision')(rootEl)
+}
+
+export function readContacts(rootEl: XmlElement): Individual[] {
   return pipe(
     findIdentification(),
     combine(
-      findChildrenElement('gmd:contact', false),
-      findChildrenElement('gmd:pointOfContact', false)
+      findChildrenElement('gmd:contact'),
+      findChildrenElement('gmd:pointOfContact')
     ),
     flattenArray(),
     mapArray(findChildElement('gmd:CI_ResponsibleParty', false)),
-    mapArray(extractIndividual())
+    mapArray(extractIndividuals()),
+    flattenArray()
   )(rootEl)
 }
 
 // from gmd:thesaurusName
-export function readThesaurus(rootEl: XmlElement): KeywordThesaurus {
+function readThesaurus(rootEl: XmlElement): KeywordThesaurus {
   if (!rootEl) return null
 
   const findIdentifier = findNestedElement(
@@ -632,7 +583,7 @@ export function readThesaurus(rootEl: XmlElement): KeywordThesaurus {
 }
 
 // from gmd:MD_Keywords
-export function readKeywordGroup(rootEl: XmlElement): Keyword[] {
+function readKeywordGroup(rootEl: XmlElement): Keyword[] {
   const type = pipe(
     findChildrenElement('gmd:MD_KeywordTypeCode'),
     mapArray(readAttribute('codeListValue')),
@@ -750,6 +701,16 @@ export function readOverviews(rootEl: XmlElement): GraphicOverview[] {
   )(rootEl)
 }
 
+export function readSpatialExtents(rootEl: XmlElement): DatasetSpatialExtent[] {
+  return [] // TODO
+}
+
+export function readTemporalExtents(
+  rootEl: XmlElement
+): DatasetTemporalExtent[] {
+  return [] // TODO
+}
+
 export function readLineage(rootEl: XmlElement): string {
   return pipe(
     findNestedElement(
@@ -766,7 +727,7 @@ export function readLineage(rootEl: XmlElement): string {
 export function readDistributions(rootEl: XmlElement): DatasetDistribution[] {
   return pipe(
     findNestedElements('gmd:distributionInfo', 'gmd:MD_Distribution'),
-    mapArray(extractDatasetDistributions(getMimeType)),
+    mapArray(extractDatasetDistributions()),
     flattenArray()
   )(rootEl)
 }