Merge pull request #33 from topcoder-platform/develop

fix: sync issues

Author: rakibansary

.circleci/config.yml

@@ -14,7 +14,7 @@ install_dependency: &install_dependency
 install_deploysuite: &install_deploysuite
           name: Installation of install_deploysuite.
           command: |
-            git clone --branch v1.3 https://github.com/topcoder-platform/tc-deploy-scripts ../buildscript
+            git clone --branch v1.4.1 https://github.com/topcoder-platform/tc-deploy-scripts ../buildscript
             cp ./../buildscript/master_deploy.sh .
             cp ./../buildscript/buildenv.sh .
             cp ./../buildscript/awsconfiguration.sh .

src/services/ProcessorService.js

@@ -21,31 +21,31 @@ function convertPayload (payload) {
     if (payload.createdAt) {
       payload.createdAt = moment(payload.createdAt).valueOf()
     } else {
-      payload.createdAt = moment().valueOf()
+      delete payload.createdAt
     }
   }
 
   if (payload.hasOwnProperty('updatedAt')) {
     if (payload.updatedAt) {
       payload.updatedAt = moment(payload.updatedAt).valueOf()
     } else {
-      payload.updatedAt = moment().valueOf()
+      delete payload.updatedAt
     }
   }
 
   if (payload.hasOwnProperty('emailVerifyTokenDate')) {
     if (payload.emailVerifyTokenDate) {
       payload.emailVerifyTokenDate = moment(payload.emailVerifyTokenDate).valueOf()
     } else {
-      payload.emailVerifyTokenDate = moment().valueOf()
+      delete payload.emailVerifyTokenDate
     }
   }
 
   if (payload.hasOwnProperty('newEmailVerifyTokenDate')) {
     if (payload.newEmailVerifyTokenDate) {
       payload.newEmailVerifyTokenDate = moment(payload.newEmailVerifyTokenDate).valueOf()
     } else {
-      payload.newEmailVerifyTokenDate = moment().valueOf()
+      delete payload.newEmailVerifyTokenDate
     }
   }
 
@@ -102,7 +102,8 @@ function * create (id, type, message) {
     index: config.get('esConfig.ES_INDEX'),
     type: type,
     id,
-    body: convertPayload(message.payload)
+    body: convertPayload(message.payload),
+    refresh: 'true',
   })
 }
 
@@ -117,7 +118,8 @@ function * update (id, type, message) {
     index: config.get('esConfig.ES_INDEX'),
     type: type,
     id,
-    body: { upsert: message.payload, doc: message.payload }
+    body: { upsert: message.payload, doc: message.payload },
+    refresh: 'true'
   })
 }
 
@@ -130,7 +132,8 @@ function * remove (ids, type) {
   yield _.map(ids, (id) => client.delete({
     index: config.get('esConfig.ES_INDEX'),
     type: type,
-    id
+    id,
+    refresh: 'true'
   }))
 }
 
@@ -142,7 +145,8 @@ function * createProfile (message) {
   const exists = yield client.exists({
     index: config.get('esConfig.ES_INDEX'),
     type: config.get('esConfig.ES_PROFILE_TYPE'),
-    id: message.payload.userId
+    id: message.payload.userId,
+    refresh: true
   });
 
   if(exists) {