@contentstack/cli-cm-import 0.1.1-beta.1 → 0.1.1-beta.10

package/src/lib/import/entries.js

@@ -10,13 +10,12 @@ const _ = require('lodash')
 const mkdirp = require('mkdirp')
 const chalk = require('chalk')
 
-const request = require('../util/request')
 const helper = require('../util/fs')
 const {addlogs} = require('../util/log')
 const lookupReplaceAssets = require('../util/lookupReplaceAssets')
 const lookupReplaceEntries = require('../util/lookupReplaceEntries')
-const supress = require('../util/supress-mandatory-fields')
-const extension_supress = require('../util/extensionsUidReplace')
+const suppress = require('../util/supress-mandatory-fields')
+const extension_suppress = require('../util/extensionsUidReplace')
 const util = require('../util')
 let config = util.getConfig()
 const stack = require('../util/contentstack-management-sdk')
@@ -37,12 +36,10 @@ let uniqueUidMapperPath
 let modifiedSchemaPath
 let createdEntriesWOUidPath
 let failedWOPath
-let publishEntryUid
+let masterLanguage
 
-
-let masterLanguage = config.master_locale
 let skipFiles = ['__master.json', '__priority.json', 'schema.json']
-let entryBatchLimit = eConfig.batchLimit || 16
+let entryBatchLimit = config.rateLimit || 10
 
 function importEntries() {
   let self = this
@@ -74,38 +71,21 @@ function importEntries() {
   // Entries that failed to get created OR updated
   this.fails = []
 
-  this.languages = helper.readFile(lPath)
-
   let files = fs.readdirSync(ctPath)
-
   this.environment = helper.readFile(environmentPath)
-
   for (let index in files) {
-    try {
-      if (skipFiles.indexOf(files[index]) === -1) {
-        if (files[index] != 'field_rules_uid.json') {
-          let schema = require(path.resolve(path.join(ctPath, files[index])))
-          self.ctSchemas[schema.uid] = schema
+    if (index) {
+      try {
+        if (skipFiles.indexOf(files[index]) === -1) {
+          if (files[index] != 'field_rules_uid.json') {
+            let schema = require(path.resolve(path.join(ctPath, files[index])))
+            self.ctSchemas[schema.uid] = schema
+          }
         }
+      } catch (error) {
+        console.error(error)
+        process.exit(0)
       }
-    } catch (error) {
-      console.error(error)
-      process.exit(0)
-    }
-  }
-
-  this.mappedAssetUids = helper.readFile(mappedAssetUidPath)
-  this.mappedAssetUrls = helper.readFile(mappedAssetUrlPath)
-
-  this.mappedAssetUids = this.mappedAssetUids || {}
-  this.mappedAssetUrls = this.mappedAssetUrls || {}
-
-  this.requestOptionTemplate = {
-    // /v3/content_types/
-    uri: config.host + config.apis.content_types,
-    headers: config.headers,
-    json: {
-      entry: {}
     }
   }
 }
@@ -114,71 +94,81 @@ importEntries.prototype = {
   /**
      * Start point for entry import
      * @return promise
-     */
+  */
   start: async function (credentialConfig) {
     let self = this
     config = credentialConfig
     client = stack.Client(config)
-    addlogs(config, 'Migrating entry', 'success')
-    return new Promise(async function (resolve, reject) {
+    masterLanguage = config.master_locale
+    addlogs(config, 'Migrating entries', 'success')
+    let languages = helper.readFile(lPath)
+    return new Promise(function (resolve, reject) {
       let langs = [masterLanguage.code]
-      for (let i in self.languages) {
-        langs.push(self.languages[i].code)
+      for (let i in languages) {
+        if (i) {
+          langs.push(languages[i].code)
+        }
       }
 
+      // Step 1: Removes filed rules from content type
+      // This allows to handle cases like self references and circular reference
+      // if mandatory reference fields are not filed in entries then avoids the error
+      // Also remove field visibility rules
       return self.supressFields().then(async function () {
+        let mappedAssetUids = helper.readFile(mappedAssetUidPath) || {}
+        let mappedAssetUrls = helper.readFile(mappedAssetUrlPath) || {}
+
+        // Step 2: Iterate over available languages to create entries in each.
         let counter = 0
         return Promise.map(langs, async function () {
           let lang = langs[counter]
-          if ((config.hasOwnProperty('onlylocales') && config.onlylocales.indexOf(lang) !== -1) || !
-          config.hasOwnProperty('onlylocales')) {
-            await self.createEntries(lang)
-            // .then(async function () {
-              await self.getCreatedEntriesWOUid()
-              // .then(async function () {
-                await self.repostEntries(lang)
-                // .then(function () {
-                  addlogs(config, 'Successfully imported \'' + lang + '\' entries!', 'success')
-                  counter++
-                // })
-              // })
-           // })
+          if ((config.hasOwnProperty('onlylocales') && config.onlylocales.indexOf(lang) !== -1) || !config.hasOwnProperty('onlylocales')) {
+            await self.createEntries(lang, mappedAssetUids, mappedAssetUrls)
+            await self.getCreatedEntriesWOUid()
+            await self.repostEntries(lang)
+            addlogs(config, 'Successfully imported \'' + lang + '\' entries!', 'success')
+            counter++
           } else {
             addlogs(config, lang + ' has not been configured for import, thus skipping it', 'success')
-            counter++          
+            counter++
           }
         }, {
-          concurrency: 1
+          concurrency: 1,
         }).then(async function () {
-          await self.unSupressFields()
-          //.then(function () {
-            await self.removeBuggedEntries()
-            //.then(async function () {
-              let ct_field_visibility_uid = helper.readFile(path.join(ctPath + '/field_rules_uid.json'))
-              let ct_files = fs.readdirSync(ctPath)
-              if (ct_field_visibility_uid && ct_field_visibility_uid != 'undefined') {
-                for (let index = 0; index < ct_field_visibility_uid.length; index++) {
-                  if (ct_files.indexOf(ct_field_visibility_uid[index] + '.json') > -1) {
-                    let schema = require(path.resolve(ctPath, ct_field_visibility_uid[index]))
-                    await self.field_rules_update(schema)
-                  }
-                }
+          // Step 3: Revert all the changes done in content type in step 1
+          await self.unSuppressFields()
+          await self.removeBuggedEntries()
+          let ct_field_visibility_uid = helper.readFile(path.join(ctPath + '/field_rules_uid.json'))
+          let ct_files = fs.readdirSync(ctPath)
+          if (ct_field_visibility_uid && ct_field_visibility_uid != 'undefined') {
+            for (let index = 0; index < ct_field_visibility_uid.length; index++) {
+              if (ct_files.indexOf(ct_field_visibility_uid[index] + '.json') > -1) {
+                let schema = require(path.resolve(ctPath, ct_field_visibility_uid[index]))
+                await self.field_rules_update(schema)
               }
-              addlogs(config, chalk.green('Entries have been imported successfully!'), 'success')
+            }
+          }
+          addlogs(config, chalk.green('Entries have been imported successfully!'), 'success')
+          if (config.entriesPublish) {
+            return self.publish(langs).then(function () {
+              addlogs(config, chalk.green('All the entries have been published successfully'), 'success')
               return resolve()
-           // })
-         // })
+            }).catch(errors => {
+              addlogs(config, chalk.error('Some entries might have failed to publish.'), 'error')
+              return reject(errors)
+            })
+          }
+          return resolve()
         })
       }).catch(function (error) {
         return reject(error)
       })
-    }).catch(error => {
     })
   },
 
-  createEntries: function (lang) {
+  createEntries: function (lang, mappedAssetUids, mappedAssetUrls) {
     let self = this
-    return new Promise(async function (resolve, reject) {
+    return new Promise(function (resolve, reject) {
       let contentTypeUids = Object.keys(self.ctSchemas)
       if (fs.existsSync(entryUidMapperPath)) {
         self.mappedUids = helper.readFile(entryUidMapperPath)
@@ -196,84 +186,118 @@ importEntries.prototype = {
         let failedEntryLogPath = path.join(eLogFolderPath, 'fails.json')
         let createdEntriesPath = path.join(eLogFolderPath, 'created-entries.json')
         let createdEntries = {}
+        let stack = client.stack({api_key: config.target_stack, management_token: config.management_token})
+
         if (fs.existsSync(createdEntriesPath)) {
           createdEntries = helper.readFile(createdEntriesPath)
           createdEntries = createdEntries || {}
         }
         if (fs.existsSync(eFilePath)) {
           let entries = helper.readFile(eFilePath)
-          if (!_.isPlainObject(entries)) {
+          if (!_.isPlainObject(entries) || _.isEmpty(entries)) {
             addlogs(config, chalk.white('No entries were found for Content type:\'' + ctUid + '\' in \'' + lang +
-                            '\' language!'), 'success')
-            return resolve()
-          }
-          for (let eUid in entries) {
-            // will replace all old asset uid/urls with new ones
-            entries[eUid] = lookupReplaceAssets({
-              content_type: self.ctSchemas[ctUid],
-              entry: entries[eUid]
-            }, self.mappedAssetUids, self.mappedAssetUrls, eLangFolderPath)
-          }
-          let eUids = Object.keys(entries)
-          let batches = []
-
-          // Run entry creation in batches of ~16~ entries
-          for (let i = 0; i < eUids.length; i += entryBatchLimit) {
-            batches.push(eUids.slice(i, i + entryBatchLimit))
-          }
+              '\' language!'), 'success')
+          } else {
+            addlogs(config, `Creating entries for content type ${ctUid} in language ${lang} ...`, 'success')
+            for (let eUid in entries) {
+              if (eUid) {
+                // will replace all old asset uid/urls with new ones
+                entries[eUid] = lookupReplaceAssets({
+                  content_type: self.ctSchemas[ctUid],
+                  entry: entries[eUid],
+                }, mappedAssetUids, mappedAssetUrls, eLangFolderPath)
+              }
+            }
+            let eUids = Object.keys(entries)
+            let batches = []
 
-          return Promise.map(batches, async function (batch) {
-            return Promise.map(batch, async function (eUid) {
-              //if entry is already created
-              if (createdEntries.hasOwnProperty(eUid)) {
-                addlogs(config, ('Skipping ' + JSON.stringify({
-                  content_type: ctUid,
-                  locale: lang,
-                  oldEntryUid: eUid,
-                  newEntryUid: createdEntries[eUid]
-                }) + ' as it is already created'), 'success')
-                self.success[ctUid] = createdEntries[eUid]
-                // if its a non-master language, i.e. the entry isn't present in the master language
-                if (lang !== masterLanguage) {
-                  self.uniqueUids[eUid] = self.uniqueUids[eUid] || {}
-                  if (self.uniqueUids[eUid].locales) {
-                    self.uniqueUids[eUid].locales.push(lang)
-                  } else {
-                    self.uniqueUids[eUid].locales = [lang]
+            // Run entry creation in batches of ~16~ entries
+            for (let i = 0; i < eUids.length; i += Math.round(entryBatchLimit / 3)) {
+              batches.push(eUids.slice(i, i + Math.round(entryBatchLimit / 3)))
+            }
+            return Promise.map(batches, async function (batch) {
+              return Promise.map(batch, async function (eUid) {
+                // if entry is already created
+                if (createdEntries.hasOwnProperty(eUid)) {
+                  addlogs(config, ('Skipping ' + JSON.stringify({
+                    content_type: ctUid,
+                    locale: lang,
+                    oldEntryUid: eUid,
+                    newEntryUid: createdEntries[eUid],
+                  }) + ' as it is already created'), 'success')
+                  self.success[ctUid] = createdEntries[eUid]
+                  // if its a non-master language, i.e. the entry isn't present in the master language
+                  if (lang !== masterLanguage) {
+                    self.uniqueUids[eUid] = self.uniqueUids[eUid] || {}
+                    if (self.uniqueUids[eUid].locales) {
+                      self.uniqueUids[eUid].locales.push(lang)
+                    } else {
+                      self.uniqueUids[eUid].locales = [lang]
+                    }
+                    self.uniqueUids[eUid].content_type = ctUid
                   }
-                  self.uniqueUids[eUid].content_type = ctUid
+                  return
                 }
-                return
-              }
-              let requestObject = {
-                qs: {
-                  locale: lang
-                },
-                json: {
-                  entry: entries[eUid]
+                let requestObject = {
+                  qs: {
+                    locale: lang,
+                  },
+                  json: {
+                    entry: entries[eUid],
+                  },
                 }
-              }
-
-              if (self.mappedUids.hasOwnProperty(eUid)) {                                
-              return client.stack({api_key: config.target_stack, management_token: config.management_token}).contentType(ctUid).entry(self.mappedUids[eUid]).fetch()
-              .then(entryToUpdate => {
-                Object.assign(entryToUpdate, _.cloneDeep(requestObject.json.entry))
-                return entryToUpdate.update({locale: entryToUpdate.locale}).then(async result => {   
-                  if (config.entriesPublish) {
-                    if (entries[eUid].publish_details.length > 0) {
-                      if (self.mappedUids.hasOwnProperty(eUid)) {
-                         publishEntryUid = self.mappedUids[eUid]
+                if (self.mappedUids.hasOwnProperty(eUid)) {
+                  let entryToUpdate = stack.contentType(ctUid).entry(self.mappedUids[eUid])
+                  Object.assign(entryToUpdate, _.cloneDeep(entries[eUid]))
+                  return entryToUpdate.update({locale: entryToUpdate.locale}).then(async entryResponse => {
+                    self.success[ctUid] = self.success[ctUid] || []
+                    self.success[ctUid].push(entries[eUid])
+                    if (!self.mappedUids.hasOwnProperty(eUid)) {
+                      self.mappedUids[eUid] = entryResponse.uid
+                      createdEntries = entryResponse
+                      // if its a non-master language, i.e. the entry isn't present in the master language
+                      if (lang !== masterLanguage) {
+                        self.uniqueUids[eUid] = self.uniqueUids[eUid] || {}
+                        if (self.uniqueUids[eUid].locales) {
+                          self.uniqueUids[eUid].locales.push(lang)
+                        } else {
+                          self.uniqueUids[eUid].locales = [lang]
+                        }
+                        self.uniqueUids[eUid].content_type = ctUid
+                      }
+                    }
+                  }).catch(function (err) {
+                    let error = JSON.parse(err.message)
+                    addlogs(config, chalk.red('Error updating entry', JSON.stringify(error)), 'error')
+                    self.fails.push({
+                      content_type: ctUid,
+                      locale: lang,
+                      entry: entries[eUid],
+                      error: error,
+                    })
+                    return err
+                  })
+                }
+                delete requestObject.json.entry.publish_details
+                return client.stack({api_key: config.target_stack, management_token: config.management_token}).contentType(ctUid).entry().create(requestObject.json)
+                .then(async entryResponse => {
+                  self.success[ctUid] = self.success[ctUid] || []
+                  self.success[ctUid].push(entries[eUid])
+                  if (!self.mappedUids.hasOwnProperty(eUid)) {
+                    self.mappedUids[eUid] = entryResponse.uid
+                    createdEntries = entryResponse
+                    // if its a non-master language, i.e. the entry isn't present in the master language
+                    if (lang !== masterLanguage) {
+                      self.uniqueUids[eUid] = self.uniqueUids[eUid] || {}
+                      if (self.uniqueUids[eUid].locales) {
+                        self.uniqueUids[eUid].locales.push(lang)
                       } else {
-                         publishEntryUid = createdEntries.uid
+                        self.uniqueUids[eUid].locales = [lang]
                       }
-                      await self.publish(publishEntryUid, ctUid, lang, entries[eUid])
-                      // .then(function () {
-                      // })
+                      self.uniqueUids[eUid].content_type = ctUid
                     }
                   }
-                  return           
-                }).catch(function (err) {
-                  let error = JSON.parse(err.message)
+                }).catch(function (error) {
                   if (error.hasOwnProperty('error_code') && error.error_code === 119) {
                     if (error.errors.title) {
                       addlogs(config, 'Entry ' + eUid + ' already exist, skip to avoid creating a duplicate entry', 'error')
@@ -284,10 +308,10 @@ importEntries.prototype = {
                       content_type: ctUid,
                       locale: lang,
                       entry: entries[eUid],
-                      error: error
+                      error: error,
                     })
                     helper.writeFile(createdEntriesWOUidPath, self.createdEntriesWOUid)
-                    return;
+                    return
                   }
                   // TODO: if status code: 422, check the reason
                   // 429 for rate limit
@@ -296,98 +320,40 @@ importEntries.prototype = {
                     content_type: ctUid,
                     locale: lang,
                     entry: entries[eUid],
-                    error: error
+                    error: error,
                   })
                 })
-              })
-              } else {
-              return client.stack({api_key: config.target_stack, management_token: config.management_token}).contentType(ctUid).entry().create(requestObject.json)
-              .then(async entryResponse => {
-                self.success[ctUid] = self.success[ctUid] || []
-                self.success[ctUid].push(entries[eUid])
-                if (!self.mappedUids.hasOwnProperty(eUid)) {
-                  self.mappedUids[eUid] = entryResponse.uid
-                  createdEntries = entryResponse
-                  // if its a non-master language, i.e. the entry isn't present in the master language
-                  if (lang !== masterLanguage) {
-                    self.uniqueUids[eUid] = self.uniqueUids[eUid] || {}
-                    if (self.uniqueUids[eUid].locales) {
-                      self.uniqueUids[eUid].locales.push(lang)
-                    } else {
-                      self.uniqueUids[eUid].locales = [lang]
-                    }
-                    self.uniqueUids[eUid].content_type = ctUid
-                  }
-                }
 
-                if (config.entriesPublish) {
-                  if (entries[eUid].publish_details.length > 0) {
-                    if (self.mappedUids.hasOwnProperty(eUid)) {
-                       publishEntryUid = self.mappedUids[eUid]
-                    } else {
-                       publishEntryUid = createdEntries.uid
-                    }
-                    await self.publish(publishEntryUid, ctUid, lang, entries[eUid])
-                    // .then(function () {
-                    // })
-                  }
-                }
-                return;
-              }).catch(function (error) {                
-                // let error = JSON.parse(err.message)
-                if (error.hasOwnProperty('error_code') && error.error_code === 119) {
-                  if (error.errors.title) {
-                    addlogs(config, 'Entry ' + eUid + ' already exist, skip to avoid creating a duplicate entry', 'error')
-                  } else {
-                    addlogs(config, chalk.red('Error creating entry due to: ' + JSON.stringify(error)), 'error')
-                  }
-                  self.createdEntriesWOUid.push({
-                    content_type: ctUid,
-                    locale: lang,
-                    entry: entries[eUid],
-                    error: error
-                  })
-                  helper.writeFile(createdEntriesWOUidPath, self.createdEntriesWOUid)
-                  return;
-                }
-                // TODO: if status code: 422, check the reason
-                // 429 for rate limit
-                addlogs(config, chalk.red('Error creating entry', JSON.stringify(error)), 'error')
-                self.fails.push({
-                  content_type: ctUid,
-                  locale: lang,
-                  entry: entries[eUid],
-                  error: error
-                })
+                // create/update 5 entries at a time
+              }, {
+                concurrency: 1,
+              }).then(function () {
+                helper.writeFile(successEntryLogPath, self.success[ctUid])
+                helper.writeFile(failedEntryLogPath, self.fails[ctUid])
+                helper.writeFile(entryUidMapperPath, self.mappedUids)
+                helper.writeFile(uniqueUidMapperPath, self.uniqueUids)
+                helper.writeFile(createdEntriesPath, createdEntries)
               })
-            }
-              // create/update 5 entries at a time
+              // process one batch at a time
             }, {
-              concurrency: reqConcurrency
+              concurrency: 1,
             }).then(function () {
-              helper.writeFile(successEntryLogPath, self.success[ctUid])
-              helper.writeFile(failedEntryLogPath, self.fails[ctUid])
-              helper.writeFile(entryUidMapperPath, self.mappedUids)
-              helper.writeFile(uniqueUidMapperPath, self.uniqueUids)
-              helper.writeFile(createdEntriesPath, createdEntries)
+              if (self.success && self.success[ctUid] && self.success[ctUid].length > 0)
+                addlogs(config, self.success[ctUid].length + ' entries created successfully in ' + ctUid + ' content type in ' + lang +
+                  ' locale!', 'success')
+              if (self.fails && self.fails[ctUid] && self.fails[ctUid].length > 0)
+                addlogs(config, self.fails[ctUid].length + ' entries failed to create in ' + ctUid + ' content type in ' + lang +
+                  ' locale!', 'error')
+              self.success[ctUid] = []
+              self.fails[ctUid] = []
             })
-            // process one batch at a time
-          }, {
-            concurrency: reqConcurrency
-          }).then(function () {
-            addlogs(config, 'Entries created successfully in ' + ctUid + ' content type in ' + lang +
-                            ' locale!', 'success')
-            self.success[ctUid] = []
-            self.fails[ctUid] = []
-            
-          })
+          }
         } else {
-          addlogs(config, chalk.red('Unable to find entry file path for ' + ctUid + ' content type!\nThe file \'' +
-                         eFilePath + '\' does not exist!'), 'error')
-                    
+          addlogs(config, chalk.white('Unable to find entry file path for ' + ctUid + ' content type!\nThe file \'' +
+            eFilePath + '\' does not exist!'), 'error')
         }
       }, {
-        concurrency: reqConcurrency
+        concurrency: reqConcurrency,
       }).then(function () {
         addlogs(config, chalk.green('Entries created successfully in \'' + lang + '\' language'), 'success')
         return resolve()
@@ -402,20 +368,19 @@ importEntries.prototype = {
     return new Promise(function (resolve) {
       self.createdEntriesWOUid = helper.readFile(createdEntriesWOUidPath)
       self.failedWO = []
-      if (_.isArray(self.createdEntriesWOUid) && self.createdEntriesWOUid.length) {
+      if (_.isArray(self.createdEntriesWOUid) && self.createdEntriesWOUid.length > 0) {
         return Promise.map(self.createdEntriesWOUid, function (entry) {
           return self.fetchEntry(entry)
         }, {
-          concurrency: reqConcurrency
+          concurrency: reqConcurrency,
         }).then(function () {
           helper.writeFile(failedWOPath, self.failedWO)
           addlogs(config, 'Mapped entries without mapped uid successfully!', 'success')
           return resolve()
         })
-      } else {
-        addlogs(config, 'No entries without mapped uid found!', 'success')
-        return resolve()
       }
+      addlogs(config, 'No entries without mapped uid found!', 'success')
+      return resolve()
     })
   },
   repostEntries: function (lang) {
@@ -431,14 +396,14 @@ importEntries.prototype = {
 
         if (!fs.existsSync(eSuccessFilePath)) {
           addlogs(config, 'Success file was not found at: ' + eSuccessFilePath, 'success')
-          return resolve()
+          return
         }
 
         let entries = helper.readFile(eSuccessFilePath)
         entries = entries || []
         if (entries.length === 0) {
           addlogs(config, 'No entries were created to be updated in \'' + lang + '\' language!', 'success')
-          return resolve()
+          return
         }
 
         // Keep track of entries that have their references updated
@@ -459,185 +424,181 @@ importEntries.prototype = {
             let uid = entry.uid
             let _entry = lookupReplaceEntries({
               content_type: schema,
-              entry: entry
+              entry: entry,
             }, _.clone(self.mappedUids), refUidMapperPath)
             // if there's self references, the uid gets replaced
             _entry.uid = uid
             return _entry
           } catch (error) {
             console.error(error)
+            return error
           }
         })
 
         // Run entry creation in batches of ~16~ entries
-        for (let i = 0; i < entries.length; i += entryBatchLimit) {
-          batches.push(entries.slice(i, i + entryBatchLimit))
+        for (let i = 0; i < entries.length; i += Math.round(entryBatchLimit / 3)) {
+          batches.push(entries.slice(i, i + Math.round(entryBatchLimit / 3)))
         }
-        return Promise.map(batches, function (batch, index) {
-          return Promise.map(batch, function (entry) {
+        return Promise.map(batches, async function (batch, index) {
+          return Promise.map(batch, async function (entry) {
             entry.uid = self.mappedUids[entry.uid]
             if (refsUpdatedUids.indexOf(entry.uid) !== -1) {
               addlogs(config, 'Entry: ' + entry.uid + ' in Content Type: ' + ctUid + ' in lang: ' +
-                                lang + ' references fields are already updated.', 'success')
-              return;
+                lang + ' references fields are already updated.', 'success')
+              return
             }
 
             let requestObject = {
               qs: {
-                locale: lang
+                locale: lang,
               },
               json: {
-                entry: entry
-              }
+                entry: entry,
+              },
             }
-
-            client.stack({api_key: config.target_stack, management_token: config.management_token}).contentType(ctUid).entry(entry.uid).fetch(requestObject.qs)
-            .then(entryResponse => {
-              Object.assign(entryResponse, _.cloneDeep(entry))
+            let promiseResult = new Promise((resolve, reject) => {
+              let entryResponse = client.stack({api_key: config.target_stack, management_token: config.management_token}).contentType(ctUid).entry(entry.uid)
+              Object.assign(entryResponse, entry)
               delete entryResponse.publish_details
-              return entryResponse.update()
-            })
-            .then(response => {
-              for (let j = 0; j < entries.length; j++) {
-                if (entries[j].uid === response.uid) {
-                  entries[j] = response
-                  break;
-                }
-              }
-              if (config.entriesPublish) {
-                if (entry.publish_details.length > 0) {
-                  let entryUid = response
-                return self.publish(entryUid.uid, ctUid, lang, entry).then(function () {
-                  return
-                  })
+              return entryResponse.update({locale: lang})
+              .then(response => {
+                for (let j = 0; j < entries.length; j++) {
+                  if (entries[j].uid === response.uid) {
+                    entries[j] = response
+                    break
+                  }
                 }
-              }
-              refsUpdatedUids.push(response.uid)
-            })
-            .catch(function (error) {
-              addlogs(config, chalk.red('Entry Uid: ' + entry.uid + ' of Content Type: ' + ctUid +
-                                  ' failed to update in locale: ' + lang), 'error')
-              
-              addlogs(config, error, 'error')
-              refsUpdateFailed.push({
-                content_type: ctUid,
-                entry: entry,
-                locale: lang,
-                error: error
+                refsUpdatedUids.push(response.uid)
+                return resolve()
               })
-            }) 
+              .catch(function (error) {
+                addlogs(config, chalk.red('Entry Uid: ' + entry.uid + ' of Content Type: ' + ctUid +
+                    ' failed to update in locale: ' + lang), 'error')
+
+                addlogs(config, error, 'error')
+                refsUpdateFailed.push({
+                  content_type: ctUid,
+                  entry: entry,
+                  locale: lang,
+                  error: error,
+                })
+                return reject()
+              })
+            })
+            await promiseResult
           }, {
-            concurrency: reqConcurrency
+            concurrency: reqConcurrency,
           }).then(function () {
             // batch completed successfully
             helper.writeFile(path.join(eFolderPath, 'success.json'), entries)
             helper.writeFile(path.join(eFolderPath, 'refsUpdatedUids.json'), refsUpdatedUids)
             helper.writeFile(path.join(eFolderPath, 'refsUpdateFailed.json'), refsUpdateFailed)
-            addlogs(config, 'Completed batch no: ' + (index + 1) + ' successfully!', 'success')
-                        
+            addlogs(config, 'Completed re-post entries batch no: ' + (index + 1) + ' successfully!', 'success')
           }).catch(function (error) {
             // error while executing entry in batch
-            addlogs(config, chalk.red('Failed at batch no: ' + (index + 1)), 'error')
+            addlogs(config, chalk.red('Failed re-post entries at batch no: ' + (index + 1)), 'error')
             throw error
           })
         }, {
-          concurrency: reqConcurrency
+          concurrency: reqConcurrency,
         }).then(function () {
           // finished updating entries with references
           addlogs(config, 'Imported entries of Content Type: \'' + ctUid + '\' in language: \'' + lang +
-                        '\' successfully!', 'success')
-                    
+            '\' successfully!', 'success')
         }).catch(function (error) {
           // error while updating entries with references
           addlogs(config, chalk.red('Failed while importing entries of Content Type: \'' + ctUid + '\' in language: \'' +
-                        lang + '\' successfully!'), 'error')
+            lang + '\' successfully!'), 'error')
           throw error
         })
       }, {
-        concurrency: reqConcurrency
+        concurrency: reqConcurrency,
       }).then(function () {
         // completed updating entry references
         addlogs(config, chalk.green('Imported entries in \'' + lang + '\' language successfully!'), 'success')
         return resolve()
       }).catch(function (error) {
         // error while updating entry references
-        addlogs(config, chalk.red('Failed to import entries in ' + lang + ' language'), 'error')
+        addlogs(config, chalk.red('Failed to re post entries in ' + lang + ' language'), 'error')
         return reject(error)
       })
     })
   },
-  supressFields: function () {
+  supressFields: async function () {
+    addlogs(config, chalk.white('Suppressing content type fields...'), 'success')
     let self = this
     return new Promise(function (resolve, reject) {
       let modifiedSchemas = []
-      let supressedSchemas = []
+      let suppressedSchemas = []
 
       for (let uid in self.ctSchemas) {
-        let contentTypeSchema = _.cloneDeep(self.ctSchemas[uid])
-        let flag = {
-          supressed: false,
-          references: false
-        }
-        if (contentTypeSchema.field_rules) {
-          delete contentTypeSchema.field_rules
-        }
-        supress(contentTypeSchema.schema, flag)
-        // check if supress modified flag
-        if (flag.supressed) {
-          supressedSchemas.push(contentTypeSchema)
-          modifiedSchemas.push(self.ctSchemas[uid])
-        }
+        if (uid) {
+          let contentTypeSchema = _.cloneDeep(self.ctSchemas[uid])
+          let flag = {
+            suppressed: false,
+            references: false,
+          }
+          if (contentTypeSchema.field_rules) {
+            delete contentTypeSchema.field_rules
+          }
 
-        if (flag.references) {
-          self.refSchemas.push(uid)
-        }
+          // Set mandatory or unique flag to false
+          suppress(contentTypeSchema.schema, flag)
+          // Check if suppress modified flag
+          if (flag.suppressed) {
+            suppressedSchemas.push(contentTypeSchema)
+            modifiedSchemas.push(self.ctSchemas[uid])
+          }
+
+          if (flag.references) {
+            self.refSchemas.push(uid)
+          }
 
-        extension_supress(contentTypeSchema.schema, config.preserveStackVersion)
+          // Replace extensions with new UID
+          extension_suppress(contentTypeSchema.schema, config.preserveStackVersion)
+        }
       }
 
+      // write modified schema in backup file
       helper.writeFile(modifiedSchemaPath, modifiedSchemas)
 
-      return Promise.map(supressedSchemas, function (schema) {
-
-        client.stack({api_key: config.target_stack, management_token: config.management_token}).contentType(schema.uid).fetch()
-        .then(contentTypeResponse => {       
-          Object.assign(contentTypeResponse, _.cloneDeep(schema))
-          return contentTypeResponse.update()
-        })
+      return Promise.map(suppressedSchemas, async function (schema) {
+        let contentTypeResponse = client.stack({api_key: config.target_stack, management_token: config.management_token}).contentType(schema.uid)
+        Object.assign(contentTypeResponse, _.cloneDeep(schema))
+        return contentTypeResponse.update()
         .then(UpdatedcontentType => {
-          return
+
         }).catch(function (error) {
           addlogs(config, chalk.red('Failed to modify mandatory field of \'' + schema.uid + '\' content type'), 'error')
-          throw error
         })
         // update 5 content types at a time
       }, {
-        concurrency: reqConcurrency
+        // update reqConcurrency content types at a time
+        concurrency: reqConcurrency,
       }).then(function () {
         return resolve()
       }).catch(function (error) {
-        addlogs(config, chalk.red('Error while supressing mandatory field schemas'), 'error')
+        addlogs(config, chalk.red('Error while suppressing mandatory field schemas'), 'error')
         return reject(error)
       })
     })
   },
   fetchEntry: function (query) {
     let self = this
-    return new Promise(function (resolve) {
+    return new Promise(function (resolve, reject) {
       let requestObject = {
         qs: {
           query: {
-            title: query.entry.title
+            title: query.entry.title,
           },
-          locale: query.locale
-        }
+          locale: query.locale,
+        },
       }
 
-      return client.stack({ api_key: config.target_stack, management_token: config.management_token}).contentType(query.content_type).entry().query(requestObject.qs).find()
+      return client.stack({api_key: config.target_stack, management_token: config.management_token}).contentType(query.content_type).entry().query(requestObject.qs).find()
       .then(function (response) {
-        if (!response.body.entries.length) {
+        if (response.body.entries.length <= 0) {
           addlogs(config, 'Unable to map entry WO uid: ' + query.entry.uid, 'error')
-         // log.debug('Request:\n' + JSON.stringify(requestObject))
           self.failedWO.push(query)
           return resolve()
         }
@@ -646,46 +607,53 @@ importEntries.prototype = {
         let entries = helper.readFile(_ePath)
         entries.push(query.entry)
         helper.writeFile(_ePath, entries)
-        addlogs(config, 'Completed mapping entry wo uid: ' + query.entry.uid + ': ' + response.body.entries[0].uid, 'success')
+        addlogs(config, 'Completed mapping entry wo uid: ' + query.entry.uid + ': ' + response.body.entries[0].uid, 'clientsuccess')
         return resolve()
-      }).catch(function () {
+      }).catch(function (error) {
         return resolve()
       })
     })
   },
-  unSupressFields: function () {
+  unSuppressFields: function () {
     let self = this
-    return new Promise(async function (resolve, reject) {
+    return new Promise(function (resolve, reject) {
       let modifiedSchemas = helper.readFile(modifiedSchemaPath)
       let modifiedSchemasUids = []
       let updatedExtensionUidsSchemas = []
       for (let uid in modifiedSchemas) {
-        let _contentTypeSchema = _.cloneDeep(modifiedSchemas[uid])
-        if (_contentTypeSchema.field_rules) {
-          delete _contentTypeSchema.field_rules
+        if (uid) {
+          let _contentTypeSchema = _.cloneDeep(modifiedSchemas[uid])
+          if (_contentTypeSchema.field_rules) {
+            delete _contentTypeSchema.field_rules
+          }
+          extension_suppress(_contentTypeSchema.schema, config.preserveStackVersion)
+          updatedExtensionUidsSchemas.push(_contentTypeSchema)
         }
-        extension_supress(_contentTypeSchema.schema, config.preserveStackVersion)
-        updatedExtensionUidsSchemas.push(_contentTypeSchema)
       }
 
-      return Promise.map(updatedExtensionUidsSchemas, function (schema) {
-       client.stack({api_key: config.target_stack, management_token: config.management_token}).contentType(schema.uid).fetch()
-        .then(contentTypeResponse => {
-          contentTypeResponse.schema = schema.schema
+      return Promise.map(updatedExtensionUidsSchemas, async function (schema) {
+        let promise = new Promise((resolve, reject) => {
+          client.stack({api_key: config.target_stack, management_token: config.management_token}).contentType(schema.uid).fetch()
+          .then(contentTypeResponse => {
+            contentTypeResponse.schema = schema.schema
             contentTypeResponse.update()
-          .then(UpdatedcontentType => {
-            modifiedSchemasUids.push(schema.uid)
-            //addlogs(config, (chalk.white('Content type: \'' + schema.uid + '\' has been restored to its previous glory!'))
-            return
+            .then(UpdatedcontentType => {
+              modifiedSchemasUids.push(schema.uid)
+              addlogs(config, (chalk.white('Content type: \'' + schema.uid + '\' has been restored to its previous glory!')))
+              return resolve()
+            }).catch(function (error) {
+              addlogs(config, chalk.red('Failed to re-update ' + schema.uid), 'error')
+              addlogs(config, error, 'error')
+              return reject(error)
+            })
           }).catch(function (error) {
-            addlogs(config, chalk.red('Failed to re-update ' + schema.uid), 'error')
             addlogs(config, error, 'error')
+            return reject(error)
           })
-        }).catch(function (error) {
-          addlogs(config, error, 'error') 
         })
+        await promise
       }, {
-        concurrency: reqConcurrency
+        concurrency: reqConcurrency,
       }).then(function () {
         for (let i = 0; i < modifiedSchemas.length; i++) {
           if (modifiedSchemasUids.indexOf(modifiedSchemas[i].uid) !== -1) {
@@ -713,39 +681,25 @@ importEntries.prototype = {
         if (entries[uid].locales.indexOf(masterLanguage.code) === -1) {
           bugged.push({
             content_type: entries[uid].content_type,
-            uid: uid
+            uid: uid,
           })
         }
       }
 
       return Promise.map(bugged, function (entry) {
-        // let requestObject = {
-        //   uri: self.requestOptionTemplate.uri + entry.content_type + config.apis.entries + self.mappedUids[
-        //   entry.uid],
-        //   method: 'DELETE',
-        //   qs: {
-        //     locale: masterLanguage.code
-        //   },
-        //   headers: self.requestOptionTemplate.headers,
-        //   json: true
-        // }
-
-        return client.stack({api_key: config.source_stack, management_token: config.management_token}).contentType(entry.content_type).entry(self.mappedUids[entry.uid]).delete({locale: masterLanguage.code})
+        return client.stack({api_key: config.target_stack, management_token: config.management_token}).contentType(entry.content_type).entry(self.mappedUids[entry.uid]).delete({locale: masterLanguage.code})
         .then(function () {
           removed.push(self.mappedUids[entry.uid])
-          addlogs(config, 'Removed bugged entry from master ' + JSON.stringify(entry), 'success')      
+          addlogs(config, 'Removed bugged entry from master ' + JSON.stringify(entry), 'success')
         })
         .catch(function (error) {
           addlogs(config, chalk.red('Failed to remove bugged entry from master language'), 'error')
           addlogs(config, error, 'error')
           addlogs(config, JSON.stringify(entry), 'error')
-                    
         })
-
       }, {
-        concurrency: reqConcurrency
+        concurrency: reqConcurrency,
       }).then(function () {
-
         for (let i = 0; i < bugged.length; i++) {
           if (removed.indexOf(bugged[i].uid) !== -1) {
             bugged.splice(i, 1)
@@ -768,72 +722,145 @@ importEntries.prototype = {
     let self = this
     return new Promise(function (resolve, reject) {
       if (schema.field_rules) {
-        let field_rules_array = []
-        for (let k = 0; k < schema.field_rules.length; k++) {
-          for (let i = 0; i < schema.field_rules[k].conditions.length; i++) {
+        let fieldRuleLength = schema.field_rules.length
+        for (let k = 0; k < fieldRuleLength; k++) {
+          let fieldRuleConditionLength = schema.field_rules[k].conditions.length
+          for (let i = 0; i < fieldRuleConditionLength; i++) {
             if (schema.field_rules[k].conditions[i].operand_field === 'reference') {
-              let field_rules_value = schema.field_rules[k].conditions[i].value
-              field_rules_array = field_rules_value.split('.')
-              let updated_value = []
-              for (let j = 0; j < field_rules_array.length; j++) {
-                let splited_field_rules_value = field_rules_array[j]
-                let old_uid = helper.readFile(path.join(entryUidMapperPath))
-                if (old_uid.hasOwnProperty(splited_field_rules_value)) {
-                  updated_value.push(old_uid[splited_field_rules_value])
+              let fieldRulesValue = schema.field_rules[k].conditions[i].value
+              let fieldRulesArray = fieldRulesValue.split('.')
+              let updatedValue = []
+              for (let j = 0; j < fieldRulesArray.length; j++) {
+                let splitedFieldRulesValue = fieldRulesArray[j]
+                let oldUid = helper.readFile(path.join(entryUidMapperPath))
+                if (oldUid.hasOwnProperty(splitedFieldRulesValue)) {
+                  updatedValue.push(oldUid[splitedFieldRulesValue])
                 } else {
-                  updated_value.push(field_rules_array[j])
+                  updatedValue.push(fieldRulesArray[j])
                 }
               }
-              let append_all_values = updated_value.join('.')
-              schema.field_rules[k].conditions[i]['value'] = append_all_values
+              schema.field_rules[k].conditions[i].value = updatedValue.join('.')
             }
           }
         }
       } else {
-        console.log('field_rules is not available')
+        addlogs(config, 'field_rules is not available...', 'error')
       }
 
-      return client.stack({api_key: config.target_stack, management_token: config.management_token}).contentType(schema.uid).fetch()
-      .then(contentTypeResponse => {
-        contentTypeResponse.schema = schema.schema
+      client.stack({ api_key: config.target_stack, management_token: config.management_token }).contentType(schema.uid).fetch()
+      .then((contentTypeResponse) => {
+        // Object.assign(ctObj, _.cloneDeep(schema))
+        contentTypeResponse.field_rules = schema.field_rules
         contentTypeResponse.update()
-        return resolve();
+      })
+      .then(() => {
+        return resolve()
       }).catch(function (error) {
+        return reject(error)
       })
     })
   },
-  publish: function (eUid, ctUid, lang, entryObj) {
+  publish: function (langs) {
     let self = this
-    let envId = []
-    let locales = []
     let requestObject = {
-        entry: {}
+      entry: {},
     }
-    
+
+    let contentTypeUids = Object.keys(self.ctSchemas)
+    let entryMapper = helper.readFile(entryUidMapperPath)
+
     return new Promise(function (resolve, reject) {
-      _.forEach(entryObj.publish_details, function (pubObject) {
-        if (self.environment.hasOwnProperty(pubObject.environment)) {
-          envId.push(self.environment[pubObject.environment].name)
-          let idx = _.indexOf(locales, pubObject.locale)
-          if (idx === -1) {
-            locales.push(pubObject.locale)
+      return Promise.map(langs, function (_lang, counter) {
+        let lang = langs[counter]
+        return Promise.map(contentTypeUids, function (ctUid) {
+          let eFilePath = path.resolve(ePath, ctUid, lang + '.json')
+          let entries = helper.readFile(eFilePath)
+
+          let eUids = Object.keys(entries)
+          let batches = []
+
+          if (eUids.length > 0) {
+            for (let i = 0; i < eUids.length; i += entryBatchLimit) {
+              batches.push(eUids.slice(i, i + entryBatchLimit))
+            }
+          } else {
+            return
           }
-        }
-      })
-      requestObject.entry['environments'] = envId
-      requestObject.entry['locales'] = locales
-      
-      client.stack({api_key: config.target_stack, management_token: config.management_token}).contentType(ctUid).entry(eUid).publish({ publishDetails: requestObject.entry, locale: lang})
-      .then(result => {
-        addlogs(config, chalk.green('Entry ' + eUid + ' published successfully in ' + ctUid + ' content type'), 'success')
+
+          return Promise.map(batches, async function (batch) {
+            return Promise.map(batch, async function (eUid) {
+              let entry = entries[eUid]
+              let envId = []
+              let locales = []
+              if (entry.publish_details && entry.publish_details.length > 0) {
+                _.forEach(entries[eUid].publish_details, function (pubObject) {
+                  if (self.environment.hasOwnProperty(pubObject.environment) && _.indexOf(envId, self.environment[pubObject.environment].name) === -1) {
+                    envId.push(self.environment[pubObject.environment].name)
+                  }
+                  if (pubObject.locale) {
+                    let idx = _.indexOf(locales, pubObject.locale)
+                    if (idx === -1) {
+                      locales.push(pubObject.locale)
+                    }
+                  }
+                })
+
+                let entryUid = entryMapper[eUid]
+                if (entryUid) {
+                  requestObject.entry.environments = envId
+                  requestObject.entry.locales = locales
+                  let publishPromiseResult = new Promise((resolve, reject) => {
+                    client.stack({api_key: config.target_stack, management_token: config.management_token}).contentType(ctUid).entry(entryUid).publish({publishDetails: requestObject.entry, locale: lang})
+                    // eslint-disable-next-line max-nested-callbacks
+                    .then(result => {
+                      // addlogs(config, 'Entry ' + eUid + ' published successfully in ' + ctUid + ' content type', 'success')
+                      console.log('Entry ' + eUid + ' published successfully in ' + ctUid + ' content type');
+                      return resolve(result)
+                      // eslint-disable-next-line max-nested-callbacks
+                    }).catch(function (err) {
+                      // addlogs(config, 'Entry ' + eUid + ' not published successfully in ' + ctUid + ' content type', 'error')
+                      console.log('Entry ' + eUid + ' not published successfully in ' + ctUid + ' content type')
+                      return reject(err.errorMessage)
+                    })
+                  })
+                  return publishPromiseResult
+                }
+              } else {
+                return {}
+              }
+            }, {
+              concurrency: reqConcurrency,
+            }).then(function () {
+            }).catch(function (error) {
+              // error while executing entry in batch
+              addlogs(config, error, 'error')
+              return error
+            })
+          }, {
+            concurrency: 1,
+          }).then(function () {
+            // addlogs(config, 'Entries published successfully in ' + ctUid + ' content type', 'success')
+            console.log('Entries published successfully in ' + ctUid + ' content type')
+          }).catch(function (error) {
+            addlogs(config, 'Failed some of the Entry publishing in ' + ctUid + ' content type, go through logs for details.', 'error')
+            return error
+          })
+        }, {
+          concurrency: 1,
+        }).then(function () {
+
+        }).catch(function (error) {
+          return error
+        })
+      }, {
+        concurrency: 1,
+      }).then(function () {
         return resolve()
-      })
-      .catch(function (err) {
-        let error = JSON.parse(err.message)
+      }).catch(error => {
         return reject(error)
       })
     })
   },
 }
 
-module.exports = new importEntries()
+module.exports = new importEntries()