Merge pull request #267 from gbv/feature/261-Add-mapping-sameness-identifier

Feature/261 add mapping sameness identifier

Author: mmarkus1

bin/import.js

@@ -350,7 +350,7 @@ async function doImport({ input, format, type, concordance }) {
       }
       // Add mapping identifier
       try {
-        object.identifier = jskos.addMappingIdentifiers(object).identifier
+        object.identifier = (await jskos.addMappingIdentifiers(object)).identifier
       } catch (error) {
         log("Could not add identifier to mapping.", error)
       }

models/mappings.js

@@ -11,10 +11,9 @@ const mappingSchema = new Schema({
   autoIndex: false,
 })
 
-mappingSchema.pre("save", function(next) {
+mappingSchema.pre("save", async function() {
   // Add mapping identifier
-  this.set("identifier", jskos.addMappingIdentifiers(this).identifier)
-  next()
+  this.set("identifier", (await jskos.addMappingIdentifiers(this)).identifier)
 })
 
 export const Mapping = mongoose.model("Mapping", mappingSchema)

package-lock.json

@@ -70,7 +70,7 @@
     "express-basic-auth": "^1.2.1",
     "express-ws": "^5.0.2",
     "ipaddr.js": "^2.2.0",
-    "jskos-tools": "^1.0.43",
+    "jskos-tools": "^1.2.0",
     "jskos-validate": "1.2.1",
     "json-anystream": "^2.0.1",
     "JSONStream": "^1.3.5",

package.json

@@ -534,7 +534,7 @@ export class MappingService extends AbstractService {
       for (const uri of ancestors.map(a => a && a.uri).filter(Boolean)) {
         mappings = await this.queryItems(Object.assign({}, query, { from: uri, type: types.join("|") }))
         if (mappings.length) {
-          return mappings.map(m => {
+          return Promise.all(mappings.map(async m => {
             const mapping = {
               from: {},
               fromScheme: m.fromScheme,
@@ -566,7 +566,7 @@ export class MappingService extends AbstractService {
               mapping.type = [type]
             }
             return jskos.addMappingIdentifiers(mapping)
-          })
+          }))
         }
       }
     } catch (error) {
@@ -631,7 +631,7 @@ export class MappingService extends AbstractService {
       mapping.uri = mapping.uri.replace("http:", "https:")
     }
     // Set mapping identifier
-    mapping.identifier = jskos.addMappingIdentifiers(mapping).identifier
+    mapping.identifier = (await jskos.addMappingIdentifiers(mapping)).identifier
     // Set mapping type to mappingRelation if not set
     if (!mapping.type || !mapping.type.length) {
       mapping.type = ["http://www.w3.org/2004/02/skos/core#mappingRelation"]
@@ -667,7 +667,7 @@ export class MappingService extends AbstractService {
     mapping.uri = existing.uri
     mapping.created = existing.created
     // Set mapping identifier
-    mapping.identifier = jskos.addMappingIdentifiers(mapping).identifier
+    mapping.identifier = (await jskos.addMappingIdentifiers(mapping)).identifier
     // Set mapping type to mappingRelation if not set
     if (!mapping.type || !mapping.type.length) {
       mapping.type = ["http://www.w3.org/2004/02/skos/core#mappingRelation"]
@@ -721,7 +721,7 @@ export class MappingService extends AbstractService {
     // Merge mappings
     const newMapping = Object.assign({}, existing, mapping)
     // Set mapping identifier
-    newMapping.identifier = jskos.addMappingIdentifiers(newMapping).identifier
+    newMapping.identifier = (await jskos.addMappingIdentifiers(newMapping)).identifier
     // Set mapping type to mappingRelation if not set
     if (!mapping.type || !mapping.type.length) {
       mapping.type = ["http://www.w3.org/2004/02/skos/core#mappingRelation"]

services/mappings.js

@@ -822,6 +822,7 @@ describe("Express Server", () => {
           for (let mapping of res.body) {
             mapping.identifier.should.be.a("array")
             mapping.identifier.filter(id => id.startsWith("urn:jskos:mapping:")).length.should.be.eql(2)
+            mapping.identifier.filter(id => id.startsWith("mapping:")).length.should.be.eql(1)
           }
           done()
         })

test/api.js

@@ -84,20 +84,20 @@ describe("Services Features", () => {
     describe("filter mappings by annotations", () => {
       const mappings = [
         {
-          uri: "mapping:1",
+          uri: "urn:test:mapping:1",
         },
         {
-          uri: "mapping:2",
+          uri: "urn:test:mapping:2",
         },
         {
-          uri: "mapping:3",
+          uri: "urn:test:mapping:3",
         },
         {
           to: { memberSet: [{ uri: "urn:test:concept" }] },
-          uri: "mapping:4",
+          uri: "urn:test:mapping:4",
         },
         {
-          uri: "mapping:5",
+          uri: "urn:test:mapping:5",
         },
       ].map(mapping => {
         // Add fromScheme and toScheme
@@ -115,28 +115,28 @@ describe("Services Features", () => {
       })
       const annotations = [
         {
-          target: "mapping:1",
+          target: "urn:test:mapping:1",
           motivation: "assessing",
           bodyValue: "+1",
         },
         {
-          target: "mapping:1",
+          target: "urn:test:mapping:1",
           motivation: "assessing",
           bodyValue: "-1",
         },
         {
-          target: "mapping:2",
+          target: "urn:test:mapping:2",
           motivation: "moderating",
           creator: {
             id: "urn:test:creator",
           },
         },
         {
-          target: "mapping:3",
+          target: "urn:test:mapping:3",
           motivation: "moderating",
         },
         {
-          target: "mapping:4",
+          target: "urn:test:mapping:4",
           motivation: "assessing",
           bodyValue: "+1",
         },

test/services.js

@@ -2,6 +2,7 @@ import { addMappingSchemes } from "./utils.js"
 import { uuid } from "./uuid.js"
 import _ from "lodash"
 import yesno from "yesno"
+import jskos from "jskos-tools"
 
 import { Scheme, Concordance, Mapping, Annotation } from "../models/index.js"
 import { SchemeService } from "../services/schemes.js"
@@ -321,4 +322,19 @@ export class Upgrader {
     await this.registryService.createIndexes()
     console.log("... done.")
   }
+  async "2.5.0"() {
+    console.log("Adding mapping sameness identifier to all existing mappings...")
+    let updatedCount = 0
+    const cursor = Mapping.find().lean().cursor()
+    for await (const mapping of cursor) {
+      // Skip if sameness identifier already present
+      if ((mapping.identifier || []).some(id => id && id.startsWith("mapping:"))) {
+        continue
+      }
+      const updated = await jskos.addMappingIdentifiers(mapping)
+      await Mapping.updateOne({ _id: mapping._id }, { $set: { identifier: updated.identifier } })
+      updatedCount += 1
+    }
+    console.log(`... done (${updatedCount} mappings updated).`)
+  }
 }