tango-app-api-trax 3.3.1-beta-26 → 3.3.1-beta-28

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-trax",
-    "version": "3.3.1-beta-26",
+    "version": "3.3.1-beta-28",
     "description": "Trax",
     "main": "index.js",
     "type": "module",

package/src/controllers/trax.controller.js

@@ -548,7 +548,7 @@ async function createUser( data ) {
       ],
     };
     let response = await userService.create( params );
-    return response._id;
+    return response;
   } catch ( e ) {
     logger.error( 'createUser =>', e );
     return false;
@@ -3646,7 +3646,7 @@ async function assignUsers( data ) {
             mobileNumber: storeDetails?.[0]?.spocDetails?.[0]?.phone,
             clientId: data.clientId,
           };
-          userDetails = createUser( userData );
+          userDetails = await createUser( userData );
         }
         assignedData = {
           store_id: storeDetails?.[0]?.storeId,
@@ -3703,11 +3703,20 @@ async function assignUsers( data ) {
         {
           $match: {
             clientId: data.clientId,
-            ...( !data?.upload ) ? { _id: new mongoose.Types.ObjectId( data.id ) } : { userEmail: data.email.toLowerCase() },
+            ...( !data?.upload ) ? { _id: new mongoose.Types.ObjectId( data.id ) } : { userEmail: data.userEmail.toLowerCase() },
           },
         },
       ];
       let userDetails = await userService.aggregate( query );
+      if ( !userDetails.length ) {
+        let userData = {
+          userName: data.userEmail.split( '@' )[0],
+          email: data.userEmail,
+          clientId: data.clientId,
+        };
+        let details = await createUser( userData );
+        userDetails = [ details ];
+      }
       if ( userDetails.length ) {
         assignedData = {
           userId: userDetails?.[0]?._id,
@@ -3770,82 +3779,8 @@ export async function checklistAssign( req, res ) {
             userName: store.spocDetails?.[0]?.name,
             mobileNumber: store.spocDetails?.[0]?.phone || '',
             email: store.spocDetails[0].email,
-            password: '5dqFKAJj29PsV6P+kL+3Dw==',
-            role: 'user',
-            userType: 'client',
-            rolespermission: [
-              {
-                featureName: 'Global',
-                modules: [
-                  {
-                    name: 'Store',
-                    isAdd: false,
-                    isEdit: false,
-
-                  },
-                  {
-                    name: 'User',
-                    isAdd: false,
-                    isEdit: false,
-
-                  },
-                  {
-                    name: 'Camera',
-                    isAdd: false,
-                    isEdit: false,
-
-                  },
-                  {
-                    name: 'Configuration',
-                    isAdd: false,
-                    isEdit: false,
-
-                  },
-                  {
-                    name: 'Subscription',
-                    isAdd: false,
-                    isEdit: false,
-
-                  },
-                  {
-                    name: 'Billing',
-                    isAdd: false,
-                    isEdit: false,
-
-                  },
-                ],
-              },
-              {
-                featurName: 'TangoEye',
-                modules: [
-                  {
-                    name: 'ZoneTag',
-                    isAdd: false,
-                    isEdit: false,
-
-                  },
-                ],
-              },
-              {
-                featurName: 'TangoTrax',
-                modules: [
-                  {
-                    name: 'checklist',
-                    isAdd: false,
-                    isEdit: false,
-
-                  },
-                  {
-                    name: 'Task',
-                    isAdd: false,
-                    isEdit: false,
-
-                  },
-                ],
-              },
-            ],
           };
-          userDetails = await userService.create( data );
+          userDetails = await createUser( data );
         }
         let data = {
           store_id: store.storeId,

package/src/controllers/traxDashboard.controllers.js

@@ -476,6 +476,7 @@ export const storePerformance = async ( req, res ) => {
         { checkListType: { $eq: 'custom' } },
         // { store_id: { $in: requestData.storeId } },
         { $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: getUserEmails } } ] },
+        { coverage: { $eq: 'store' } },
     );
 
     findQuery.push( { $match: { $and: findAndQuery } } );