From 3241a646cc954458b790b834bade8d14e5de84b5 Mon Sep 17 00:00:00 2001
From: Luis Fernando Molina <Luis-Fernando-Molina@users.noreply.github.com>
Date: Wed, 24 Jun 2020 22:32:22 +0200
Subject: [PATCH] Announcements working

---
 LowFrequencyTrading/TradingProcess.js |  6 +++---
 Session.js                            |  8 ++++----
 TelegramBot.js                        | 10 +++++-----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/LowFrequencyTrading/TradingProcess.js b/LowFrequencyTrading/TradingProcess.js
index 177e78bc5..63535929b 100644
--- a/LowFrequencyTrading/TradingProcess.js
+++ b/LowFrequencyTrading/TradingProcess.js
@@ -373,7 +373,7 @@
                         const logText = "User Defined End Datetime reached @ " + previousDay.getUTCFullYear() + "/" + (previousDay.getUTCMonth() + 1) + "/" + previousDay.getUTCDate() + ".";
                         if (FULL_LOG === true) { logger.write(MODULE_NAME, "[INFO] start -> processDailyFiles -> advanceTime -> " + logText); }
 
-                        bot.STOP_SESSION = true
+                        bot.SESSION.stop(logText)
                         callBackFunction(global.DEFAULT_OK_RESPONSE);
                         return;
                     }
@@ -633,12 +633,12 @@
                                 const logText = "User Defined End Datetime reached @ " + now.getUTCFullYear() + "/" + (now.getUTCMonth() + 1) + "/" + now.getUTCDate() + ".";
                                 if (FULL_LOG === true) { logger.write(MODULE_NAME, "[INFO] start -> processDailyFiles -> buildCharts -> onOutputGenerated -> onMarketStatusReport -> " + logText); }
 
-                                bot.STOP_SESSION = true
+                                bot.SESSION.stop('because it just finished.')
                                 callBackFunction(global.DEFAULT_OK_RESPONSE);
                                 return;
                             }
                             if (bot.SESSION.type === 'Backtesting Session') {
-                                bot.STOP_SESSION = true
+                                bot.SESSION.stop('Backtesting Session over Market Files Finished.')
                             }
                             callBackFunction(global.DEFAULT_OK_RESPONSE);
                         }
diff --git a/Session.js b/Session.js
index 64fe9f403..0564ae8dc 100644
--- a/Session.js
+++ b/Session.js
@@ -100,7 +100,7 @@
                         bot.STOP_SESSION = true
                     }
 
-                    socialBotsModule.sendMessage(bot.SESSION.type + " '" + bot.SESSION.name + "' was started.")
+                    socialBotsModule.sendMessage(bot.SESSION.type + " '" + bot.SESSION.name + "' is starting.")
                 } catch (err) {
                     parentLogger.write(MODULE_NAME, "[ERROR] initialize -> runSession -> err = " + err.stack);
                 }
@@ -108,10 +108,10 @@
 
             function stopSession(commandOrigin) {
                 try {
-                    if (reason === undefined) { commandOrigin = ' from the User Interface.' }
-                    socialBotsModule.sendMessage(bot.SESSION.type + " '" + bot.SESSION.name + "' was stopped " + commandOrigin)
-                    bot.STOP_SESSION = true
+                    if (commandOrigin === undefined) { commandOrigin = ' from the User Interface.' }
+                    socialBotsModule.sendMessage(bot.SESSION.type + " '" + bot.SESSION.name + "' is stopping " + commandOrigin)
                     socialBotsModule.finalize()
+                    bot.STOP_SESSION = true
                 } catch (err) {
                     parentLogger.write(MODULE_NAME, "[ERROR] initialize -> stopSession -> err = " + err.stack);
                 }
diff --git a/TelegramBot.js b/TelegramBot.js
index 262511f1f..9e2383ed1 100644
--- a/TelegramBot.js
+++ b/TelegramBot.js
@@ -30,8 +30,8 @@ exports.newTelegramBot = function newTelegramBot(bot, logger) {
 
             thisObject.telegramAPI = new Telegram(botToken)
 
-            const messge = bot.SESSION.type + " '" + bot.SESSION.name + "' was started."
-            thisObject.telegramAPI.sendMessage(thisObject.chatId, messge).catch(err => parentLogger.write(MODULE_NAME, "[WARN] initializeTelegramBot -> Telegram API error -> err = " + err))
+            const message = "Telegram bot is starting."
+            thisObject.telegramAPI.sendMessage(thisObject.chatId, message).catch(err => parentLogger.write(MODULE_NAME, "[WARN] initializeTelegramBot -> Telegram API error -> err = " + err))
 
         } catch (err) {
             parentLogger.write(MODULE_NAME, "[WARN] initialize -> err = " + err.stack);
@@ -40,12 +40,12 @@ exports.newTelegramBot = function newTelegramBot(bot, logger) {
     }
 
     function finalize() {
-        const messge = "I have been ordered to shut down. Goodbye!"
-        telegramAPI.sendMessage(thisObject.chatId, messge).catch(err => parentLogger.write(MODULE_NAME, "[WARN] finalize -> Telegram API error -> err = " + err))
+        const message = "Telegram bot is signing off."
+        thisObject.telegramAPI.sendMessage(thisObject.chatId, message).catch(err => parentLogger.write(MODULE_NAME, "[WARN] finalize -> Telegram API error -> err = " + err))
     }
 
     function sendMessage(message) {
-        thisObject.telegramAPI.sendMessage(thisObject.chatId, messge).catch(err => parentLogger.write(MODULE_NAME, "[WARN] announce -> Telegram API error -> err = " + err))
+        thisObject.telegramAPI.sendMessage(thisObject.chatId, message).catch(err => parentLogger.write(MODULE_NAME, "[WARN] announce -> Telegram API error -> err = " + err))
     }
 
 }
\ No newline at end of file