From 65cc70cbdda1e99bcc5307ea5d75db191d30a820 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Wed, 11 Sep 2024 11:39:32 +0800
Subject: [PATCH] remove unresponsive sites from demo list

---
 Server/db/mongo/modules/checkModule.js | 15 ++++++++++-----
 Server/service/networkService.js       |  7 +++++--
 Server/utils/demoMonitors.json         | 21 +--------------------
 3 files changed, 16 insertions(+), 27 deletions(-)

diff --git a/Server/db/mongo/modules/checkModule.js b/Server/db/mongo/modules/checkModule.js
index 32968431d..da3ccb8f3 100644
--- a/Server/db/mongo/modules/checkModule.js
+++ b/Server/db/mongo/modules/checkModule.js
@@ -1,6 +1,7 @@
 const Check = require("../../../models/Check");
 const Monitor = require("../../../models/Monitor");
-const mongoose = require("mongoose");
+const logger = require("../../../utils/logger");
+const SERVICE_NAME = "checkModule";
 const dateRangeLookup = {
   day: new Date(new Date().setDate(new Date().getDate() - 1)),
   week: new Date(new Date().setDate(new Date().getDate() - 7)),
@@ -24,21 +25,25 @@ const createCheck = async (checkData) => {
   try {
     const { monitorId, status } = checkData;
 
-    const n = await Check.countDocuments({ monitorId }) + 1;
+    const n = (await Check.countDocuments({ monitorId })) + 1;
 
     const check = await new Check({ ...checkData }).save();
 
     const monitor = await Monitor.findById(monitorId);
 
     if (!monitor) {
-      throw new Error("Monitor not found");
+      logger.error("Monitor not found", {
+        service: SERVICE_NAME,
+        monitorId,
+      });
+      return;
     }
 
     if (monitor.uptimePercentage === undefined) {
-      monitor.uptimePercentage = (status === true) ? 1 : 0;
+      monitor.uptimePercentage = status === true ? 1 : 0;
     } else {
       monitor.uptimePercentage =
-        (monitor.uptimePercentage * (n - 1) + (status === true ? 1: 0)) / n;
+        (monitor.uptimePercentage * (n - 1) + (status === true ? 1 : 0)) / n;
     }
 
     await monitor.save();
diff --git a/Server/service/networkService.js b/Server/service/networkService.js
index e25a63ce5..0664ee05a 100644
--- a/Server/service/networkService.js
+++ b/Server/service/networkService.js
@@ -278,6 +278,7 @@ class NetworkService {
       default:
         logger.error(`Unsupported type: ${job.data.type}`, {
           service: this.SERVICE_NAME,
+          method: "getStatus",
           jobId: job.id,
         });
         return false;
@@ -296,11 +297,13 @@ class NetworkService {
   async logAndStoreCheck(data, writeToDB) {
     try {
       const insertedCheck = await writeToDB(data);
-      return insertedCheck.status;
+      if (insertedCheck !== null && insertedCheck !== undefined) {
+        return insertedCheck.status;
+      }
     } catch (error) {
-      console.log(error);
       logger.error(`Error wrtiting check for ${data.monitorId}`, {
         service: this.SERVICE_NAME,
+        method: "logAndStoreCheck",
         monitorId: data.monitorId,
         error: error,
       });
diff --git a/Server/utils/demoMonitors.json b/Server/utils/demoMonitors.json
index 413ffc76a..6f57940f2 100644
--- a/Server/utils/demoMonitors.json
+++ b/Server/utils/demoMonitors.json
@@ -239,10 +239,6 @@
     "name": "Do It Yourself",
     "url": "https://doityourself.com"
   },
-  {
-    "name": "Donkey Car",
-    "url": "https://donkeycar.com"
-  },
   {
     "name": "draw.io",
     "url": "https://drawio.com"
@@ -323,10 +319,6 @@
     "name": "Fix It Club",
     "url": "https://fixitclub.com"
   },
-  {
-    "name": "FlexJobs",
-    "url": "https://flexjobs.com"
-  },
   {
     "name": "Flightradar24",
     "url": "https://flightradar24.com"
@@ -335,10 +327,6 @@
     "name": "FlowCV ",
     "url": "https://flowcv.com"
   },
-  {
-    "name": "Foco Clipping",
-    "url": "https://fococlipping.com"
-  },
   {
     "name": "Font Squirrel",
     "url": "https://fontsquirrel.com"
@@ -639,10 +627,6 @@
     "name": "MediaFire",
     "url": "https://mediafire.com"
   },
-  {
-    "name": "Mind Mup",
-    "url": "https://mindmup.com"
-  },
   {
     "name": "Mixlr",
     "url": "https://mixlr.com"
@@ -1003,10 +987,7 @@
     "name": "Starkey Comics",
     "url": "https://starkeycomics.com"
   },
-  {
-    "name": "Startups List",
-    "url": "https://startups-list.com"
-  },
+
   {
     "name": "Statista",
     "url": "https://statista.com"