closer-cli 2.7.0 → 2.8.0

package/CHANGELOG.md

@@ -3,6 +3,19 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.8.0](https://code.hfarm.dev/closer/closer/compare/v2.7.1...v2.8.0) (2022-04-27)
+
+
+### Features
+
+* **#PJX-433:** [Import FTP] Cambiare il valore di default del separatore csv ([ef27bf1](https://code.hfarm.dev/closer/closer/commits/ef27bf17847f17b94ba5ec82846a9c94f521be22)), closes [#PJX-433](https://code.hfarm.dev/closer/closer/issues/PJX-433)
+* **#PJX-437:** [Import] Archiviare anche il file csv sorgente ([9a729c5](https://code.hfarm.dev/closer/closer/commits/9a729c54982537e3bb6eca4bffc1f23c6bcc8aaf)), closes [#PJX-437](https://code.hfarm.dev/closer/closer/issues/PJX-437)
+* **#PJX-439:** Anagrafiche con zero righe ([571ec16](https://code.hfarm.dev/closer/closer/commits/571ec169766cd784e6b7e905fa801f238da31fb6)), closes [#PJX-439](https://code.hfarm.dev/closer/closer/issues/PJX-439)
+
+
+
+
+
 # [2.6.0](https://code.hfarm.dev/closer/closer/compare/v2.5.1...v2.6.0) (2022-04-19)
 
 

package/cmds/importData_cmds/multiple.js

@@ -19,7 +19,8 @@ const {
   callBeforeDataImportProcess,
   callAfterDataImportProcess,
   getExecutionTime,
-  getArchiveFolder
+  getArchiveFolder,
+  renameWithTimestamp
 } = require('../../helpers')
 
 exports.command = 'multiple [options]'
@@ -274,9 +275,9 @@ exports.handler = async argv => {
 
   report.result = reportRows
 
-  // const message = getDataImportMessageReport(report)
-
   await callAfterDataImportProcess(spinner, ws, report)
 
+  await renameWithTimestamp(argv.out)
+
   process.exit()
 }

package/cmds/importData_cmds/single.js

@@ -14,7 +14,8 @@ const {
   ALLOWED_CSV_FILES,
   download,
   validateCsvFromFile,
-  getArchiveFolder
+  getArchiveFolder,
+  renameWithTimestamp
 } = require('../../helpers')
 
 exports.command = 'single [options]'
@@ -213,5 +214,7 @@ exports.handler = async argv => {
 
   await callAfterDataImportProcess(spinner, ws, report)
 
+  await renameWithTimestamp(argv.out)
+
   process.exit()
 }

package/cmds/importStock.js

@@ -167,7 +167,9 @@ exports.handler = async argv => {
 
   let filepath = argv.fromFile
 
-  if (argv.fromUrl || argv.fromGoogleDocId) {
+  if (argv.fromDir) {
+    filepath = file.file
+  } else if (argv.fromUrl || argv.fromGoogleDocId) {
     spinner.start('Downloading file...')
     filepath = await download(file.url, argv.out, `${csvType}.csv`)
     spinner.succeed('Downloaded file')

package/helpers.js

@@ -36,13 +36,15 @@ exports.ALLOWED_CSV_FILES = {
   userCustomer: 'userCustomers.csv'
 }
 
-exports.getCsvFilesFromDir = dir =>
+const getCsvFilesFromDir = dir =>
   fs.readdirSync(dir).filter(file => path.extname(file).toLowerCase() === '.csv')
 
+exports.getCsvFilesFromDir = getCsvFilesFromDir
+
 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, delimiter = ',') =>
+exports.importCsvFromFile = (file, csvType, outputDir, spinner, ws, delimiter = ';') =>
   new Promise(resolve => {
     const socket = this.createSocketConnection(ws.endpoint, ws.adminSecret)
 
@@ -54,6 +56,9 @@ exports.importCsvFromFile = (file, csvType, outputDir, spinner, ws, delimiter =
       fs.mkdirSync(outputDir, { recursive: true })
     }
 
+    const filename = path.basename(file)
+    fs.copyFileSync(file, path.resolve(outputDir, filename))
+
     const errorCsvFile = path.resolve(outputDir, `${csvType}_errors.csv`)
     const errorFileStream = fs.createWriteStream(errorCsvFile)
 
@@ -66,8 +71,6 @@ exports.importCsvFromFile = (file, csvType, outputDir, spinner, ws, delimiter =
     let countFailed = 0
     let countSkipped = 0
 
-    const filename = path.basename(file)
-
     spinner.start('Loading...')
 
     const importRowSuccess = () => {
@@ -247,20 +250,29 @@ exports.validateCsvFromFile = (file, csvType, ws, delimiter = ';') =>
             }
 
             if (lineNumber === 1) {
-              const rows = parse(`${header}\n${line}`, {
-                columns: true,
-                skip_empty_lines: true,
-                skipLinesWithEmptyValues: true,
-                delimiter
-              })
-
-              const packet = {
-                csvColumns: Object.keys(rows[0]),
-                csvType,
-                type: 'validateCsvHeaderRequest'
+              if (line === '') {
+                resolve({
+                  csvType,
+                  executionTime: this.getExecutionTime(hrstart),
+                  inputFile: filename
+                })
+              } else {
+                const rows = parse(`${header}\n${line}`, {
+                  columns: true,
+                  skip_empty_lines: true,
+                  skipLinesWithEmptyValues: true,
+                  delimiter
+                })
+
+                const packet = {
+                  csvColumns: Object.keys(rows[0]),
+                  csvType,
+                  type: 'validateCsvHeaderRequest'
+                }
+
+                socket.send(JSON.stringify(packet))
               }
 
-              socket.send(JSON.stringify(packet))
               readStream.destroy()
             }
 
@@ -420,7 +432,6 @@ exports.refreshOrders = (spinner, ws) =>
       const { type, payload } = JSON.parse(packet)
       switch (type) {
         case 'refreshDraftOrdersResponse': {
-          console.log(JSON.stringify({ type, payload }))
           spinner.text = this.printRefreshedOrders({
             ...payload,
             executionTime: this.getExecutionTime(hrstart)
@@ -710,11 +721,32 @@ exports.flushMedia = (spinner, ws) =>
   })
 
 exports.getArchiveFolder = instanceEndpoint => {
-  const date = new Date()
   const prefix = 'closer'
   const instance = slugify(instanceEndpoint.split('/')[0], { lower: true })
+  const ts = getTimestampForFilename()
+  return `${prefix}_${instance}/${ts}`
+}
+
+exports.renameWithTimestamp = dirPath => {
+  const ts = getTimestampForFilename()
+
+  const files = getCsvFilesFromDir(dirPath).map(filename => {
+    const oldPath = path.resolve(dirPath, filename)
+    const [name, ext] = oldPath.split('.')
+    const newPath = `${name}_${ts}.${ext}`
+    return {
+      oldPath,
+      newPath
+    }
+  })
+
+  files.forEach(file => fs.rename(file.oldPath, file.newPath, () => {}))
+}
+
+const getTimestampForFilename = () => {
+  const date = new Date()
   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('')
+  return `${dateString}_${timeString}`.split(':').join('')
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "closer-cli",
-  "version": "2.7.0",
+  "version": "2.8.0",
   "description": "",
   "main": "index.js",
   "bin": {