closer-cli 2.7.0 → 2.11.0

package/CHANGELOG.md

@@ -3,6 +3,41 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.11.0](https://code.hfarm.dev/closer/closer/compare/v2.10.0...v2.11.0) (2022-05-18)
+
+
+### Features
+
+* **#PJX-445:** Multilingua ([f24f066](https://code.hfarm.dev/closer/closer/commits/f24f0668b7c0c8338c8d91db68afc871efb534ed)), closes [#PJX-445](https://code.hfarm.dev/closer/closer/issues/PJX-445)
+
+
+
+
+
+# [2.9.0](https://code.hfarm.dev/closer/closer/compare/v2.8.0...v2.9.0) (2022-05-09)
+
+
+### Features
+
+* **#PJX-442:** Import ad hoc disponibilità incrementale non bloccante ([aad991b](https://code.hfarm.dev/closer/closer/commits/aad991ba97e76977c6a6a2d73ef614026324b0d3)), closes [#PJX-442](https://code.hfarm.dev/closer/closer/issues/PJX-442)
+
+
+
+
+
+# [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/helpers.js

@@ -23,6 +23,9 @@ exports.createSocketConnection = (endpoint, adminSecret) => {
 
 exports.ALLOWED_CSV_FILES = {
   product: 'products.csv',
+  localizedProduct: 'localizedProducts.csv',
+  localizedFilter: 'localizedFilters.csv',
+  localizedVariant: 'localizedVariants.csv',
   price: 'prices.csv',
   group: 'groups.csv',
   lookup: 'lookups.csv',
@@ -36,13 +39,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 +59,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 +74,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 +253,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 +435,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 +724,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.11.0",
   "description": "",
   "main": "index.js",
   "bin": {

package/cmds/importStock.js

@@ -1,213 +0,0 @@
-/* eslint-disable no-await-in-loop */
-/* eslint-disable no-restricted-syntax */
-/* eslint-disable no-console */
-const fs = require('fs')
-const chalk = require('chalk')
-const path = require('path')
-
-const Ora = require('ora')
-const prompts = require('prompts')
-const {
-  importCsvFromFile,
-  getExecutionTime,
-  callAfterDataImportProcess,
-  ALLOWED_CSV_FILES,
-  download,
-  validateCsvFromFile,
-  getArchiveFolder,
-  getGoogleSheetCsvUrl
-} = require('../helpers')
-
-exports.command = 'import:stock'
-
-exports.desc = 'Import Stock Availability from CSV file'
-
-exports.builder = yargs => {
-  yargs
-    .usage(`Usage: ${chalk.cyan('$0 import:stock')} [options]`)
-    .option('fromFile', {
-      alias: 'f',
-      describe: 'File to import',
-      type: 'string'
-    })
-    .option('fromUrl', {
-      alias: 'u',
-      describe: 'Remote URL file to import',
-      type: 'string'
-    })
-    .option('fromDir', {
-      alias: 'd',
-      describe: 'Directory path that contains file to import',
-      type: 'string'
-    })
-    .option('fromGoogleDocId', {
-      alias: 'g',
-      describe: 'Google Doc ID that contains sheet to import',
-      type: 'string'
-    })
-    // .conflicts('fromFile', 'fromUrl', 'fromDir', 'fromGoogleDocId')
-    .check(argv => {
-      if (!argv.fromFile && !argv.fromUrl && !argv.fromDir && !argv.fromGoogleDocId) {
-        throw new Error(
-          'Missing required argument: fromFile OR fromUrl OR fromDir OR fromGoogleDocId'
-        )
-      }
-
-      if (argv.fromFile) {
-        fs.accessSync(argv.fromFile, fs.constants.F_OK)
-      }
-
-      if (argv.fromDir) {
-        fs.accessSync(argv.fromDir, fs.constants.F_OK)
-      }
-
-      return true
-    })
-}
-
-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()
-
-  const report = {
-    start: new Date(),
-    end: null,
-    time: null,
-    endpoint: argv.endpoint,
-    mode: null,
-    type: [],
-    result: []
-  }
-
-  const ws = {
-    endpoint: argv.endpoint,
-    adminSecret: argv['admin-secret']
-  }
-
-  const interactive = !argv.nonInteractive
-
-  const csvType = 'stockAvailability'
-
-  let file
-  if (argv.fromDir) {
-    file = {
-      file: path.resolve(argv.fromDir, ALLOWED_CSV_FILES.stockAvailability),
-      csvType
-    }
-  } else if (argv.fromGoogleDocId) {
-    file = {
-      url: getGoogleSheetCsvUrl(argv.fromGoogleDocId, csvType),
-      csvType
-    }
-  } else if (argv.fromFile) {
-    file = {
-      file: argv.fromFile,
-      csvType
-    }
-  } else if (argv.fromUrl) {
-    file = {
-      url: argv.fromUrl,
-      csvType
-    }
-  }
-
-  let mode
-  if (interactive && !argv.mode) {
-    const answers = await prompts(
-      [
-        {
-          type: 'select',
-          name: 'mode',
-          message: 'Import Mode',
-          choices: [
-            {
-              title: 'Incremental',
-              value: 'incremental'
-            },
-            {
-              title: 'Full',
-              description: 'Before starting, all database records will be logically deleted',
-              value: 'full'
-            }
-          ],
-          hint: ' '
-        }
-      ],
-      { onCancel: () => process.exit() }
-    )
-
-    mode = answers.mode
-  } else {
-    mode = argv.mode
-  }
-
-  if (interactive) {
-    console.log('')
-    const { confirmed } = await prompts(
-      [
-        {
-          type: 'confirm',
-          name: 'confirmed',
-          message: 'Continue?',
-          initial: false
-        }
-      ],
-      { onCancel: () => process.exit() }
-    )
-
-    if (!confirmed) {
-      process.exit()
-    }
-
-    console.log('')
-  }
-
-  let filepath = argv.fromFile
-
-  if (argv.fromUrl || argv.fromGoogleDocId) {
-    spinner.start('Downloading file...')
-    filepath = await download(file.url, argv.out, `${csvType}.csv`)
-    spinner.succeed('Downloaded file')
-  }
-
-  const validation = await validateCsvFromFile(filepath, csvType, ws, argv.csvDelimiter)
-
-  if (validation.error) {
-    console.log(`ERROR => [${chalk.red(validation.inputFile)}] ${validation.error}`)
-    process.exit()
-  }
-
-  const csvReport = await importCsvFromFile(
-    filepath,
-    csvType,
-    argv.out,
-    spinner,
-    ws,
-    argv.csvDelimiter
-  )
-
-  //
-  // Report
-  //
-
-  report.end = new Date()
-  report.time = getExecutionTime(hrstart)
-  report.mode = mode
-  report.type = [csvType]
-
-  const reportRows = []
-
-  reportRows.push({
-    type: 'import.csv',
-    payload: csvReport
-  })
-
-  report.result = reportRows
-
-  await callAfterDataImportProcess(spinner, ws, report)
-
-  process.exit()
-}