Merge pull request #108 from NodeFactoryIo/fix/mining-rewards-filter

Fix/mining rewards filter

Author: morrigan

src/Migrations/20200203143917-create-minig-rewards-table.js

@@ -13,7 +13,7 @@ module.exports = {
                 type: sequelize.STRING
             },
             rewardAmount: {
-                type: sequelize.STRING
+                type: sequelize.NUMERIC(32)
             },
             nodeId: {
                 type: sequelize.INTEGER,

src/Models/MiningReward.ts

@@ -14,7 +14,7 @@ export class MiningReward extends Model {
                 allowNull: false,
             },
             rewardAmount: {
-                type: DataTypes.STRING,
+                type: DataTypes.DECIMAL(32),
                 allowNull: false,
             },
         } as ModelAttributes,

src/Services/MiningRewardsService.ts

@@ -1,7 +1,6 @@
 import logger from "./Logger";
-import * as moment from "moment";
-import {unitOfTime} from "moment";
-import {Op} from "sequelize";
+import datebase from "./Database";
+import {filtersSelectQuery} from "../Utils/filterSelectQueryConfig";
 
 import {Node} from "../Models/Node";
 import {MiningReward} from "../Models/MiningReward";
@@ -27,16 +26,13 @@ export class MiningRewardsService {
     }
 
     public async fetchMiningRewards(nodeId: number, filter: string) {
-        return await MiningReward.findAll({
-            raw: true,
-            where: {
-                nodeId,
-                updatedAt: {
-                    [Op.gte]:
-                        moment.utc().subtract(1, filter as unitOfTime.Base).format("YYYY-MM-DD HH:MM:ssZZ")
-                }
-            },
-            order: [['updatedAt', 'DESC']]
-        });
+        return await datebase.runQuery<MiningReward>(
+            `select date_trunc(:period, "updatedAt") "timePeriod", sum("rewardAmount") "rewardSum"
+            from "MiningRewards"
+            where "nodeId" = :nodeId
+            and "updatedAt" >= now() - interval :filter
+            group by date_trunc(:period, "updatedAt")
+            order by "timePeriod" desc;`,
+            filtersSelectQuery(nodeId, filter));
     }
 }

src/Utils/filterSelectQueryConfig.ts

@@ -0,0 +1,12 @@
+import {QueryTypes, QueryOptionsWithType} from "sequelize";
+
+export function filtersSelectQuery(nodeId: number, filter: string): QueryOptionsWithType<QueryTypes.SELECT> {
+    return {
+        replacements: {
+            filter: `1 ${filter}`,
+            nodeId: nodeId,
+            period: filter == "day" ? "hour" : "day"
+        },
+        type: QueryTypes.SELECT
+    }
+}

test/unit/Services/MiningRewardsService.test.ts

@@ -2,6 +2,7 @@ import {expect} from "chai";
 import {createSandbox, SinonSandbox} from "sinon";
 import logger from "../../../src/Services/Logger";
 import sinon from "sinon";
+import database from "../../../src/Services/Database";
 import {MiningRewardsService} from "../../../src/Services/MiningRewardsService";
 import {MiningReward} from "../../../src/Models/MiningReward";
 
@@ -14,7 +15,7 @@ describe("MiningRewards", function () {
     beforeEach(function () {
         sandbox = createSandbox();
         miningRewardsService = new MiningRewardsService();
-        miningRewardsFindStub = sinon.stub(MiningReward, "findAll");
+        miningRewardsFindStub = sinon.stub(database, "runQuery");
     });
 
     afterEach(function () {