feat: updates to taxonomy logic [] (#2857)

contentful · Nov 26, 2024 · e828da8 · e828da8
1 parent 3f9366d
commit e828da8
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 6 deletions.
diff --git a/docs/organization/taxonomy-transform/examples/example-transform.js b/docs/organization/taxonomy-transform/examples/example-transform.js
@@ -35,22 +35,30 @@ module.exports = async function ({ csv, taxonomy, fs }) {
     //Cocneptscheme
     if (row[1] != '') {
       conceptScheme = taxonomy.addConceptScheme(row[0], {
-        prefLabel: row[1]
+        prefLabel: { 'en-US': row[1] }
       })
+
+      if (!conceptScheme) {
+        conceptScheme = taxonomy.getConceptScheme(row[0])
+      }
     } else {
       const notEmptyIndex = row.findIndex((c, index) => c != '' && index > 0)
       let concept = taxonomy.getConcept(row[0])
 
       if (!concept) {
         concept = taxonomy.addConcept(row[0], {
-          prefLabel: row[notEmptyIndex]
+          prefLabel: { 'en-US': row[notEmptyIndex] }
         })
       }
 
       conceptScheme.addConcept(row[0])
+
       parent = findParent(data, i)
+
       if (parent) {
         concept.addBroader(parent)
+      } else {
+        conceptScheme.addTopConcept(row[0])
       }
     }
   }

diff --git a/lib/cmds/organization_cmds/import.ts b/lib/cmds/organization_cmds/import.ts
@@ -91,14 +91,13 @@ async function importCommand(params: OrgImportParams) {
     accessToken: managementToken,
     feature: 'org-import',
     headers: getHeadersFromOption(header),
-    throttle: 8,
     logHandler: noop
   })
 
   const importContext: OrgImportContext = {
     data: {},
     requestQueue: new PQueue({
-      concurrency: 1,
+      concurrency: 7,
       interval: ONE_SECOND,
       intervalCap: 1,
       carryoverConcurrencyCount: true

diff --git a/lib/cmds/organization_cmds/taxonomy/concept-scheme.ts b/lib/cmds/organization_cmds/taxonomy/concept-scheme.ts
@@ -46,6 +46,9 @@ export class ConceptScheme {
     if (!this.model.topConcepts) {
       this.model.topConcepts = []
     }
+    if (this.model.topConcepts.find(concept => concept.sys.id === conceptId)) {
+      return this
+    }
     this.model.topConcepts.push({
       sys: {
         id: conceptId,
@@ -82,6 +85,9 @@ export class ConceptScheme {
     if (!this.model.concepts) {
       this.model.concepts = []
     }
+    if (this.model.concepts.find(concept => concept.sys.id === conceptId)) {
+      return this
+    }
     this.model.concepts.push({
       sys: {
         id: conceptId,

diff --git a/lib/cmds/organization_cmds/taxonomy/concept.ts b/lib/cmds/organization_cmds/taxonomy/concept.ts
@@ -135,6 +135,9 @@ export class Concept {
     if (!this.model.broader) {
       this.model.broader = []
     }
+    if (this.model.broader.some(concept => concept.sys.id === conceptId)) {
+      return this
+    }
     this.model.broader.push({
       sys: {
         id: conceptId,
@@ -158,6 +161,9 @@ export class Concept {
     if (!this.model.related) {
       this.model.related = []
     }
+    if (this.model.related.some(concept => concept.sys.id === conceptId)) {
+      return this
+    }
     this.model.related.push({
       sys: {
         id: conceptId,

diff --git a/lib/cmds/organization_cmds/taxonomy/taxonomy-import.ts b/lib/cmds/organization_cmds/taxonomy/taxonomy-import.ts
@@ -90,10 +90,12 @@ const taxonomyImport = async (
             }
 
             if (!operations.length) {
-              return
+              continue
             }
 
-            const version = entityHasVersion(concept) ? concept.sys.version : 1
+            const version = entityHasVersion(concept)
+              ? concept.sys.version + 1
+              : 1
 
             await ctx.cmaClient.concept.patch(
               {