@watsonserve/stock-base 0.0.10 → 0.0.12

package/dao.js

@@ -41,11 +41,13 @@ export function toDivPoints(market, nc, data) {
         new Point('Dividend').tag('nc', `${nc}.${market}`).tag('type', 'paid').tag('currency', curr).floatField('amount', amount).timestamp(paid)
     ];
 }
-function groupBy(key, list) {
+function groupBy(key, list, delKey = false) {
     return list.reduce((pre, item) => {
         const foo = item[key];
         const fooList = pre[foo] || [];
         pre[foo] = fooList;
+        if (delKey)
+            delete item[key];
         fooList.push(item);
         return pre;
     }, {});
@@ -112,13 +114,8 @@ export class InfluxDAO {
         const list = await this.__query([EnCurrency.SGD, EnCurrency.HKD, EnCurrency.CNY], getStartTime(), [EnMarket.FX], []);
         return list[0];
     }
-    async readStockLatest(ncs) {
-        const list = await this.__query(['c', 'v'], getStartTime(), [EnMarket.SGX, EnMarket.USA, EnMarket.HKEX], ncs);
-        return list.reduce((pre, item) => {
-            const { nc, ...data } = item;
-            pre[item.nc] = data;
-            return pre;
-        }, {});
+    readStockLatest(ncs) {
+        return this.__query(['c', 'v'], getStartTime(), [EnMarket.SGX, EnMarket.USA, EnMarket.HKEX], ncs);
     }
     async readDividend(ncs) {
         const { origin: url, token, org, bucket } = this;
@@ -140,7 +137,7 @@ export class InfluxDAO {
                 },
                 error: reject,
                 complete: () => {
-                    resolve(groupBy('nc', list));
+                    resolve(groupBy('nc', list, true));
                 },
             });
         });

package/package.json

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

package/types/dao.d.ts

@@ -14,6 +14,7 @@ interface IFxData {
 }
 interface IStData {
     time: string;
+    nc: string;
     c: number;
     v: number;
 }
@@ -30,7 +31,7 @@ export declare class InfluxDAO {
     writeToInfluxDB(points: Point[]): Promise<void>;
     private __query;
     readFxLatest(): Promise<IFxData>;
-    readStockLatest(ncs: string[]): Promise<Record<string, IStData>>;
+    readStockLatest(ncs: string[]): Promise<IStData[]>;
     readDividend(ncs: string[]): Promise<Record<string, any[]>>;
 }
 export {};