playov2-js-utilities 0.3.23 → 0.3.26

package/lib/logger.js

@@ -1,6 +1,6 @@
 const PLAYO_LOGGER = require("@playo/logger")
 
-const LOGGER = new PLAYO_LOGGER("playov2-activity")
+const LOGGER = new PLAYO_LOGGER("playov2-js-utilities")
 
 const ENV = process.env.NODE_ENV || 'staging';
 
@@ -10,7 +10,7 @@ if (ENV === 'staging' || ENV === 'test') {
 
 if (ENV === "production") {
     LOGGER.setMailer({
-        'receiverEmail': ["saurabh@playo.co", "umashankar@playo.co", "avish@playo.co"], // array of recievers, mandatory
+        'receiverEmail': ["saurabh@playo.co", "avish@playo.co"], // array of recievers, mandatory
         'senderEmail': "logger@playo.co",// address of sender, mandatory
         'senderName': 'Mail Logger - prod - Utitlies module', // default: Mail Logger, optional
         'replyEmail': 'no-reply@mail.com', // default: no-reply@playo.co, optional

package/lib/middleware.js

@@ -1,20 +1,28 @@
 
-const { v4: uuidv4, v4 } = require('uuid');
+const { v4: uuidv4 } = require('uuid');
 const Logger = require('./logger')
 
 const playoServiceRequestInterceptor = (req, res, next, service = 'microservice-name') => {
     const id = req.headers["x-request-id"] || uuidv4();
     const start = Date.now();
-
+    let userId = 'internal-request';
+    if (req.headers.userinfo) {
+        try {
+            userId = JSON.parse(req.headers.userinfo).userId
+        } catch (error) {
+            Logger.prepareInfoLog(id, { userinfo: req.headers.userinfo }, "Malformed userInfo in headers detected");
+        }
+    }
+    const url = req.url;
     const requestDetails = {
         method: req.method,
         params: req.params,
         query: req.query,
-        url: req.url,
+        url,
         originalUrl: req.originalUrl,
         service
     };
-    if (req.body.length < 1000) {
+    if (req.body && JSON.stringify(req.body).length < 10000) { // 0.1 mb
         requestDetails['body'] = req.body || {};
     }
 
@@ -23,13 +31,13 @@ const playoServiceRequestInterceptor = (req, res, next, service = 'microservice-
     res.on('finish', function () {
         const duration = Date.now() - start;
         const status = res.statusCode;
-        Logger.prepareInfoLog(id, { status, duration, service }, "Outgoing request - finish event");
+        Logger.prepareInfoLog(id, { status, duration, service, url, userId }, "Outgoing request - finish event");
     });
 
     res.on('close', function () {
         const duration = Date.now() - start;
         const status = res.statusCode;
-        Logger.prepareInfoLog(id, { status, duration, service }, "Outgoing request - close event");
+        Logger.prepareInfoLog(id, { status, duration, service, url, userId }, "Outgoing request - close event");
     });
     next();
 };

package/lib/notification.config.js

@@ -1,10 +1,13 @@
 
 //\-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_- Private -_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-\//
+ // These categories correspond to notification preferences of the user
 const notificationCategories = {
-    GROUP: 'group',
-    ACTIVITY: 'activity',
+    GROUP: 'group', // group updates
+    ACTIVITY: 'activity', // activity updates
     KARMA: 'karma',
-    SPLIT_PAYMENTS: 'split_payments'
+    SPLIT_PAYMENTS: 'split_payments',
+    OFFERS: 'offers',
+    PLAYPAL_ACTIVITY: 'playpal-activity' // activity_suggestion_from_playpals
 };
 
 // Android notification channels will be bound to categories
@@ -49,7 +52,7 @@ const notificationIds = {
     NEW_COMMENT: 'new-comment',
     ACTIVITY_INVITATION: 'activity-invitation',
     ACTIVITY_INVITATION_RESPONSE: 'activity-invitation-response',
-    ACTIVITY_REQUEST: 'activity-request',
+    ACTIVITY_REQUEST: 'activity-request', // deprecated - use ACTIVITY_REQUEST_MANAGE
     ACTIVITY_REQUEST_RESPONSE: 'activity-request-response',
     HOST_RETIRED: 'host-retired',
     JOINEE_RETIRED: 'joinee-retired',
@@ -291,7 +294,7 @@ const config = {
         android_channel_id: notificationChannels.activity_updates
     },
     [notificationIds.ACTIVITY_HOSTED]: {
-        category: "playpal-activity",
+        category: notificationCategories.PLAYPAL_ACTIVITY,
         target: "match",
         title: "Activity Update",
         type: ["push", "drawer"],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "playov2-js-utilities",
-  "version": "0.3.23",
+  "version": "0.3.26",
   "description": "Private package for JS utility functions",
   "main": "index.js",
   "scripts": {
@@ -17,6 +17,7 @@
   "license": "ISC",
   "homepage": "https://bitbucket.org/techmash/playov2-js-utilities#readme",
   "devDependencies": {
+    "@types/uuid": "^8.3.4",
     "faker": "^5.5.3",
     "jest": "^27.1.0"
   },