@watsonserve/stock-base 0.0.6 → 0.0.7

package/dao.js

@@ -123,22 +123,20 @@ export class InfluxDAO {
         const ncQuery = ncs.map(nc => `r["nc"] == "${nc}"`).join(' or ');
         const fluxQuery = `from(bucket: "${bucket}")
     |> range(start: -1y, stop: 1y)
-    |> filter(fn: (r) => r["_measurement"] == "Dividend")
-    |> filter(fn: (r) => r["_field"] == "amount")
+    |> filter(fn: (r) => r["_measurement"] == "Dividend" and r["_field"] == "amount" and r["type"] == "ex")
     |> filter(fn: (r) => ${ncQuery})
-    |> filter(fn: (r) => r["type"] == "ex")
     `;
         return new Promise((resolve, reject) => {
             const list = [];
             queryClient.queryRows(fluxQuery, {
                 next: (row, tableMeta) => {
                     const item = tableMeta.toObject(row);
-                    const { result, table, _start, _stop, _measurement, _time, nc, ...content } = item;
-                    list.push({ time: new Date(_time), market: _measurement, nc, ...content });
+                    const { _time, currency, _field, _value } = item;
+                    list.push({ time: new Date(_time), currency, [_field]: _value });
                 },
                 error: reject,
                 complete: () => {
-                    resolve(Object.entries(groupBy('nc', list)));
+                    resolve(groupBy('nc', list));
                 },
             });
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@watsonserve/stock-base",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "description": "",
   "type": "module",
   "keywords": [],

package/types/dao.d.ts

@@ -20,5 +20,5 @@ export declare class InfluxDAO {
     private __query;
     readFxLatest(): Promise<any[]>;
     readStockLatest(ncs: string[]): Promise<any[]>;
-    readDividend(ncs: string[]): Promise<any[]>;
+    readDividend(ncs: string[]): Promise<Record<string, any[]>>;
 }