TW-1884: Notification system issues (#199)

Author: lendihop

src/index.ts

@@ -36,7 +36,7 @@ import { btcExchangeRateProvider, tezExchangeRateProvider } from './utils/coinge
 import { CodedError } from './utils/errors';
 import { exolixNetworksMap } from './utils/exolix-networks-map';
 import { coinGeckoTokens } from './utils/gecko-tokens';
-import { getExternalApiErrorPayload, isDefined, isNonEmptyString } from './utils/helpers';
+import { getExternalApiErrorPayload, isDefined, isNonEmptyString, isTruthy } from './utils/helpers';
 import logger from './utils/logger';
 import { getSignedMoonPayUrl } from './utils/moonpay/get-signed-moonpay-url';
 import SingleQueryDataProvider from './utils/SingleQueryDataProvider';
@@ -161,7 +161,7 @@ app.post('/api/notifications', basicAuth, async (req, res) => {
         : getImageFallback(PlatformType.Extension, type),
       mobileImageUrl: isNonEmptyString(mobileImageUrl) ? mobileImageUrl : getImageFallback(PlatformType.Mobile, type),
       expirationDate,
-      isMandatory: isDefined(isMandatory)
+      isMandatory: isTruthy(isMandatory)
     };
 
     await redisClient.lpush('notifications', JSON.stringify(newNotification));

src/notifications/utils/get-notifications.util.ts

@@ -1,6 +1,6 @@
 import { Redis } from 'ioredis';
 
-import { isNonEmptyString } from '../../utils/helpers';
+import { isNonEmptyString, isTruthy } from '../../utils/helpers';
 import { Notification, PlatformType } from '../notification.interface';
 
 export const getNotifications = async (client: Redis, platform: PlatformType, startFromTime: number) => {
@@ -21,10 +21,11 @@ export const getNotifications = async (client: Redis, platform: PlatformType, st
       continue;
     }
 
-    if (
-      platforms.includes(platform) &&
-      (isMandatory === true || (createdAtTimestamp > startFromTime && createdAtTimestamp < now))
-    ) {
+    const platformMatch = platforms.includes(platform);
+    const mandatoryTimeMatch = isTruthy(isMandatory) && createdAtTimestamp < now;
+    const timeScopeMatch = createdAtTimestamp > startFromTime && createdAtTimestamp < now;
+
+    if (platformMatch && (mandatoryTimeMatch || timeScopeMatch)) {
       result.push(notifications[i]);
     }
   }

src/notifications/utils/get-platforms.util.ts

@@ -1,12 +1,12 @@
-import { isDefined } from '../../utils/helpers';
+import { isTruthy } from '../../utils/helpers';
 import { PlatformType } from '../notification.interface';
 
 export const getPlatforms = (mobile?: string, extension?: string) => {
   let platforms: PlatformType[];
 
-  if (isDefined(mobile) && isDefined(extension)) {
+  if (isTruthy(mobile) && isTruthy(extension)) {
     platforms = [PlatformType.Mobile, PlatformType.Extension];
-  } else if (isDefined(mobile)) {
+  } else if (isTruthy(mobile)) {
     platforms = [PlatformType.Mobile];
   } else {
     platforms = [PlatformType.Extension];

src/utils/helpers.ts

@@ -1,5 +1,8 @@
 import { AxiosError } from 'axios';
 
+/** From lodash */
+type Truthy<T> = T extends null | undefined | false | '' | 0 | 0n ? never : T;
+
 export const range = (start: number, end: number, step = 1) =>
   Array(Math.ceil((end - start) / step))
     .fill(0)
@@ -28,6 +31,8 @@ export const emptyFn = () => {};
 
 export const isDefined = <T>(value: T | undefined | null): value is T => value !== undefined && value !== null;
 
+export const isTruthy = <T>(value: T): value is Truthy<T> => Boolean(value);
+
 export const isNonEmptyString = (str: unknown): str is string => typeof str === 'string' && str.length !== 0;
 
 export const getExternalApiErrorPayload = (error: unknown) => {