tango-app-api-payment-subscription 3.0.46-dev → 3.0.48-dev

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-payment-subscription",
-    "version": "3.0.46-dev",
+    "version": "3.0.48-dev",
     "description": "paymentSubscription",
     "main": "index.js",
     "type": "module",
@@ -26,7 +26,7 @@
         "nodemon": "^3.1.0",
         "swagger-ui-express": "^5.0.0",
         "tango-api-schema": "^2.0.103",
-        "tango-app-api-middleware": "^1.0.60-dev",
+        "tango-app-api-middleware": "^1.0.75-dev",
         "winston": "^3.12.0",
         "winston-daily-rotate-file": "^5.0.0"
     },

package/src/controllers/paymentSubscription.controllers.js

@@ -3049,9 +3049,12 @@ export const invoiceRevised = async ( req, res ) => {
 
 export const clientNotificationList = async ( req, res ) => {
   try {
+    let from = ( req.query.offset - 1 ) * req.query.limit;
     let query;
     if ( req.user.role == 'superadmin' ) {
       query = {
+        from: from,
+        size: req.query.limit,
         query: {
           bool: {
             must: [
@@ -3083,7 +3086,7 @@ export const clientNotificationList = async ( req, res ) => {
     if ( !result || !result.body.hits.hits.length ) {
       return res.sendError( 'no data found', 204 );
     }
-    return res.sendSuccess( result.body.hits.hits );
+    return res.sendSuccess( { count: result.body.hits.total.value, result: result.body.hits.hits } );
   } catch ( e ) {
     logger.error( { error: e, function: 'clientNotificationList' } );
     return res.sendError( e, 500 );

package/src/dtos/validation.dtos.js

@@ -256,3 +256,12 @@ export const validateIdSchema = joi.object( {
 export const validateId = {
   params: validateIdSchema,
 };
+
+export const notificationSchema = {
+  limit: joi.number().required(),
+  offset: joi.number().required(),
+};
+
+export const notificationParams = {
+  query: notificationSchema,
+};

package/src/routes/paymentSubscription.routes.js

@@ -160,7 +160,7 @@ paymentSubscriptionRouter.post( '/invoice/create', validateClient, paymentContro
 paymentSubscriptionRouter.post( '/invoiceGenerate', paymentController.invoiceGenerate );
 paymentSubscriptionRouter.post( '/dailyPricing/insert', validate( validationDtos.dailyPricingParams ), paymentController.dailyPricingInsert );
 paymentSubscriptionRouter.get( '/invoiceRevised/:invoiceId', validate( validationDtos.invoiceRevisedParams ), paymentController.invoiceRevised );
-paymentSubscriptionRouter.get( '/notificationList', isAllowedSessionHandler, paymentController.clientNotificationList );
+paymentSubscriptionRouter.get( '/notificationList', isAllowedSessionHandler, validate( validationDtos.notificationParams ), paymentController.clientNotificationList );
 paymentSubscriptionRouter.put( '/notification/update/:notificationId', isAllowedSessionHandler, validate( validationDtos.validateId ), paymentController.updateNotification );
 paymentSubscriptionRouter.put( '/pushNotification/update/:notificationId', isAllowedSessionHandler, validate( validationDtos.validateId ), paymentController.updatePushNotification );