cassproject 5.0.0 → 5.0.1

package/README.md

@@ -49,8 +49,11 @@ Development unit tests presume you have a CaSS Repository running on `localhost:
 
 # Changelog
 
+## 5.0.1
+* Updated CEASN import to include versionIdentifier.
+
 ## 5.0.0
-* Added multidelete to EcRepository
+* Added multidelete to EcRepository.
 * NPM requires semantic versioning coherence, so I must now use big number for version.
 * Added and refined tests to include deleting, multideleting.
 * Made use of EcRepository.cache more consistent.

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "cassproject",
-	"version": "5.0.0",
+	"version": "5.0.1",
 	"description": "Competency and Skills Service",
 	"main": "index.js",
 	"scripts": {
@@ -178,7 +178,7 @@
 		"convert-hrtime": "^5.0.0",
 		"cypress": "^13.17.0",
 		"cypress-fail-fast": "^7.1.1",
-		"eslint": "^9.27.0",
+		"eslint": "^9.29.0",
 		"fake-indexeddb": "^6.0.1",
 		"mocha": "^10.8.2",
 		"node-polyfill-webpack-plugin": "^4.1.0",

package/src/org/cass/importer/CTDLASNCSVConceptImport.js

@@ -31,6 +31,30 @@ const customDocLoader = async (url, options) => {
 	  return result;
 };
 
+function setVersionIdentifier(f) {
+	if (f["ceterms:versionIdentifier"]) {
+		if (!Array.isArray(f["ceterms:versionIdentifier"])) {
+			f["ceterms:versionIdentifier"] = [f["ceterms:versionIdentifier"]];
+		}
+		for (let i = f["ceterms:versionIdentifier"].length - 1; i >= 0; i--) {
+			try {
+				let parts = f["ceterms:versionIdentifier"][i].split("~");
+				console.log('parts', parts);
+				f["ceterms:versionIdentifier"][i] = {
+					"ceterms:identifierValueCode": parts[0],
+					"ceterms:identifierTypeName": {
+						"@language": "en-us",
+						"@value": parts[1]
+					},
+					"ceterms:identifierType": parts.length > 2 ? parts[2] : undefined
+				};
+			} catch (e) {
+				delete f["ceterms:versionIdentifier"][i];
+			}
+		}
+	}
+}
+
 module.exports = class CTDLASNCSVConceptImport {
 	static analyzeFile(file, success, failure) {
 		if (file == null) {
@@ -137,14 +161,6 @@ module.exports = class CTDLASNCSVConceptImport {
 							endpoint,
 							repo
 						);
-						try {
-							let existing = await EcRepository.get(translator.id);
-							if (existing && existing.type !== translator.type) {
-								return failure(`Row ${i + 2}: ${translator.id} already exists as a ${existing.type}`);
-							}
-						} catch (e) {
-							console.error(e);
-						}
 						if (translator["ceasn:name"] != null) {
 							let name = translator["ceasn:name"];
 							let nameWithLanguage = {};
@@ -204,6 +220,7 @@ module.exports = class CTDLASNCSVConceptImport {
 						) {
 							CTDLASNCSVImport.setDateCreated(e, f);
 						}
+						setVersionIdentifier(f);
 						schemeArray.push(f);
 					} else if (pretranslatedE["@type"] == "skos:Concept") {
 						let translator = new EcLinkedData(null, null);
@@ -401,14 +418,6 @@ module.exports = class CTDLASNCSVConceptImport {
 							endpoint,
 							repo
 						);
-						try {
-							let existing = await EcRepository.get(translator.id);
-							if (existing && existing.type !== translator.type) {
-								return failure(`Row ${i + 2}: ${translator.id} already exists as a ${existing.type}`);
-							}
-						} catch (e) {
-							console.error(e);
-						}
 						if (translator["ceasn:name"] != null) {
 							let name = translator["ceasn:name"];
 							let nameWithLanguage = {};

package/src/org/cass/importer/CTDLASNCSVImport.js

@@ -1,6 +1,30 @@
 const EcArray = require("../../../com/eduworks/ec/array/EcArray");
 const EcRemote = require("../../../com/eduworks/ec/remote/EcRemote");
 
+function setVersionIdentifier(f) {
+	if (f["ceterms:versionIdentifier"]) {
+		if (!Array.isArray(f["ceterms:versionIdentifier"])) {
+			f["ceterms:versionIdentifier"] = [f["ceterms:versionIdentifier"]];
+		}
+		for (let i = f["ceterms:versionIdentifier"].length - 1; i >= 0; i--) {
+			try {
+				let parts = f["ceterms:versionIdentifier"][i].split("~");
+				console.log('parts', parts);
+				f["ceterms:versionIdentifier"][i] = {
+					"ceterms:identifierValueCode": parts[0],
+					"ceterms:identifierTypeName": {
+						"@language": "en-us",
+						"@value": parts[1]
+					},
+					"ceterms:identifierType": parts.length > 2 ? parts[2] : undefined
+				};
+			} catch (e) {
+				delete f["ceterms:versionIdentifier"][i];
+			}
+		}
+	}
+}
+
 module.exports = class CTDLASNCSVImport {
 	static analyzeFile(file, success, failure) {
 		if (file == null) {
@@ -191,7 +215,7 @@ module.exports = class CTDLASNCSVImport {
 						);
 						try {
 							let existing = await EcRepository.get(translator.id);
-							if (existing && existing.type !== translator.type) {
+							if (existing && existing.type !== 'Framework') {
 								return failure(`Row ${i + 2}: ${translator.id} already exists as a ${existing.type}`);
 							}
 						} catch (e) {
@@ -301,6 +325,9 @@ module.exports = class CTDLASNCSVImport {
 								}
 							});
 						}
+
+						setVersionIdentifier(f);
+
 						frameworkArray.push(f);
 						f.competency = [];
 						f.relation = [];
@@ -598,6 +625,7 @@ module.exports = class CTDLASNCSVImport {
 						f["ceasn:minorAlignment"] = null;
 						f["ceasn:prerequisiteAlignment"] = null;
 						f["ceasn:hasChild"] = null;
+						setVersionIdentifier(f);
 						competencies.push(f);
 						competencyRows[f.shortId()] = e;
 					} else if (
@@ -684,14 +712,6 @@ module.exports = class CTDLASNCSVImport {
 							endpoint,
 							repo
 						);
-						try {
-							let existing = await EcRepository.get(translator.id);
-							if (existing && existing.type !== translator.type) {
-								return failure(`Row ${i + 2}: ${translator.id} already exists as a ${existing.type}`);
-							}
-						} catch (e) {
-							console.error(e);
-						}
 						for (let each in translator) {
 							if (terms[each]) {
 								translator[terms[each]] = translator[each];
@@ -749,6 +769,7 @@ module.exports = class CTDLASNCSVImport {
 								}
 							});
 						}
+						setVersionIdentifier(f);
 						delete f["ceterms:hasMember"];
 						f.relation = [];
 						f.subType = "Collection";
@@ -964,6 +985,7 @@ module.exports = class CTDLASNCSVImport {
 						f["ceasn:prerequisiteAlignment"] = null;
 						f["ceasn:hasChild"] = null;
 						f["ceterms:isMemberOf"] = null;
+						setVersionIdentifier(f);
 						competencies.push(f);
 						competencyRows[f.shortId()] = e;
 					} else if (