bitfinexcom · ezewer · Sep 29, 2023 · Sep 28, 2023 · Sep 28, 2023 · Sep 28, 2023
diff --git a/workers/loc.api/generate-csv/csv-writer/helpers/index.js b/workers/loc.api/generate-csv/csv-writer/helpers/index.js
@@ -0,0 +1,42 @@
+'use strict'
+
+const { pipeline } = require('stream/promises')
+const { stringify } = require('csv')
+
+const streamWriterToOne = async (
+  rStream,
+  wStream,
+  writeFn,
+  opts
+) => {
+  const { end = true } = opts ?? {}
+  const promise = pipeline(rStream, wStream, { end })
+
+  writeFn(rStream)
+  rStream.end()
+
+  await promise
+}
+
+const streamWriter = async (wStream, csvStreamDataMap) => {
+  for (const [i, csvStreamData] of csvStreamDataMap.entries()) {
+    const isLast = (i + 1) === csvStreamDataMap.length
+    const {
+      columnParams,
+      writeFn
+    } = csvStreamData
+
+    const stringifier = stringify(columnParams)
+    await streamWriterToOne(
+      stringifier,
+      wStream,
+      writeFn,
+      { end: isLast }
+    )
+  }
+}
+
+module.exports = {
+  streamWriterToOne,
+  streamWriter
+}
diff --git a/workers/loc.api/generate-csv/csv-writer/weighted-averages-report-csv-writer.js b/workers/loc.api/generate-csv/csv-writer/weighted-averages-report-csv-writer.js
@@ -1,13 +1,10 @@
 'use strict'
 
-const { pipeline } = require('stream')
-const { stringify } = require('csv')
-
 const {
   write
 } = require('../../queue/write-data-to-stream/helpers')
 
-const nope = () => {}
+const { streamWriter } = require('./helpers')
 
 module.exports = (
   rService,
@@ -28,50 +25,53 @@ module.exports = (
   queue.emit('progress', 0)
 
   if (typeof jobData === 'string') {
-    const stringifier = stringify(
-      { columns: ['mess'] }
+    await streamWriter(
+      wStream,
+      [{
+        columnParams: { columns: ['mess'] },
+        writeFn: (stream) => write([{ mess: jobData }], stream)
+      }]
     )
 
-    pipeline(stringifier, wStream, nope)
-    write([{ mess: jobData }], stringifier)
     queue.emit('progress', 100)
-    stringifier.end()
 
     return
   }
 
-  wStream.setMaxListeners(50)
-
-  const headerStringifier = stringify(
-    { columns: ['empty', 'buy', 'empty', 'empty', 'sell', 'empty', 'empty', 'cumulative', 'empty'] }
-  )
-  const resStringifier = stringify({
-    header: true,
-    columns: columnsCsv
-  })
-
-  pipeline(headerStringifier, wStream, nope)
-  pipeline(resStringifier, wStream, nope)
-
   const { res } = await getDataFromApi({
     getData: rService[name].bind(rService),
     args,
     callerName: 'CSV_WRITER'
   })
 
-  write(
-    [{ empty: '', buy: 'Buy', sell: 'Sell', cumulative: 'Cumulative' }],
-    headerStringifier
-  )
-  write(
-    res,
-    resStringifier,
-    formatSettings,
-    params
+  wStream.setMaxListeners(50)
+
+  await streamWriter(
+    wStream,
+    [
+      {
+        columnParams: {
+          columns: ['empty', 'buy', 'empty', 'empty', 'sell', 'empty', 'empty', 'cumulative', 'empty']
+        },
+        writeFn: (stream) => write(
+          [{ empty: '', buy: 'Buy', sell: 'Sell', cumulative: 'Cumulative' }],
+          stream
+        )
+      },
+      {
+        columnParams: {
+          header: true,
+          columns: columnsCsv
+        },
+        writeFn: (stream) => write(
+          res,
+          stream,
+          formatSettings,
+          params
+        )
+      }
+    ]
   )
 
   queue.emit('progress', 100)
-
-  headerStringifier.end()
-  resStringifier.end()
 }
diff --git a/workers/loc.api/generate-csv/csv.job.data.js b/workers/loc.api/generate-csv/csv.job.data.js
@@ -1038,7 +1038,7 @@ class CsvJobData {
     uId,
     uInfo
   ) {
-    checkParams(args, 'paramsSchemaForWeightedAveragesReportApiCsv')
+    checkParams(args, 'paramsSchemaForWeightedAveragesReportApiCsv', ['symbol'])
 
     const {
       userId,
-Original file line number
+Diff line change
@@ Expand Up / @@ -1038,7 +1038,7 @@ class CsvJobData { @@
         uId,
         uInfo
       ) {
-        checkParams(args, 'paramsSchemaForWeightedAveragesReportApiCsv')
+        checkParams(args, 'paramsSchemaForWeightedAveragesReportApiCsv', ['symbol'])
         const {
           userId,
@@ Expand Down @@