Advanced collection (#45)

* fixed colision in object id + empty remote collection handling
box · Oct 5, 2023 · a3126c2 · a3126c2
1 parent 1965801
commit a3126c2
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 13 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/src/Collection.js b/src/Collection.js
@@ -110,12 +110,17 @@ class Collection {
    */
   process () {
     console.log('Processing collection')
+    const info = this.getInfo()
+    this.collectionId = info._postman_id
+    const item = this.getItems()
+    const variable = this.getVariables()
+    const auth = this.defaultAuth()
     const collection = {
-      info: this.getInfo(),
-      item: this.getItems(),
+      info: info,
+      item: item,
       event: [],
-      variable: this.getVariables(),
-      auth: this.defaultAuth()
+      variable: variable,
+      auth: auth
     }
     console.log('Done')
     return collection
@@ -206,7 +211,7 @@ class Collection {
       item: []
 
     }
-    const folderId = Utils.GenID(JSON.stringify(folder))
+    const folderId = Utils.GenID(this.collectionId + JSON.stringify(folder))
     folder.id = folderId
     if (this.verbose) {
       console.log(`  Adding Folder [${folder.name}]`)
@@ -234,7 +239,9 @@ class Collection {
       event: this.getItemEvents(endpoint)
     }
 
-    const itemId = Utils.GenID(JSON.stringify(item))
+    // RB: This should pickup a different object id
+    // unexpected object id collision
+    const itemId = Utils.GenID(this.collectionId + JSON.stringify(item))
     item.id = itemId
     item.request = this.requestCreate(verb, path, endpoint, item.id)
     item.response = this.responseCreate(endpoint, item.request.id)

diff --git a/src/CollectionAdvanced.js b/src/CollectionAdvanced.js
@@ -52,12 +52,19 @@ class CollectionAdvanced extends Collection {
    */
   // RB: override
   process () {
+    console.log('Processing collection')
+    const info = this.getInfo()
+    this.collectionId = info._postman_id
+    const item = this.getItems()
+    const event = [this.collectionPreRequest()]
+    const variable = this.getVariables()
+    const auth = this.defaultAuth()
     const localCollection = {
-      info: this.getInfo(),
-      item: this.getItems(),
-      event: [this.collectionPreRequest()],
-      variable: this.getVariables(),
-      auth: this.defaultAuth()
+      info,
+      item,
+      event,
+      variable,
+      auth
     }
 
     // RB: inject utilities

diff --git a/src/DeployIncremental.js b/src/DeployIncremental.js
@@ -156,8 +156,19 @@ const checkObjectChanges = (remoteCollectionObject, localCollectionObject) => {
 }
 
 const checkScriptChanges = (scriptType, remoteCollection, localCollection) => {
-  const remoteScript = remoteCollection.collection.event.find(event => event.listen === scriptType)
-  const localScript = localCollection.event.find(event => event.listen === scriptType)
+  // RB 2020-10-20: The collection may be empty or have no events at all
+  let remoteScript = null
+  let localScript = null
+  if (remoteCollection.collection.event) {
+    remoteScript = remoteCollection.collection.event.find(event => event.listen === scriptType)
+  }
+
+  if (localCollection.event) {
+    localScript = localCollection.event.find(event => event.listen === scriptType)
+  }
+
+  // const remoteScript = remoteCollection.collection.event.find(event => event.listen === scriptType)
+  // const localScript = localCollection.event.find(event => event.listen === scriptType)
 
   if (!remoteScript && !localScript) {
     return false