closer-cli 0.1.0 → 0.5.0

package/cmds/importData.js

@@ -24,13 +24,17 @@ exports.builder = yargs => {
     .option('out', {
       alias: 'o',
       describe: 'Directory path that will contain errored CSV files',
-      type: 'string',
-      default: '.out'
+      type: 'string'
     })
     .option('skipTasksBeforeImport', {
       describe: 'Skip tasks before start import process',
       type: 'bool'
     })
+    .option('csvDelimiter', {
+      describe: 'CSV Delimiter',
+      type: 'string',
+      default: ','
+    })
     .implies('non-interactive', ['type', 'mode'])
 }
 

package/cmds/importData_cmds/multiple.js

@@ -6,6 +6,7 @@ const path = require('path')
 const chalk = require('chalk')
 const prompts = require('prompts')
 const Ora = require('ora')
+
 const {
   getCsvFilesFromDir,
   ALLOWED_CSV_FILES,
@@ -17,7 +18,8 @@ const {
   download,
   callBeforeDataImportProcess,
   callAfterDataImportProcess,
-  getExecutionTime
+  getExecutionTime,
+  getArchiveFolder
 } = require('../../helpers')
 
 exports.command = 'multiple [options]'
@@ -52,6 +54,9 @@ exports.builder = yargs => {
 }
 
 exports.handler = async argv => {
+  // eslint-disable-next-line no-param-reassign
+  argv.out = argv.out || getArchiveFolder(argv.endpoint)
+
   const hrstart = process.hrtime()
   const report = {
     start: new Date(),
@@ -172,7 +177,7 @@ exports.handler = async argv => {
   // Validate CSV headers sequentially
   //
   for (const item of parsedFiles) {
-    const validation = await validateCsvFromFile(item.file, item.csvType, ws)
+    const validation = await validateCsvFromFile(item.file, item.csvType, ws, argv.csvDelimiter)
     validations.push(validation)
   }
 
@@ -227,7 +232,14 @@ exports.handler = async argv => {
   // Import CSV files sequentially
   //
   for (const item of parsedFiles) {
-    const csvReport = await importCsvFromFile(item.file, item.csvType, argv.out, spinner, ws)
+    const csvReport = await importCsvFromFile(
+      item.file,
+      item.csvType,
+      argv.out,
+      spinner,
+      ws,
+      argv.csvDelimiter
+    )
     csvReports.push(csvReport)
   }
 

package/cmds/importData_cmds/single.js

@@ -13,7 +13,8 @@ const {
   callBeforeDataImportProcess,
   ALLOWED_CSV_FILES,
   download,
-  validateCsvFromFile
+  validateCsvFromFile,
+  getArchiveFolder
 } = require('../../helpers')
 
 exports.command = 'single [options]'
@@ -48,6 +49,9 @@ exports.builder = yargs => {
 }
 
 exports.handler = async argv => {
+  // eslint-disable-next-line no-param-reassign
+  argv.out = argv.out || getArchiveFolder(argv.endpoint)
+
   const spinner = new Ora()
   const hrstart = process.hrtime()
 
@@ -153,7 +157,7 @@ exports.handler = async argv => {
     spinner.succeed('Downloaded file')
   }
 
-  const validation = await validateCsvFromFile(filepath, type, ws)
+  const validation = await validateCsvFromFile(filepath, type, ws, argv.csvDelimiter)
 
   if (validation.error) {
     console.log(`ERROR => [${chalk.red(validation.inputFile)}] ${validation.error}`)
@@ -172,7 +176,14 @@ exports.handler = async argv => {
   }
 
   if (argv.fromFile) {
-    csvReport = await importCsvFromFile(argv.fromFile, type, argv.out, spinner, ws)
+    csvReport = await importCsvFromFile(
+      argv.fromFile,
+      type,
+      argv.out,
+      spinner,
+      ws,
+      argv.csvDelimiter
+    )
   }
 
   const refreshedOrders = await refreshOrders(spinner, ws)

package/csv/simple_users.csv

@@ -1,8 +1,8 @@
-UserCode,Name,Email,Password,MacroFilterCodes,CanShareOrder,CanSendOrder,SharingUsers
-MR,Mario Rossi,mario.rossi@closer.sale,projectx,SS2020|FW2020|SS2021,TRUE,TRUE,EZ|EF|NR|FP|NDR|FC
-EZ,Enrico Zeffiro,enrico.zeffiro@h-farm.com,projectx,SS2020|FW2020|SS2021,TRUE,TRUE,MR|EF|NR|FP|NDR|FC
-EF,Emanuele Fornaro,emanuele.fornaro@h-farm.com,projectx,SS2020|FW2020,TRUE,TRUE,MR|EZ|NR|FP|NDR|FC
-NR,Nicole Raffino,nicole.raffino@h-farm.com,projectx,SS2020|FW2020,TRUE,TRUE,MR|EZ|EF|FP|NDR|FC
-FP,Francesco Pasqua,francesco.pasqua@h-farm.com,projectx,SS2020|FW2020,TRUE,TRUE,MR|EZ|EF|NR|NDR|FC
-NDR,Nicola Dei Rossi,nicola.deirossi@h-farm.com,projectx,FW2020,TRUE,TRUE,MR|EZ|EF|NR|FP|FC
-FC,Fabio Carraro,fabio.carraro@h-farm.com,projectx,SS2020|FW2020,TRUE,TRUE,MR|EZ|EF|NR|FP|NDR
+UserCode,Name,Email,Password,MacroFilterCodes,CanSendOrder,CanCloseOrder,SharingUsers
+MR,Mario Rossi,mario.rossi@closer.sale,projectx,SS2020|FW2020|SS2021,TRUE,TRUE,EZ|EF|NR|FP|NDR|FC
+EZ,Enrico Zeffiro,enrico.zeffiro@h-farm.com,projectx,SS2020|FW2020|SS2021,TRUE,TRUE,MR|EF|NR|FP|NDR|FC
+EF,Emanuele Fornaro,emanuele.fornaro@h-farm.com,projectx,SS2020|FW2020,TRUE,TRUE,MR|EZ|NR|FP|NDR|FC
+NR,Nicole Raffino,nicole.raffino@h-farm.com,projectx,SS2020|FW2020,TRUE,TRUE,MR|EZ|EF|FP|NDR|FC
+FP,Francesco Pasqua,francesco.pasqua@h-farm.com,projectx,SS2020|FW2020,TRUE,TRUE,MR|EZ|EF|NR|NDR|FC
+NDR,Nicola Dei Rossi,nicola.deirossi@h-farm.com,projectx,FW2020,TRUE,TRUE,MR|EZ|EF|NR|FP|FC
+FC,Fabio Carraro,fabio.carraro@h-farm.com,projectx,SS2020|FW2020,TRUE,TRUE,MR|EZ|EF|NR|FP|NDR

package/csv/users.csv

@@ -1,4 +1,4 @@
-UserCode,Name,Email,Password,GroupCodes,MacroFilterCodes,CanShareOrder,CanSendOrder,SharingUsers,Role
+UserCode,Name,Email,Password,GroupCodes,MacroFilterCodes,CanSendOrder,CanCloseOrder,SharingUsers,Role
 MR,Mario Rossi,mario.rossicloser.sale,projectx,AI|WA,SS2020|FW2020|SS2021,TRUE,TRUE,EZ|EF|NR|FP|NDR|FC,
 EZ,Enrico Zeffiro,enrico.zeffiro@h-farm.com,projectx,AI|WA,SS2020|FW2020|SS2021,TRUE,TRUE,MR|EF|NR|FP|NDR|FC,
 EF,Emanuele Fornaro,emanuele.fornaro@h-farm.com,projectx,AI|WA,SS2020|FW2020,TRUE,TRUE,MR|EZ|NR|FP|NDR|FC,

package/helpers.js

@@ -10,6 +10,7 @@ const parse = require('csv-parse/lib/sync')
 const stringify = require('csv-stringify/lib/sync')
 const got = require('got')
 const { createWriteStream } = require('fs')
+const slugify = require('slugify')
 
 exports.createSocketConnection = (endpoint, adminSecret) => {
   const protocol = endpoint.includes('localhost') ? 'ws' : 'wss'
@@ -24,10 +25,11 @@ exports.ALLOWED_CSV_FILES = {
   product: 'products.csv',
   price: 'prices.csv',
   group: 'groups.csv',
+  lookup: 'lookups.csv',
   user: 'users.csv',
   customer: 'customers.csv',
-  lookup: 'lookups.csv',
   label: 'labels.csv',
+  filterPosition: 'filterPosition.csv',
   fieldConfiguration: 'fieldConfigurations.csv',
   userCustomer: 'userCustomers.csv'
 }
@@ -38,7 +40,7 @@ exports.getCsvFilesFromDir = dir =>
 exports.getGoogleSheetCsvUrl = (docId, sheet) =>
   `https://docs.google.com/spreadsheets/d/${docId}/gviz/tq?tqx=out:csv&sheet=${sheet}`
 
-exports.importCsvFromFile = (file, csvType, outputDir, spinner, ws) =>
+exports.importCsvFromFile = (file, csvType, outputDir, spinner, ws, delimiter = ',') =>
   new Promise(resolve => {
     const socket = this.createSocketConnection(ws.endpoint, ws.adminSecret)
 
@@ -166,7 +168,7 @@ exports.importCsvFromFile = (file, csvType, outputDir, spinner, ws) =>
                   columns: true,
                   skip_empty_lines: true,
                   skipLinesWithEmptyValues: true,
-                  delimiter: ','
+                  delimiter
                 })
 
                 if (rows.length > 0) {
@@ -217,7 +219,7 @@ exports.importCsvFromFile = (file, csvType, outputDir, spinner, ws) =>
     })
   })
 
-exports.validateCsvFromFile = (file, csvType, ws) =>
+exports.validateCsvFromFile = (file, csvType, ws, delimiter = ',') =>
   new Promise(resolve => {
     const socket = this.createSocketConnection(ws.endpoint, ws.adminSecret)
 
@@ -247,7 +249,7 @@ exports.validateCsvFromFile = (file, csvType, ws) =>
                 columns: true,
                 skip_empty_lines: true,
                 skipLinesWithEmptyValues: true,
-                delimiter: ','
+                delimiter
               })
 
               const packet = {
@@ -703,3 +705,13 @@ exports.flushMedia = (spinner, ws) =>
       resolve({ error: e.message })
     })
   })
+
+exports.getArchiveFolder = instanceEndpoint => {
+  const date = new Date()
+  const prefix = 'closer'
+  const instance = slugify(instanceEndpoint.split('/')[0], { lower: true })
+  const [isoDateString, isoTimeString] = date.toISOString().split('T')
+  const dateString = isoDateString.split('-').join('')
+  const timeString = isoTimeString.split(':').join('').split('.')[0]
+  return `${prefix}_${instance}/${dateString}_${timeString}`.split(':').join('')
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "closer-cli",
-  "version": "0.1.0",
+  "version": "0.5.0",
   "description": "",
   "main": "index.js",
   "bin": {
@@ -19,6 +19,7 @@
     "ora": "^5.4.1",
     "prompts": "^2.4.2",
     "require-directory": "^2.1.1",
+    "slugify": "^1.6.3",
     "ws": "^8.0.0",
     "yargs": "^17.0.1"
   }