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

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

@@ -36,7 +36,6 @@ import {
 } from '../xml-utils'
 import {
   ChainableFunction,
-  combine,
   fallback,
   filterArray,
   getAtIndex,
@@ -48,9 +47,8 @@ import {
 } from '../function-utils'
 import format from 'date-fns/format'
 import { readKind } from './read-parts'
-import { namePartsToFull } from './utils/individual-name'
 
-export function writeCharacterString(
+function writeCharacterString(
   text: string
 ): ChainableFunction<XmlElement, XmlElement> {
   return tap(
@@ -58,9 +56,7 @@ export function writeCharacterString(
   )
 }
 
-export function writeLinkage(
-  url: URL
-): ChainableFunction<XmlElement, XmlElement> {
+function writeLinkage(url: URL): ChainableFunction<XmlElement, XmlElement> {
   return tap(
     pipe(
       findNestedChildOrCreate('gmd:linkage', 'gmd:URL'),
@@ -69,7 +65,7 @@ export function writeLinkage(
   )
 }
 
-export function writeAnchor(
+function writeAnchor(
   url: URL,
   text?: string
 ): ChainableFunction<XmlElement, XmlElement> {
@@ -82,9 +78,7 @@ export function writeAnchor(
   )
 }
 
-export function writeDateTime(
-  date: Date
-): ChainableFunction<XmlElement, XmlElement> {
+function writeDateTime(date: Date): ChainableFunction<XmlElement, XmlElement> {
   return tap(
     pipe(
       findChildOrCreate('gco:DateTime'),
@@ -93,9 +87,7 @@ export function writeDateTime(
   )
 }
 
-export function writeDate(
-  date: Date
-): ChainableFunction<XmlElement, XmlElement> {
+function writeDate(date: Date): ChainableFunction<XmlElement, XmlElement> {
   return tap(
     pipe(
       findChildOrCreate('gco:Date'),
@@ -104,7 +96,7 @@ export function writeDate(
   )
 }
 
-export function getProgressCode(status: RecordStatus): string {
+function getProgressCode(status: RecordStatus): string {
   switch (status) {
     case 'completed':
       return 'completed'
@@ -123,7 +115,7 @@ export function getProgressCode(status: RecordStatus): string {
   }
 }
 
-export function getRoleCode(role: Role): string {
+function getRoleCode(role: Role): string {
   switch (role) {
     case 'author':
       return 'author'
@@ -172,7 +164,7 @@ export function getRoleCode(role: Role): string {
   }
 }
 
-export function getDistributionProtocol(
+function getDistributionProtocol(
   distribution: DatasetServiceDistribution
 ): string {
   switch (distribution.accessServiceProtocol.toLowerCase()) {
@@ -187,7 +179,7 @@ export function getDistributionProtocol(
   }
 }
 
-export function getMaintenanceFrequencyCode(
+function getMaintenanceFrequencyCode(
   updateFrequency: UpdateFrequencyCode
 ): string | null {
   switch (updateFrequency) {
@@ -206,7 +198,7 @@ export function getMaintenanceFrequencyCode(
   }
 }
 
-export function getISODuration(updateFrequency: UpdateFrequencyCustom): string {
+function getISODuration(updateFrequency: UpdateFrequencyCustom): string {
   const duration = {
     years: 0,
     months: 0,
@@ -235,61 +227,19 @@ export function getISODuration(updateFrequency: UpdateFrequencyCustom): string {
   return `P${duration.years}Y${duration.months}M${duration.days}D${hours}`
 }
 
-export function appendResponsibleParty(contact: Individual) {
-  const fullName = namePartsToFull(contact.firstName, contact.lastName)
-
-  const createAddress = pipe(
-    createElement('gmd:address'),
-    createChild('gmd:CI_Address'),
-    appendChildren(
-      pipe(
-        createElement('gmd:electronicMailAddress'),
-        writeCharacterString(contact.email)
-      )
-    ),
-    contact.address
-      ? appendChildren(
-          pipe(
-            createElement('gmd:deliveryPoint'),
-            writeCharacterString(contact.address)
-          )
-        )
-      : noop
-  )
-
-  const createContact = pipe(
-    createElement('gmd:contactInfo'),
-    createChild('gmd:CI_Contact'),
-    contact.phone
-      ? appendChildren(
-          pipe(
-            createElement('gmd:phone'),
-            createChild('gmd:CI_Telephone'),
-            createChild('gmd:voice'),
-            writeCharacterString(contact.phone)
-          )
-        )
-      : noop,
-    appendChildren(createAddress),
-    'website' in contact.organization
-      ? appendChildren(
-          pipe(
-            createElement('gmd:onlineResource'),
-            createChild('gmd:CI_OnlineResource'),
-            writeLinkage(contact.organization.website)
-          )
-        )
-      : noop
-  )
-
+function appendResponsibleParty(contact: Individual) {
+  const name =
+    contact.lastName && contact.firstName
+      ? `${contact.firstName} ${contact.lastName}`
+      : contact.lastName || contact.firstName || null
   return appendChildren(
     pipe(
       createElement('gmd:CI_ResponsibleParty'),
-      fullName
+      name
         ? appendChildren(
             pipe(
               createElement('gmd:individualName'),
-              writeCharacterString(fullName)
+              writeCharacterString(name)
             )
           )
         : noop,
@@ -306,7 +256,27 @@ export function appendResponsibleParty(contact: Individual) {
           createElement('gmd:organisationName'),
           writeCharacterString(contact.organization.name)
         ),
-        createContact,
+        pipe(
+          createElement('gmd:contactInfo'),
+          createChild('gmd:CI_Contact'),
+          appendChildren(
+            pipe(
+              createElement('gmd:address'),
+              createChild('gmd:CI_Address'),
+              createChild('gmd:electronicMailAddress'),
+              writeCharacterString(contact.email)
+            )
+          ),
+          'website' in contact.organization
+            ? appendChildren(
+                pipe(
+                  createElement('gmd:onlineResource'),
+                  createChild('gmd:CI_OnlineResource'),
+                  writeLinkage(contact.organization.website)
+                )
+              )
+            : noop
+        ),
         pipe(
           createElement('gmd:role'),
           createChild('gmd:CI_RoleCode'),
@@ -321,7 +291,7 @@ export function appendResponsibleParty(contact: Individual) {
   )
 }
 
-export function updateCitationDate(
+function updateCitationDate(
   date: Date,
   type: 'revision' | 'creation' | 'publication'
 ) {
@@ -341,8 +311,8 @@ export function updateCitationDate(
   )
 }
 
-export function appendCitationDate(
-  date: Date,
+function appendCitationDate(
+  date,
   type: 'revision' | 'creation' | 'publication'
 ) {
   return appendChildren(
@@ -365,12 +335,12 @@ export function appendCitationDate(
   )
 }
 
-export function removeKeywords() {
+function removeKeywords() {
   return removeChildren(pipe(findNestedElements('gmd:descriptiveKeywords')))
 }
 
 // returns a <gmd:thesaurusName> element
-export function createThesaurus(thesaurus: KeywordThesaurus) {
+function createThesaurus(thesaurus: KeywordThesaurus) {
   return pipe(
     createElement('gmd:thesaurusName'),
     createChild('gmd:CI_Citation'),
@@ -395,15 +365,14 @@ export function createThesaurus(thesaurus: KeywordThesaurus) {
   )
 }
 
-export function appendKeywords(keywords: Keyword[]) {
-  // keywords are grouped by thesaurus if they have one, otherwise by type
+function appendKeywords(keywords: Keyword[]) {
   const keywordsByThesaurus: Keyword[][] = keywords.reduce((acc, keyword) => {
     const thesaurusId = keyword.thesaurus?.id
     const type = keyword.type
     let existingGroup = acc.find((group) =>
-      thesaurusId
-        ? group[0].thesaurus?.id === thesaurusId
-        : group[0].type === type && !group[0].thesaurus
+      group[0].thesaurus
+        ? group[0].thesaurus.id === thesaurusId
+        : group[0].type === type
     )
     if (!existingGroup) {
       existingGroup = []
@@ -444,7 +413,7 @@ export function appendKeywords(keywords: Keyword[]) {
   )
 }
 
-export function createConstraint(
+function createConstraint(
   constraint: Constraint,
   type: 'legal' | 'security' | 'other'
 ) {
@@ -502,7 +471,7 @@ export function createConstraint(
   )
 }
 
-export function removeOtherConstraints() {
+function removeOtherConstraints() {
   return removeChildren(
     pipe(
       findChildrenElement('gmd:resourceConstraints'),
@@ -516,7 +485,7 @@ export function removeOtherConstraints() {
   )
 }
 
-export function removeSecurityConstraints() {
+function removeSecurityConstraints() {
   return removeChildren(
     pipe(
       findChildrenElement('gmd:resourceConstraints'),
@@ -530,7 +499,7 @@ export function removeSecurityConstraints() {
   )
 }
 
-export function removeLegalConstraints() {
+function removeLegalConstraints() {
   return removeChildren(
     pipe(
       findChildrenElement('gmd:resourceConstraints'),
@@ -550,7 +519,7 @@ export function removeLegalConstraints() {
   )
 }
 
-export function removeLicenses() {
+function removeLicenses() {
   return removeChildren(
     pipe(
       findChildrenElement('gmd:resourceConstraints'),
@@ -570,7 +539,7 @@ export function removeLicenses() {
   )
 }
 
-export function createLicense(license: Constraint) {
+function createLicense(license: Constraint) {
   return pipe(
     createElement('gmd:resourceConstraints'),
     createChild('gmd:MD_LegalConstraints'),
@@ -603,52 +572,44 @@ export function createLicense(license: Constraint) {
   )
 }
 
-export function removeDistributions() {
+function removeDistributions() {
   return pipe(removeChildrenByName('gmd:distributionInfo'))
 }
 
-function appendDistributionFormat(mimeType: string) {
-  return appendChildren(
-    pipe(
-      createElement('gmd:distributionFormat'),
-      createChild('gmd:MD_Format'),
-      appendChildren(
-        pipe(createElement('gmd:name'), writeCharacterString(mimeType)),
-        pipe(
-          createElement('gmd:version'),
-          writeCharacterString('1.0') // hardcoding this as it most likely won't be used but is mandatory
+function createDistribution(distribution: DatasetDistribution) {
+  const appendDistributionFormat =
+    'mimeType' in distribution
+      ? appendChildren(
+          pipe(
+            createElement('gmd:distributionFormat'),
+            createChild('gmd:MD_Format'),
+            appendChildren(
+              pipe(
+                createElement('gmd:name'),
+                writeCharacterString(distribution.mimeType)
+              ),
+              pipe(
+                createElement('gmd:version'),
+                writeCharacterString('1.0') // hardcoding this as it most likely won't be used but is mandatory
+              )
+            )
+          )
         )
-      )
-    )
-  )
-}
-
-export function createDistributionInfo() {
-  return pipe(
-    createElement('gmd:distributionInfo'),
-    createChild('gmd:MD_Distribution')
-  )
-}
+      : noop
 
-// apply to MD_Distribution
-export function appendDistribution(
-  distribution: DatasetDistribution,
-  appendFormatFn: (
-    mimeType: string
-  ) => ChainableFunction<XmlElement, XmlElement>
-) {
-  let name: string
-  let functionCode: string
-  let protocol: string
+  let linkageUrl, name, functionCode, protocol
   if (distribution.type === 'service') {
+    linkageUrl = distribution.url.toString()
     name = distribution.identifierInService // this is for GeoNetwork to know the layer name
     functionCode = 'download'
     protocol = getDistributionProtocol(distribution)
   } else if (distribution.type === 'download') {
+    linkageUrl = distribution.url.toString()
     name = distribution.name
     functionCode = 'download'
     protocol = 'WWW:DOWNLOAD'
   } else {
+    linkageUrl = distribution.url.toString()
     name = distribution.name
     functionCode = 'information'
     protocol = 'WWW:LINK'
@@ -659,7 +620,7 @@ export function appendDistribution(
       createChild('gmd:MD_DigitalTransferOptions'),
       createChild('gmd:onLine'),
       createChild('gmd:CI_OnlineResource'),
-      writeLinkage(distribution.url),
+      writeLinkage(linkageUrl),
       'description' in distribution
         ? appendChildren(
             pipe(
@@ -688,7 +649,9 @@ export function appendDistribution(
     )
   )
   return pipe(
-    'mimeType' in distribution ? appendFormatFn(distribution.mimeType) : noop,
+    createElement('gmd:distributionInfo'),
+    createChild('gmd:MD_Distribution'),
+    appendDistributionFormat,
     appendTransferOptions
   )
 }
@@ -697,7 +660,7 @@ export function appendDistribution(
  * Looks for srv:SV_ServiceIdentification or gmd:MD_DataIdentification element
  * depending on record type, create if missing
  */
-export function findOrCreateIdentification() {
+function findOrCreateIdentification() {
   return (rootEl: XmlElement) => {
     const kind = readKind(rootEl)
     let eltName = 'gmd:MD_DataIdentification'
@@ -706,7 +669,7 @@ export function findOrCreateIdentification() {
   }
 }
 
-export function findOrCreateDistribution() {
+function findOrCreateDistribution() {
   return (rootEl: XmlElement) => {
     return findNestedChildOrCreate(
       'gmd:distributionInfo',
@@ -800,26 +763,11 @@ export function writeStatus(record: DatasetRecord, rootEl: XmlElement) {
 }
 
 export function writeContacts(record: CatalogRecord, rootEl: XmlElement) {
-  pipe(
-    removeChildrenByName('gmd:contact'),
-    appendChildren(
-      ...record.contacts.map((contact) =>
-        pipe(createElement('gmd:contact'), appendResponsibleParty(contact))
-      )
-    )
-  )(rootEl)
-}
-
-export function writeContactsForResource(
-  record: CatalogRecord,
-  rootEl: XmlElement
-) {
   pipe(
     findOrCreateIdentification(),
     removeChildrenByName('gmd:pointOfContact'),
-    removeChildrenByName('gmd:contact'),
     appendChildren(
-      ...record.contactsForResource.map((contact) =>
+      ...record.contacts.map((contact) =>
         pipe(
           createElement('gmd:pointOfContact'),
           appendResponsibleParty(contact)
@@ -930,47 +878,26 @@ export function writeUpdateFrequency(
   )(rootEl)
 }
 
-export function writeResourceCreated(
-  record: DatasetRecord,
-  rootEl: XmlElement
-) {
-  if (!('resourceCreated' in record)) return
+export function writeDatasetCreated(record: DatasetRecord, rootEl: XmlElement) {
+  if (!('datasetCreated' in record)) return
   pipe(
     findOrCreateIdentification(),
     findNestedChildOrCreate('gmd:citation', 'gmd:CI_Citation'),
     fallback(
-      updateCitationDate(record.resourceCreated, 'creation'),
-      appendCitationDate(record.resourceCreated, 'creation')
+      updateCitationDate(record.datasetCreated, 'creation'),
+      appendCitationDate(record.datasetCreated, 'creation')
     )
   )(rootEl)
 }
 
-export function writeResourceUpdated(
-  record: DatasetRecord,
-  rootEl: XmlElement
-) {
-  if (!('resourceUpdated' in record)) return
+export function writeDatasetUpdated(record: DatasetRecord, rootEl: XmlElement) {
+  if (!('datasetUpdated' in record)) return
   pipe(
     findOrCreateIdentification(),
     findNestedChildOrCreate('gmd:citation', 'gmd:CI_Citation'),
     fallback(
-      updateCitationDate(record.resourceUpdated, 'revision'),
-      appendCitationDate(record.resourceUpdated, 'revision')
-    )
-  )(rootEl)
-}
-
-export function writeResourcePublished(
-  record: DatasetRecord,
-  rootEl: XmlElement
-) {
-  if (!('resourcePublished' in record)) return
-  pipe(
-    findOrCreateIdentification(),
-    findNestedChildOrCreate('gmd:citation', 'gmd:CI_Citation'),
-    fallback(
-      updateCitationDate(record.resourcePublished, 'publication'),
-      appendCitationDate(record.resourcePublished, 'publication')
+      updateCitationDate(record.datasetUpdated, 'revision'),
+      appendCitationDate(record.datasetUpdated, 'revision')
     )
   )(rootEl)
 }
@@ -1028,14 +955,7 @@ export function writeGraphicOverviews(
 export function writeDistributions(record: DatasetRecord, rootEl: XmlElement) {
   pipe(
     removeDistributions(),
-    appendChildren(
-      ...record.distributions.map((d) =>
-        pipe(
-          createDistributionInfo(),
-          appendDistribution(d, appendDistributionFormat)
-        )
-      )
-    )
+    appendChildren(...record.distributions.map(createDistribution))
   )(rootEl)
 }
 
@@ -1052,7 +972,7 @@ export function writeLineage(record: DatasetRecord, rootEl: XmlElement) {
   )(rootEl)
 }
 
-export function getServiceEndpointProtocol(endpoint: ServiceEndpoint): string {
+function getServiceEndpointProtocol(endpoint: ServiceEndpoint): string {
   switch (endpoint.protocol.toLowerCase()) {
     case 'wfs':
       return 'OGC:WFS'
@@ -1065,7 +985,7 @@ export function getServiceEndpointProtocol(endpoint: ServiceEndpoint): string {
   }
 }
 
-export function createOnlineResource(onlineResource: ServiceOnlineResource) {
+function createOnlineResource(onlineResource: ServiceOnlineResource) {
   let linkageUrl, functionCode, protocol
   if (onlineResource.type === 'endpoint') {
     linkageUrl = onlineResource.endpointUrl.toString()

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

@@ -7,13 +7,13 @@ export class MetadataMapperContext {
   readonly location?
 }
 
-export abstract class BaseConverter<F> {
+export abstract class MetadataBaseMapper<F> {
   constructor(
     protected ctx: MetadataMapperContext = new MetadataMapperContext()
   ) {}
 
   abstract readRecord(document: F): Promise<CatalogRecord>
-  abstract writeRecord(record: CatalogRecord, reference?: F): Promise<F>
+  abstract writeRecord(record: CatalogRecord): Promise<F>
   readRecords(documents: F[]): Promise<CatalogRecord[]> {
     return Promise.all(documents.map((doc) => this.readRecord(doc)))
   }