tango-app-api-client 3.0.18-dev → 3.0.20-dev

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-client",
-    "version": "3.0.18-dev",
+    "version": "3.0.20-dev",
     "description": "client",
     "main": "index.js",
     "type": "module",
@@ -26,7 +26,7 @@
         "nodemon": "^3.0.3",
         "swagger-ui-express": "^5.0.0",
         "tango-api-schema": "^2.0.65",
-        "tango-app-api-middleware": "^1.0.49-dev",
+        "tango-app-api-middleware": "^1.0.51-dev",
         "winston": "^3.11.0",
         "winston-daily-rotate-file": "^5.0.0"
     },

package/src/controllers/client.controllers.js

@@ -11,6 +11,7 @@ import { deleteOneAuthentication } from '../service/authentication.service.js';
 import { join } from 'path';
 import { readFileSync } from 'fs';
 import handlebars from 'handlebars';
+import { countDocumentsGroup } from '../service/group.service.js';
 
 export async function create( req, res ) {
   try {
@@ -33,8 +34,7 @@ export async function create( req, res ) {
       path: '/src/hbs/approved-client.hbs',
       subject: 'Your account has been verified by Tango!',
     };
-    const mail = await sendEmail( data );
-    logger.info( { message: mail, function: 'findOneUser' } );
+    await sendEmail( data );
     const record = {
       'clientName': leadRecord.clientName,
       'clientId': String( tangoId ),
@@ -77,7 +77,7 @@ export const sendEmail = ( data ) => {
     const subject = data.subject;
     const fileContent = readFileSync( join() + data.path, 'utf8' );
     const htmlContent = handlebars.compile( fileContent );
-    const html = htmlContent();
+    const html = htmlContent( { url: appConfig.url.domain } );
     return sendEmailWithSES( data.email, subject, html, attachments, appConfig.cloud.aws.ses.adminEmail );
   } catch ( error ) {
     return error;
@@ -1015,10 +1015,10 @@ export async function detailedClientCount( req, res ) {
     const inputData = req.query;
     let result = {
       clientName: inputData.clientName,
-      role: 'admin',
+      role: req?.user?.role,
     };
     result['totalStoreCount'] = await countDocumentsStore( { clientId: inputData.clientId } );
-    result['totalGroupCount'] = await countDocumentsStore( { clientId: inputData.clientId } );
+    result['totalGroupCount'] = await countDocumentsGroup( { clientId: inputData.clientId } );
     result['totalCameraCount'] = await countDocumentsCamera( { clientId: inputData.clientId } );
     result['totalUserCount'] = await countDocumentsUser( { clientId: inputData.clientId, userType: 'client' } );
 

package/src/service/group.service.js

@@ -0,0 +1,5 @@
+import groupModel from 'tango-api-schema/schema/group.model.js';
+
+export function countDocumentsGroup( query ) {
+  return groupModel.countDocuments( query );
+}