Adress comments

Author: ipaunov

lib/notifications.js

@@ -11,7 +11,10 @@ async function postNotification() {
   });
 
   const notification = createNotification(arguments);
-  return (await executeRequest("post", `${NOTIFICATIONS_API_ENDPOINT}/Notifications`, notification, notifServiceDest, csrfHeaders)).data.d;
+
+  if (notification) {
+    return (await executeRequest("post", `${NOTIFICATIONS_API_ENDPOINT}/Notifications`, notification, notifServiceDest, csrfHeaders)).data.d;
+  }
 }
 
 module.exports = {

lib/utils.js

@@ -20,12 +20,16 @@ function validateNotificationTypes(notificationTypes) {
 
 function validateNotifyParameters(recipients, priority, title) {
   if (!recipients || !priority || !title) {
-    throw new Error(messages.MANDATORY_PARAMETER_NOT_PASSED);
+    console.log(messages.MANDATORY_PARAMETER_NOT_PASSED);
+    return false;
   }
 
   if (!PRIORITIES.includes(priority)) {
-    throw new Error(`Invalid priority ${priority}. Allowed priorities are LOW, NEUTRAL, MEDIUM, HIGH`);
+    console.log(`Invalid priority ${priority}. Allowed priorities are LOW, NEUTRAL, MEDIUM, HIGH`);
+    return false;
   }
+
+  return true;
 }
 
 function doesKeyExist(obj, key) {
@@ -64,7 +68,6 @@ async function executeRequest(httpMethod, targetUrl, payload, notifServiceDest,
     });
   } catch (e) {
     console.log(e);
-    return e;
   }
   return response;
 }
@@ -112,7 +115,9 @@ function createNotification(passedArguments) {
     const title = passedArguments[2];
     const description = passedArguments[3] ? passedArguments[3] : "";
 
-    validateNotifyParameters(recipients, priority, title);
+    if (!validateNotifyParameters(recipients, priority, title)) {
+      return;
+    }
 
     notification = createDefaultNotification(
       recipients,

srv/notifyToConsole.js

@@ -1,5 +1,6 @@
 const NotificationService = require('./service');
-const { createNotification } = require("./../lib/utils");
+const { createNotification, readFile, doesKeyExist } = require("./../lib/utils");
+const { createNotificationTypesMap } = require("./../lib/notificationTypes");
 
 module.exports = class NotifyToConsole extends NotificationService {
   async init() {
@@ -8,8 +9,23 @@ module.exports = class NotifyToConsole extends NotificationService {
   }
 
   notify() {
+
     const notification = createNotification(arguments);
 
-    console.log(`SAP Alert Notification service notification: ${JSON.stringify(notification, null, 2)}`);
+    if (notification) {
+      console.log(`SAP Alert Notification service notification: ${JSON.stringify(notification, null, 2)}`);
+
+      const typesFile = readFile(cds.env.requires.notifications.types);
+      const existingTypes = createNotificationTypesMap(typesFile);
+  
+      if (!doesKeyExist(existingTypes, notification["NotificationTypeKey"])) {
+        console.log(`Notification Type ${notification["NotificationTypeKey"]} is not in the notification types file`);
+      }
+  
+      if (!doesKeyExist(existingTypes[notification["NotificationTypeKey"]], notification["NotificationTypeVersion"])) {
+        console.log(`Notification Type Version ${notification["NotificationTypeVersion"]} for type ${notification["NotificationTypeKey"]} is not in the notification types file`);
+      }
+    }
+    
   }
 }