From e2d9f088bdd3286d0c38524e96f66a39432b2a4d Mon Sep 17 00:00:00 2001
From: Luis Fernando Molina <Luis-Fernando-Molina@users.noreply.github.com>
Date: Thu, 19 Mar 2020 22:16:46 +0100
Subject: [PATCH] percentage implemented

---
 Dockerfile           |  9 ---------
 MultiPeriodDaily.js  |  4 +++-
 MultiPeriodMarket.js | 10 +++++++++-
 docker-compose.yml   | 12 ------------
 server.js            | 16 +++++++++++++++-
 5 files changed, 27 insertions(+), 24 deletions(-)
 delete mode 100644 Dockerfile
 delete mode 100644 docker-compose.yml

diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index 356128e9b..000000000
--- a/Dockerfile
+++ /dev/null
@@ -1,9 +0,0 @@
-FROM node:8.16-alpine
-
-RUN mkdir -p /usr/src/app
-WORKDIR /usr/src/app
-
-COPY package.json ./
-RUN npm install
-
-COPY . .
diff --git a/MultiPeriodDaily.js b/MultiPeriodDaily.js
index 8666ed61c..7502a677b 100644
--- a/MultiPeriodDaily.js
+++ b/MultiPeriodDaily.js
@@ -811,7 +811,9 @@
 
                     bot.hasTheBotJustStarted = false;
 
-                    logger.newInternalLoop(bot.codeName, bot.process, bot.multiPeriodDailyProcessDatetime);             
+                    if (global.areEqualDates(bot.multiPeriodDailyProcessDatetime, new Date()) === false) {
+                        logger.newInternalLoop(bot.codeName, bot.process, bot.multiPeriodDailyProcessDatetime);
+                    }
                 }
                 catch (err) {
                     logger.write(MODULE_NAME, "[ERROR] start -> writeStatusReport -> err = "+ err.stack);
diff --git a/MultiPeriodMarket.js b/MultiPeriodMarket.js
index 66cf11951..4df897da6 100644
--- a/MultiPeriodMarket.js
+++ b/MultiPeriodMarket.js
@@ -338,7 +338,15 @@
                     thisReport.file.lastExecution = bot.processDatetime;
                     thisReport.save(callBack);
 
-                    logger.newInternalLoop(bot.codeName, bot.process, bot.processDatetime);
+                    if (global.areEqualDates(bot.processDatetime, new Date()) === false) {
+                        logger.newInternalLoop(bot.codeName, bot.process, bot.processDatetime);
+                    } 
+                    
+                    /*  Telling the world we are alive and doing well */
+                    let currentDateString = bot.processDatetime.getUTCFullYear() + '-' + utilities.pad(bot.processDatetime.getUTCMonth() + 1, 2) + '-' + utilities.pad(bot.processDatetime.getUTCDate(), 2);
+                    let currentDate = new Date(bot.processDatetime)
+                    let lastDate = new Date()
+                    bot.processHeartBeat(currentDateString, global.getPercentage(currentDate, currentDate, lastDate)) 
                 }
                 catch (err) {
                     logger.write(MODULE_NAME, "[ERROR] start -> writeStatusReport -> err = "+ err.stack);
diff --git a/docker-compose.yml b/docker-compose.yml
deleted file mode 100644
index 0a18fee7b..000000000
--- a/docker-compose.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-version: '3'
-services:
-  node:
-    image: superalgos/clone-executor:1.0.51
-    build:
-      context: .
-      dockerfile: ./Dockerfile
-    container_name: clone-executor
-    tty: true
-    stdin_open: true
-    command: node Run.js
-    restart: always
diff --git a/server.js b/server.js
index 6f9c02d52..b89fdff3d 100644
--- a/server.js
+++ b/server.js
@@ -267,6 +267,20 @@ global.getPercentage = function (fromDate, currentDate, lastDate) {
     let currentDays = Math.trunc(currentDate.valueOf() / ONE_DAY_IN_MILISECONDS)
     let lastDays = Math.trunc(lastDate.valueOf() / ONE_DAY_IN_MILISECONDS)
     let percentage = (currentDays - fromDays) * 100 / (lastDays - fromDays)
-    return percentage.toFixed(2) + " %"
+    if ((lastDays - fromDays) === 0) {
+        percentage = 100
+    }
+    return percentage.toFixed(0) + "%"
+}
+
+global.areEqualDates = function (date1, date2) {
+    let day1Days = Math.trunc(date1.valueOf() / ONE_DAY_IN_MILISECONDS)
+    let day2Days = Math.trunc(date2.valueOf() / ONE_DAY_IN_MILISECONDS)
+ 
+    if (day1Days === day2Days) {
+        return true
+    } else {
+        return false
+    }
 }