Merge pull request #141 from NodeFactoryIo/fix/syntax-fixes

Fix/syntax fixes

Author: nmlinaric

src/Scheduler/Tasks/UptimeNotificationTask.ts

@@ -29,17 +29,17 @@ export class UptimeNotificationTask implements Task {
             // select, from table of latest uptime records for each node,
             // entries that are older than 1 hour or are entries in last hour that reported node is down
             return await database.runQuery<NodeUptime>(
-                "select NU.*\n" +
-                "from (\n" +
-                "         select \"nodeId\", max(\"createdAt\") as lastUptimeReported\n" +
-                "         from \"NodeUptime\"\n" +
-                "         group by \"nodeId\"\n" +
-                ") as latest_uptimes\n" +
-                "left outer join \"NodeUptime\" NU\n" +
-                "    on NU.\"nodeId\" = latest_uptimes.\"nodeId\" and\n" +
-                "       NU.\"createdAt\" = lastUptimeReported\n" +
-                "where lastUptimeReported < now() - interval '1 HOUR' or\n" +
-                "      (lastUptimeReported > now() - interval '1 HOUR' and NU.\"isWorking\" = false)",
+                `select NU.*
+                from (
+                    select "nodeId", max("createdAt") as "lastUptimeReported"
+                    from "NodeUptime"
+                    group by "nodeId"
+                    ) as "latest_uptimes"
+                left outer join "NodeUptime" NU on
+                    NU."nodeId" = latest_uptimes."nodeId" and
+                    NU."createdAt" = "lastUptimeReported"
+                where "lastUptimeReported" < now() - interval '1 hour' or
+                      ("lastUptimeReported" > now() - interval '1 hour' and NU."isWorking" = false);`,
                 {type: QueryTypes.SELECT})
         } catch (e) {
             logger.error("Failed to find not working nodes in database", e)

src/Services/NodeDiskInformationService.ts

@@ -1,5 +1,5 @@
 import database from "../Services/Database";
-import {QueryTypes} from "sequelize";
+import {filtersSelectQuery} from "../Utils/filterSelectQueryConfig";
 import {NodeDiskInformation} from "../Models/NodeDiskInformation";
 
 export class NodeDiskInformationService {
@@ -24,17 +24,10 @@ export class NodeDiskInformationService {
                 )
             and "updatedAt" >= now() - interval :filter
             order by "updatedAt" desc;`,
-            {
-                replacements: {
-                    filter: `1 ${filter}`,
-                    nodeId: nodeId,
-                    period: filter == "day" ? "hour" : "day"
-                },
-                type: QueryTypes.SELECT
-            });
+            filtersSelectQuery(nodeId, filter));
     }
 
-    public async fetchLatestDiskInfo(nodeId: number): Promise<NodeDiskInformation|null> {
+    public async fetchLatestDiskInfo(nodeId: number): Promise<NodeDiskInformation | null> {
         return await NodeDiskInformation.findOne({
             raw: true,
             where: {

src/Services/NodeUptimeNotificationService.ts

@@ -78,7 +78,7 @@ export class NodeUptimeNotificationService {
         if (oldNodeStatus.isReported != newNodeStatus.isReported
             || oldNodeStatus.isUp != newNodeStatus.isUp) {
             logger.info(`Found node ID ${nodeUptime.nodeId} that has old status` +
-                `[isReported: ${oldNodeStatus.isReported}, isUp: ${oldNodeStatus}].`);
+                `[isReported: ${oldNodeStatus.isReported}, isUp: ${oldNodeStatus.isNewRecord}].`);
 
             await this.nodeStatusService.updateNodeStatus(
                 nodeUptime.nodeId,