lenses path

Author: max-ostapenko

infra/bigquery-export/reports.js

@@ -6,6 +6,7 @@ export class ReportsExporter {
   constructor () {
     this.bigquery = new BigQueryExport()
     this.storage = new StorageExport()
+    this.storagePath = 'reports/dev/' // TODO change to prod
   }
 
   // Export timeseries reports
@@ -18,7 +19,7 @@ SELECT
 FROM reports.${metric}_timeseries
 `
     const rows = await this.bigquery.queryResults(query)
-    await this.storage.exportToJson(rows, metric)
+    await this.storage.exportToJson(rows, `${this.storagePath}${metric}.json`)
   }
 
   // Export monthly histogram report
@@ -41,6 +42,10 @@ WHERE date = '${date}'
       return
     }
 
+    if (exportData.lense && exportData.lense !== 'all') {
+      this.storagePath = this.storagePath + `${exportData.lense}/`
+    }
+
     if (exportData.type === 'histogram') {
       await this.exportHistogram(exportData)
     } else if (exportData.type === 'timeseries') {

infra/bigquery-export/storage.js

@@ -7,16 +7,13 @@ const storage = new Storage()
 export class StorageExport {
   constructor (bucket = 'httparchive') {
     this.bucket = bucket
-    this.storagePath = 'reports/dev/' // TODO change to prod
     this.stream = new Readable({
       objectMode: true,
       read () {}
     })
   }
 
   async exportToJson (data, fileName) {
-    fileName = this.storagePath + fileName + '.json'
-
     const bucket = storage.bucket(this.bucket)
     const file = bucket.file(fileName)