Fix conflicts

Author: ipaunov

lib/notifications.js

@@ -1,14 +1,15 @@
-const { executeHttpRequest, buildCsrfHeaders } = require("@sap-cloud-sdk/core");
-const { getNotificationDestination, getNotificationTypesKeyWithPrefix } = require("./utils");
+const { buildCsrfHeaders } = require("@sap-cloud-sdk/core");
+const { getNotificationDestination, getNotificationTypesKeyWithPrefix, executeRequest } = require("./utils");
 
 const NOTIFICATIONS_DESTINATION_NAME = cds.env.requires.notifications?.destination ?? "SAP_Notifications";
 const NOTIFICATIONS_API_ENDPOINT = "v2/Notification.svc";
+const POSSIBLE_PRIORITIES = ["LOW", "NEUTRAL", "MEDIUM", "HIGH"];
 
 async function createNotificationObject(
   recipients,
   notificationData
 ) {
-  const prefix = "@cap-ans/";
+  const prefix = "@cap-ans";
   // const prefix = process.env.npm_package_name;
   return {
     Id: notificationData["Id"],
@@ -63,7 +64,7 @@ async function createDefaultNotificationObject(
 }
 
 async function postNotification() {
-  const notifServiceDest = await _getDestination(NOTIFICATIONS_DESTINATION_NAME);
+  const notifServiceDest = await getNotificationDestination(NOTIFICATIONS_DESTINATION_NAME);
   const csrfHeaders = await buildCsrfHeaders(notifServiceDest, {
   url: NOTIFICATIONS_API_ENDPOINT,
   });
@@ -88,7 +89,7 @@ async function postNotification() {
         arguments[0], // recipients
         arguments[1], // title
         "",
-        "LOW"
+        "NEUTRAL"
       );
 
     } else if (arguments.length === 3 && POSSIBLE_PRIORITIES.includes(arguments[2])) { // using recipients, title, priority
@@ -103,7 +104,7 @@ async function postNotification() {
         arguments[0], // recipients
         arguments[1], // title
         arguments[2], // description
-        "LOW"
+        "NEUTRAL"
       );
     } else if (arguments.length === 4 && POSSIBLE_PRIORITIES.includes(arguments[3])) { // using only recipients, title, description, priority
       notification = await createDefaultNotificationObject(

lib/utils.js

@@ -1,7 +1,7 @@
 const fs = require('fs');
 const { basename } = require('path')
 const cds = require("@sap/cds");
-const { getDestination } = require("@sap-cloud-sdk/core");
+const { executeHttpRequest, getDestination } = require("@sap-cloud-sdk/core");
 
 const messages = {
   INVALID_NOTIFICATION_TYPES: "Notification Types must contain the following keys: 'NotificationTypeKey' and 'NotificationTypeVersion'.",
@@ -40,7 +40,8 @@ function getNotificationTypesKeyWithPrefix(notificationTypeKey) {
   const prefix = getPrefix();
   return `${prefix}/${notificationTypeKey}`;
 }
-async function еxecuteRequest(httpmethod, targetUrl, payload, notifServiceDest, csrfHeaders) {
+
+async function executeRequest(httpmethod, targetUrl, payload, notifServiceDest, csrfHeaders) {
   let response = {};
   try {
     response = await executeHttpRequest(notifServiceDest, {
@@ -64,5 +65,5 @@ module.exports = {
   getNotificationDestination,
   getPrefix,
   getNotificationTypesKeyWithPrefix,
-  executeRequest: еxecuteRequest
+  executeRequest
 };

srv/notifyToConsole.js

@@ -1,7 +1,6 @@
 const NotificationService = require('./service');
 const cds = require("@sap/cds");
 const notifier = require("../lib/notifications");
-const { doesKeyExist, getNotificationTypesKeyWithPrefix } = require('../lib/utils');
 
 module.exports = class NotifyToConsole extends NotificationService {
   async init() {
@@ -10,6 +9,6 @@ module.exports = class NotifyToConsole extends NotificationService {
   }
 
   notify() {
-    console.log(`[ans] - ${arguments}:`);
+    console.log(JSON.stringify(arguments, null, 2));
   }
 }