@watsonserve/stock-base 0.0.17 → 0.0.19

package/dao.js

@@ -45,6 +45,14 @@ export function toDivPoints(market, nc, data) {
         new Point('Dividend').tag('nc', `${nc}.${market}`).tag('type', 'paid').tag('currency', curr).floatField('amount', amount).timestamp(paid)
     ];
 }
+export function toBonusPoint(fullNc, data) {
+    const { ratio, ex } = data;
+    return new Point('Bonus')
+        .tag('nc', fullNc)
+        .tag('type', 'ex')
+        .floatField('radio', ratio)
+        .timestamp(ex);
+}
 function groupBy(key, list, delKey = false) {
     return list.reduce((pre, item) => {
         const foo = item[key];
@@ -97,11 +105,13 @@ export class InfluxDAO {
         const ncQuery = ncs.map(nc => `r["nc"] == "${nc}"`).join(' or ');
         const fdQuery = fileds.map(fd => `r["_field"] == "${fd}"`).join(' or ');
         const filters = [mkQuery, ncQuery, fdQuery].filter(Boolean).map(str => `|> filter(fn: (r) => ${str})`).join('\n');
+        const start = new Date(lt.getTime() - 30 * A_DAY_MS).toJSON().substring(0, 10);
         const fluxQuery = `from(bucket: "${bucket}")
-  |> range(start: ${new Date(lt.getTime() - 30 * A_DAY_MS).toJSON().substring(0, 10)}, end: ${lt.toJSON()})
+  |> range(start: ${start}, stop: ${lt.toJSON()})
   ${filters}
   |> last()
   |> pivot(rowKey:["_time"], columnKey: ["_field"], valueColumn: "_value")`;
+        // console.debug(fluxQuery);
         return new Promise((resolve, reject) => {
             const list = [];
             queryClient.queryRows(fluxQuery, {

package/package.json

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

package/types/dao.d.ts

@@ -28,6 +28,7 @@ export declare function latestDay(): string;
 export declare function toFxPoint(sgd: number, hkd: number, cny: number, timestamp: number): Point;
 export declare function toStockPoint(market: EnMarket, st: IStock, timestamp: number): Point;
 export declare function toDivPoints(market: string, nc: string, data: IDividend): Point[];
+export declare function toBonusPoint(fullNc: string, data: IDividend): Point;
 export declare class InfluxDAO {
     private origin;
     private org;