improve scheduler

danbilokha · Apr 21, 2020 · 84d90cc · 84d90cc
1 parent 5e00dab
commit 84d90cc
Show file tree

Hide file tree

Showing 4 changed files with 76 additions and 15 deletions.
diff --git a/server/src/bots/telegram/services/storage.ts b/server/src/bots/telegram/services/storage.ts
@@ -11,6 +11,7 @@ import {
     getAllUsers,
     getUser,
     addUser,
+    getNotificationMessage,
 } from '../../../services/domain/storage';
 import * as firebase from 'firebase';
 
@@ -32,6 +33,9 @@ export const getTelegramActiveUserSubscriptions: Function = getActiveUserSubscri
 export const getTelegramUser = getUser(TELEGRAM_PREFIX);
 export const getTelegramAllUsers = getAllUsers(TELEGRAM_PREFIX);
 export const addTelegramUser = addUser(TELEGRAM_PREFIX);
+export const getTelegramNotificationMessage = getNotificationMessage(
+    TELEGRAM_PREFIX
+);
 export const setTelegramSubscription: Function = setSubscription(
     TELEGRAM_PREFIX
 );

diff --git a/server/src/environments/environment.ts b/server/src/environments/environment.ts
@@ -49,6 +49,12 @@ let envConfig = {
     IsNgRokMode() {
         return this.IsDevelopment();
     },
+    features: {
+        ScheduledNotification: {
+            enabled: process.env.EnableScheduledNotification || false,
+            cronExpr: process.env.ScheduledNotificationCronExpr,
+        },
+    },
 };
 
 if (!envConfig.IsProduction()) {

diff --git a/server/src/services/domain/storage.ts b/server/src/services/domain/storage.ts
@@ -157,3 +157,13 @@ export const addUser = (messengerPrefix: string) => async (
         .ref(`${messengerPrefix}/users/${user.chatId}`)
         .set(user);
 };
+
+export const getNotificationMessage = (
+    messengerPrefix: string
+) => async (): Promise<string> => {
+    const snapshot = await firebase
+        .database()
+        .ref(`${messengerPrefix}/notificationMessage`)
+        .once('value');
+    return snapshot.val() ?? {};
+};
diff --git a/server/src/services/infrastructure/scheduler.ts b/server/src/services/infrastructure/scheduler.ts
@@ -2,9 +2,14 @@ import * as schedule from 'node-schedule';
 import { tryToUpdateCovid19Cache } from '../domain/covid19';
 import { logger } from '../../utils/logger';
 import { LogCategory } from '../../models/constants';
-import { getTelegramAllUsers } from '../../bots/telegram/services/storage';
+import {
+    getTelegramAllUsers,
+    getTelegramNotificationMessage,
+} from '../../bots/telegram/services/storage';
 import { catchAsyncError } from '../../utils/catchError';
 import TelegramBot = require('node-telegram-bot-api');
+import environments from '../../environments/environment';
+import { User } from '../../models/user.model';
 
 export const checkCovid19Updates = () => {
     // Check covid19 info every hour (at hh:30 mins, e.g. 1:30, 2:30 ...)
@@ -18,21 +23,57 @@ export const checkCovid19Updates = () => {
     });
 };
 
-export const sendReleaseNotificationToUsers = async (bot: TelegramBot) => {
-    // At 08:00 PM, only on Monday
-    schedule.scheduleJob('0 0 20 * * 1', async () => {
-        const [err, users] = await catchAsyncError(getTelegramAllUsers());
-        if (err) {
-            logger.error(
-                'sendReleaseNotificationToUsers failed when accessing users Db',
-                err,
-                LogCategory.Scheduler
+export const sendReleaseNotificationToUsers = async (
+    bot: TelegramBot
+): Promise<void> => {
+    // At 08:00 PM, every day
+    schedule.scheduleJob(
+        environments.features.ScheduledNotification.cronExpr || '0 0 20 * * *',
+        async () => {
+            if (!environments.features.ScheduledNotification.enabled) {
+                logger.log(
+                    'info',
+                    'SchedulerNotification was launched, but currently disabled',
+                    LogCategory.Scheduler
+                );
+                return;
+            }
+            const [err, users] = await catchAsyncError(getTelegramAllUsers());
+            if (err) {
+                logger.error(
+                    'sendReleaseNotificationToUsers failed when accessing users Db',
+                    err,
+                    LogCategory.Scheduler
+                );
+                return;
+            }
+            const [err1, message] = await catchAsyncError(
+                getTelegramNotificationMessage()
             );
-            return;
-        }
+            if (err) {
+                logger.error(
+                    'sendReleaseNotificationToUsers failed when accessing getTelegramNotificationMessage()',
+                    err,
+                    LogCategory.Scheduler
+                );
+                return;
+            }
+            if (!message) {
+                logger.error(
+                    'getTelegramNotificationMessage() returns empty message',
+                    err,
+                    LogCategory.Scheduler
+                );
+            }
 
-        for (const usr of users) {
-            bot.sendMessage(usr.chatId, 'Hello DUDE, What\'s UP? ');
+            for (const usr of users) {
+                message.replace('#UserName#', getUserName(usr));
+                bot.sendMessage(usr.chatId, message);
+            }
         }
-    });
+    );
 };
+
+function getUserName(user: User): string {
+    return user.firstName ?? user.lastName ?? user.userName ?? 'friend';
+}