@journeyapps-solutions/cc-util-sync-collective 2.0.0 → 2.0.1

package/README.md

@@ -65,9 +65,6 @@ module.exports = {
         "api_user": "<api_user>",
         "api_pass": "<api_pass>",
       }
-    },
-    "endpoint" : {
-      "api_user": "<api_user>",
     }
 }
 ```
@@ -77,8 +74,6 @@ Review the following fields and change as described:
 1. **collective**: The name that you have given the organization, only use alpha characters. The naming convention of a collective is built from the app url as follows, https://build.journeyapps.com/kaufmann/accrete-solutions-grupo-kaufmann-service-advisor
 In the above example the collective will be called "kaufmann". In the case where the url might contain "-" as follow, "kauf-mann", then remove the "-" and the collective name becomes "kaufmann".
 
-2. **endpoint.api_user** : This must match Options.username
-
 The following fields point to the Data Broker and correspond to the Testing Environment for the Data Broker and will not need changing.
 
 Local:
@@ -201,9 +196,6 @@ module.exports = {
         "api_user": "<api_user>",
         "api_pass": "<api_pass>",
       }
-    },
-    "endpoint" : {
-      "api_user": "<api_user>",
     }
 }
 ```
@@ -215,8 +207,6 @@ Review the following fields and change as described:
 
    In the above example the collective will be called "kaufmann". In the case where the url might contain "-" as follow, "kauf-mann", then remove the "-" and the collective name becomes "kaufmann".
 
-2. **endpoint_api_user**: This must match Options.username
-
 The following fields point to the Data Broker and correspond to the Testing Environment for the Data Broker and will not need changing.
 
 Local:
@@ -493,6 +483,10 @@ export async function run() {
   	objectToSync : _object
   });
 
+  //Now save the Synced Object
+  _object.synced = true;
+  await _object.save();
+
 }
 ```
 

package/lib/index.js

@@ -33,9 +33,6 @@ class SyncCollective {
   * 	   		"api_user": "<api_user>",
   * 	      "api_pass": "<api_pass>",
   *  		}
-  *  	},
-  *  	"endpoint" : {
-  * 	   		"api_user": "<api_user>",
   *  	}
   *  });
   */
@@ -103,16 +100,16 @@ class SyncCollective {
 
 			let _object = options.objectToSync;
 			_object.synced = true;
+			console.log(`${NAME} - Syncing Object [id:${_object.id};Model:${_object.type.name}]`);
 
 			let _collective = yield options.endpoint.collective();
 
 			let _url = SyncUtilMaster.buildUrl(_object, options.endpoint.url, _collective.name);
-			let _header = SyncUtilMaster.buildHeader(options.endpoint.api_user, options.endpoint.api_pass);
-			let _body = SyncUtilMaster.buildJsonBody(_object, _collective.name);
-
-			console.log(`${NAME} - Syncing Object [id:${options.objectToSync.id}]`);
 			console.log(`${NAME} - URL    - ` + _url);
 			console.log(`${NAME} - METHOD - ` + options.operation);
+
+			let _header = SyncUtilMaster.buildHeader(options.endpoint.api_user, options.endpoint.api_pass);
+			let _body = SyncUtilMaster.buildJsonBody(_object, _collective.name);
 			console.log(`${NAME} - BODY   - ` + JSON.stringify(_body));
 
 			let _response = yield _this._sync(_url, options.operation, _header, _body);
@@ -148,20 +145,20 @@ class SyncCollective {
 			//We do a fetch due to have enumerable ID's
 			let _fetchUrl = SyncUtilSlave.buildFetchUrl(options.objectToSync, _this2.config.credentials.local.url, options.objectToSync.type.name);
 			let _data = yield _this2._fetchRecord(_fetchUrl);
+			console.log(`${NAME} - Syncing Object [id:${_data.id};Model:${_data.type}]`);
 
 			let _url = SyncUtilSlave.buildUrl(_data, _this2.config.credentials.remote.url, _this2.config.collective);
+			console.log(`${NAME} - URL    - ` + _url);
+
 			let _header = SyncUtilSlave.buildHeader(_this2.config.credentials.remote.api_user, _this2.config.credentials.remote.api_pass);
 			let _body = SyncUtilSlave.buildJsonBody(_data, _this2.config.collective);
+			console.log(`${NAME} - BODY   - ` + JSON.stringify(_body));
 
 			let _tableName = SyncUtilSlave.buildTableName(_data, _this2.config.collective);
 
-			//We need to set the api_user to local, he is the origin user. 
+			//We need to set the api_user to local, he is the origin user.
 			_body[_tableName].api_user = _this2.config.credentials.local.api_user;
 
-			console.log(`${NAME} - Syncing Object [id:${_data.id}]`);
-			console.log(`${NAME} - URL    - ` + _url);
-			console.log(`${NAME} - BODY   - ` + JSON.stringify(_body));
-
 			let _response = yield _this2._sync(_url, _this2.operations.create, _header, _body);
 			return _response;
 		})();

package/lib/sync-util-master.js

@@ -15,6 +15,26 @@ class SyncUtilMaster extends SyncUtil {
 		return object.type.name.toString().replace(collective + '_', '');
 	}
 
+	/**
+  * The way we get data objects for choice types is not the correct format for V4 API
+  * status: {'key'=> 0, 'display' => 'something'} transforms to status:0
+  *
+  * @param object The Object that should be synced
+  */
+	mapChoiceObjects(object) {
+		Object.keys(object).forEach(function (key) {
+			if (object[key] instanceof Array) {
+				var keys = [];
+				object[key].forEach(function (choice) {
+					keys.push(choice);
+				});
+				object[key] = keys;
+			} else if (object[key] instanceof Object && 'key' in object[key] && 'display' in object[key]) {
+				object[key] = object[key];
+			}
+		});
+	}
+
 };
 
 module.exports = new SyncUtilMaster();

package/lib/sync-util-slave.js

@@ -14,6 +14,26 @@ class SyncUtilSlave extends SyncUtil {
 		return `${collective}_${object.type}`;
 	}
 
+	/**
+  * The way we get data objects for choice types is not the correct format for V4 API
+  * status: {'key'=> 0, 'display' => 'something'} transforms to status:0
+  *
+  * @param object The Object that should be synced
+  */
+	mapChoiceObjects(object) {
+		Object.keys(object).forEach(function (key) {
+			if (object[key] instanceof Array) {
+				var keys = [];
+				object[key].forEach(function (choice) {
+					keys.push(choice.key);
+				});
+				object[key] = keys;
+			} else if (object[key] instanceof Object && 'key' in object[key] && 'display' in object[key]) {
+				object[key] = object[key].key;
+			}
+		});
+	}
+
 };
 
 module.exports = new SyncUtilSlave();

package/lib/sync-util.js

@@ -41,26 +41,6 @@ class SyncUtil {
 		return new_object;
 	}
 
-	/**
-  * The way we get data objects for choice types is not the correct format for V4 API
-  * status: {'key'=> 0, 'display' => 'something'} transforms to status:0
-  *
-  * @param object The Object that should be synced
-  */
-	mapChoiceObjects(object) {
-		Object.keys(object).forEach(function (key) {
-			if (object[key] instanceof Array) {
-				var keys = [];
-				object[key].forEach(function (choice) {
-					keys.push(choice.key);
-				});
-				object[key] = keys;
-			} else if (object[key] instanceof Object && 'key' in object[key] && 'display' in object[key]) {
-				object[key] = object[key].key;
-			}
-		});
-	}
-
 	/**
   * We are not able to sync photos and attachments with the data broker
   * so we remove them before we continue

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@journeyapps-solutions/cc-util-sync-collective",
-	"version": "2.0.0",
+	"version": "2.0.1",
 	"description": "Sync Data between projects. Either Directly, or via Slave & Master Configuration",
 	"main": "./index.js",
 	"scripts": {