unique_id updated

package.json

@@ -1,6 +1,6 @@
 {
   "name": "project-rest-client",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Project DB Rest Api client",
   "main": "src/index.js",
   "react-native": "src/index.js",

src/component/ws_model.js

@@ -3,8 +3,6 @@ import sync from "./ws_sync";
 import WS_stmt from "./ws_stmt";
 import WS_fetchdata from "./ws_fetchdata";
 import WS_config from "./ws_config";
-import unique_id from "./unique_id";
-import Base64 from "./base64";
 
 let onPromises = {};
 
@@ -91,7 +89,7 @@ class WS_model extends WS_stmt {
 
     insert(data) {
 
-        let uniqueId = Base64.btoa(this.table + '_insert_' + unique_id());
+        let uniqueId = this.unique_id(this.table);
         data['data_unique_id'] = uniqueId;
 
         this.addPromise((resolve, reject, data) => {
@@ -118,9 +116,6 @@ class WS_model extends WS_stmt {
 
     save(data) {
 
-        let uniqueId = Base64.btoa(this.table + '_save_' + unique_id());
-        data['data_unique_id'] = uniqueId;
-
         this.addPromise((resolve, reject, data) => {
 
             let model_sync = new sync(this.table, this.primaryKey, this.updatedAt);
@@ -139,14 +134,10 @@ class WS_model extends WS_stmt {
             resolve(true);
         }, Object.assign({}, data));
         this.runPromises();
-
-        return uniqueId;
     }
 
     delete(primary_id) {
 
-        let uniqueId = Base64.btoa(this.table + '_save_' + unique_id());
-
         this.addPromise((resolve, reject, data) => {
 
             this
@@ -164,7 +155,6 @@ class WS_model extends WS_stmt {
                     let primaryKey = this.primaryKey;
                     let deleteData = {};
                     deleteData[primaryKey] = data.primary_id;
-                    deleteData['data_unique_id'] = uniqueId;
 
                     let model_sync = new sync(this.table, this.primaryKey, this.updatedAt);
                     model_sync
@@ -178,8 +168,6 @@ class WS_model extends WS_stmt {
                 });
         }, Object.assign({}, {primary_id: primary_id}));
         this.runPromises();
-
-        return uniqueId;
     }
 
     fetchAll(callback) {

src/component/ws_stmt.js

@@ -2,6 +2,8 @@ import WS_config from "./ws_config";
 import * as FileSystem from "expo-file-system";
 import Ws_crypto from "./ws_crypto";
 import canJSON from "project-can-json";
+import Base64 from "./base64";
+import unique_id from "./unique_id";
 
 class WS_stmt {
 
@@ -43,7 +45,7 @@ class WS_stmt {
         return WS_config.ws;
     }
 
-    encrypt(data){
+    encrypt(data) {
 
         return Ws_crypto.sign(data);
     }
@@ -78,6 +80,11 @@ class WS_stmt {
         };
     }
 
+    unique_id(prefix) {
+
+        return Base64.btoa(prefix + Math.floor(new Date().getTime() / 1000) + unique_id());
+    }
+
     debug() {
 
         this.stmtDebug = true;
@@ -250,7 +257,7 @@ class WS_stmt {
     use(method) {
 
         this.stmtUse.push(method);
-        if( this.stmtUseCallback === undefined )
+        if (this.stmtUseCallback === undefined)
             this.stmtUseCallback = {};
 
         if (typeof this[method] === "function") {