tango-app-api-task 3.2.1-beta-24 → 3.2.1-beta-26

package/app.js

@@ -0,0 +1,55 @@
+
+
+import express from 'express';
+import { taskRouter, internalAPIRouter, taskActionCenterRouter, taskDashboardRouter } from './index.js';
+import dotenv from 'dotenv';
+import { logger } from 'tango-app-api-middleware';
+import { connectdb } from './config/database/database.js';
+import responseMiddleware from './config/response/response.js';
+import errorMiddleware from './config/response/response.js';
+import cors from 'cors';
+import pkg from 'body-parser';
+import fileupload from 'express-fileupload';
+
+const env=dotenv.config();
+
+
+const app = express();
+const { json, urlencoded } = pkg;
+
+const PORT = process.env.PORT || 3000;
+
+
+if ( env.error ) {
+  logger.error( '.env not found' );
+
+  process.exit( 1 );
+}
+
+app.use( fileupload() );
+
+app.use( responseMiddleware );
+app.use( errorMiddleware );
+app.use( cors() );
+app.use( responseMiddleware );
+app.use( errorMiddleware );
+app.use( json( { limit: '500mb' } ) );
+app.use(
+    urlencoded( {
+      extended: true,
+    } ),
+);
+
+app.use( '/task', taskRouter );
+app.use( '/task/internalAPI', internalAPIRouter );
+app.use( '/task/actionCenter', taskActionCenterRouter );
+app.use( '/task/dashboard', taskDashboardRouter );
+
+
+app.listen( PORT, () => {
+  console.log( `server is running on port= ${PORT} ` );
+
+  connectdb();
+} );
+
+

package/package.json

@@ -1,11 +1,11 @@
 {
     "name": "tango-app-api-task",
-    "version": "3.2.1-beta-24",
+    "version": "3.2.1-beta-26",
     "description": "Task",
-    "main": "index.js",
+    "main": "app.js",
     "type": "module",
     "scripts": {
-        "start": "nodemon --exec \"eslint --fix . && node index.js\""
+        "start": "nodemon --exec \"eslint --fix . && node app.js\""
     },
     "engines": {
         "node": ">=18.10.0"

package/src/controllers/task.controller.js

@@ -738,6 +738,7 @@ export async function taskConfig( req, res ) {
           checkListName: checklistDetails.checkListName,
           checklistId: checklistDetails._id,
           coverage: inputBody.coverage,
+          insert: true,
         };
         await assignUsers( data );
       } ) );
@@ -1142,6 +1143,7 @@ export async function uploadImage( req, res ) {
 
 async function createUser( data ) {
   try {
+    console.log( 'createUser ====>', data );
     let params = {
       userName: data.userName,
       email: data.email,
@@ -1224,7 +1226,8 @@ async function createUser( data ) {
       ],
     };
     let response = await userService.create( params );
-    return response._id;
+    // console.log( 'createUser ====>', response );
+    return response;
   } catch ( e ) {
     logger.error( 'createUser =>', e );
     return false;
@@ -3354,71 +3357,49 @@ export async function taskAssign( req, res ) {
     if ( !taskDetails ) {
       return res.sendError( 'No data found', 204 );
     }
-    let idList;
-    let assignList;
-    if ( req.body.coverage == 'store' ) {
-      let clusterDetails = await clusterServices.findcluster( { _id: { $in: req.body.idList } }, { stores: 1, clusterName: 1 } );
-      if ( clusterDetails.length ) {
-        let clusterList = clusterDetails.map( ( item ) => item._id.toString() );
-        idList = [
-          ...clusterDetails.flatMap( ( item ) => item.stores.map( ( ele ) => ele.store ) ),
-          ...req.body.idList.filter( ( ele ) => !clusterList.includes( ele ) ),
-        ];
-      } else {
-        idList = req.body.idList;
-      }
-      let getStoreDetails = await storeService.find( { _id: { $in: idList }, status: 'active' } );
-      if ( !getStoreDetails.length ) {
-        return res.sendError( 'No data found', 204 );
-      }
-      assignList = await Promise.all( getStoreDetails.map( async ( store ) => {
-        let userDetails = await userService.findOne( { email: store?.spocDetails?.[0]?.email, clientId: store.clientId } );
-        if ( !userDetails ) {
-          let data = {
-            clientId: store.clientId,
-            userName: store.spocDetails?.[0]?.name,
-            mobileNumber: store.spocDetails?.[0]?.phone || '',
-            email: store.spocDetails[0].email,
-          };
-          userDetails = await createUser( data );
+    let assignList = [];
+
+    // for ( let data of req.body.idList ) {
+    //   let assignedData = {
+    //     ...data,
+    //     clientId: req.body.clientId,
+    //     checkListName: taskDetails.checkListName,
+    //     checklistId: taskDetails._id,
+    //     coverage: req.body.coverage,
+    //     insert: false,
+    //   };
+    //   // console.log( assignedData, 'daterthj' );
+    //   let uploadData = await assignUsers( assignedData );
+    //   if ( uploadData ) {
+    //     if ( Array.isArray( uploadData ) ) {
+    //       assignList.push( ...uploadData );
+    //     } else {
+    //       assignList.push( uploadData );
+    //     }
+    //   }
+    // }
+
+    await Promise.all( req.body.idList.map( async ( data ) => {
+      let assignedData = {
+        ...data,
+        clientId: req.body.clientId,
+        checkListName: taskDetails.checkListName,
+        checklistId: taskDetails._id,
+        coverage: req.body.coverage,
+        insert: false,
+      };
+      // console.log( assignedData, 'daterthj' );
+      let uploadData = await assignUsers( assignedData );
+      if ( uploadData ) {
+        if ( Array.isArray( uploadData ) ) {
+          assignList.push( ...uploadData );
+        } else {
+          assignList.push( uploadData );
         }
-        let data = {
-          store_id: store.storeId,
-          storeName: store.storeName,
-          userId: userDetails._id,
-          userName: userDetails.userName,
-          userEmail: userDetails.email,
-          userPhone: userDetails?.mobileNumber,
-          clusterName: clusterDetails?.clusterName,
-        };
-        return data;
-      } ) );
-    } else {
-      let teamDetails = await teamsServices.findteams( { _id: { $in: req.body.idList } }, { users: 1, teamName: 1 } );
-      if ( teamDetails.length ) {
-        let teamList = teamDetails.map( ( ele ) => ele._id.toString() );
-        idList = [
-          ...teamDetails.flatMap( ( item ) => item.users.map( ( ele ) => ele.userId ) ),
-          ...req.body.idList.filter( ( ele ) => !teamList.includes( ele._id ) ),
-        ];
-      } else {
-        idList = req.body.idList;
-      }
-      let userDetails = await userService.find( { _id: { $in: idList } } );
-      if ( !userDetails.length ) {
-        return res.sendError( 'No data found', 204 );
       }
-      assignList = [];
-      userDetails.forEach( ( user ) => {
-        assignList.push( {
-          userId: user._id,
-          userName: user.userName,
-          userEmail: user.email,
-          userPhone: user?.mobileNumber,
-          teamName: teamDetails?.teamName,
-        } );
-      } );
-    }
+    } ) );
+
+
     return res.sendSuccess( { count: assignList.length, assignList } );
   } catch ( e ) {
     logger.error( { functionName: 'checklistAssign', error: e } );
@@ -3427,6 +3408,7 @@ export async function taskAssign( req, res ) {
 }
 
 async function assignUsers( data ) {
+  console.log( data );
   let assignedData;
   if ( data.coverage == 'store' ) {
     if ( data?.type == 'cluster' ) {
@@ -3439,7 +3421,7 @@ async function assignUsers( data ) {
         {
           $match: {
             clientId: data.clientId,
-            ...( !data?.upload ) ? { _id: new mongoose.Types.ObjectId( data.id ) } : { cluster: data.clusterName.toLowerCase() },
+            ...( !data?.clusterName ) ? { _id: new mongoose.Types.ObjectId( data.id ) } : { cluster: data.clusterName.toLowerCase() },
           },
         },
         {
@@ -3451,7 +3433,7 @@ async function assignUsers( data ) {
       ];
       let clusterDetails = await clusterServices.aggregateCluster( query );
       if ( clusterDetails.length ) {
-        if ( !data.upload ) {
+        if ( data.insert ) {
           assignedData = {
             checkFlag: true,
             checkListId: data.checklistId,
@@ -3466,10 +3448,10 @@ async function assignUsers( data ) {
           let storeDetails = await storeService.find( { _id: { $in: clusterList }, status: 'active' } );
           assignedData = await Promise.all( storeDetails.map( async ( store ) => {
             let userDetails = await userService.findOne( { email: store.spocDetails?.[0]?.email, clientId: data.clientId } );
-            if ( !userDetails ) {
+            if ( !userDetails && store?.spocDetails?.length ) {
               let userData = {
                 userName: store.spocDetails?.[0]?.name,
-                email: store.spocDetails[0].email,
+                email: store.spocDetails[0]?.email,
                 mobileNumber: store.spocDetails?.[0]?.phone,
                 clientId: data.clientId,
               };
@@ -3486,7 +3468,9 @@ async function assignUsers( data ) {
               client_id: data.clientId,
               assignId: data?.id || clusterDetails?.[0]?._id,
               coverage: 'store',
-              teamName: clusterDetails?.[0]?.clusterName,
+              clusterName: clusterDetails?.[0]?.clusterName,
+              storeId: store.storeId,
+              storeName: store.storeName,
             };
             return userData;
           } ) );
@@ -3502,13 +3486,13 @@ async function assignUsers( data ) {
         {
           $match: {
             clientId: data.clientId,
-            ...( !data.upload ) ? { _id: new mongoose.Types.ObjectId( data.id ) } : { store: data.storeName.toLowerCase() },
+            ...( !data.storeName ) ? { _id: new mongoose.Types.ObjectId( data.id ) } : { store: data.storeName.toLowerCase() },
           },
         },
       ];
       let storeDetails = await storeService.aggregate( query );
       if ( storeDetails.length ) {
-        let email = data?.upload ? data.userEmail : storeDetails?.[0]?.spocDetails?.[0]?.email;
+        let email = data?.userEmail ? data.userEmail : storeDetails?.[0]?.spocDetails?.[0]?.email;
         let userDetails = await userService.findOne( { email: email, clientId: data.clientId } );
         if ( !userDetails ) {
           let userData = {
@@ -3518,6 +3502,7 @@ async function assignUsers( data ) {
             clientId: data.clientId,
           };
           userDetails = await createUser( userData );
+          console.log( 'userDetails =>', userDetails );
         }
         assignedData = {
           store_id: storeDetails?.[0]?.storeId,
@@ -3548,13 +3533,13 @@ async function assignUsers( data ) {
         {
           $match: {
             clientId: data.clientId,
-            ...( !data?.upload ) ? { _id: new mongoose.Types.ObjectId( data.id ) } : { team: data.teamName.toLowerCase() },
+            ...( !data?.teamName ) ? { _id: new mongoose.Types.ObjectId( data.id ) } : { team: data.teamName.toLowerCase() },
           },
         },
       ];
       let teamDetails = await teamsServices.aggregateTeams( query );
       if ( teamDetails.length ) {
-        if ( !data.upload ) {
+        if ( data.insert ) {
           assignedData = {
             checkFlag: true,
             checkListId: data.checklistId,
@@ -3595,17 +3580,19 @@ async function assignUsers( data ) {
         {
           $match: {
             clientId: data.clientId,
-            ...( !data?.upload ) ? { _id: new mongoose.Types.ObjectId( data.id ) } : { userEmail: data.userEmail.toLowerCase() },
+            ...( !data?.userEmail ) ? { _id: new mongoose.Types.ObjectId( data.id ) } : { userEmail: data.userEmail.toLowerCase() },
           },
         },
       ];
+      // console.log( 'data?.userEmail=>', data.userEmail );
       let userDetails = await userService.aggregate( query );
       if ( !userDetails.length ) {
         let userData = {
-          userName: data.userEmail.split( '@' )[0],
+          userName: data?.userEmail?.split( '@' )[0],
           email: data.userEmail,
           clientId: data.clientId,
         };
+        // console.log( userData, 'userData', data );
         let details = await createUser( userData );
         userDetails = [ details ];
       }
@@ -3625,7 +3612,9 @@ async function assignUsers( data ) {
       }
     }
   }
-  if ( assignedData && !data.upload ) {
+
+  // console.log( assignedData, 'test', data );
+  if ( assignedData && !data.upload && data.insert ) {
     await taskAssignService.updateOne( { checkListId: assignedData.checkListId, assignId: assignedData.assignId }, assignedData );
   } else {
     return assignedData;
@@ -3641,16 +3630,26 @@ export async function assignTaskUser( req, res ) {
     if ( !taskDetails ) {
       return res.sendError( 'No data found', 204 );
     }
-    await Promise.all( newUsers.map( async ( user ) => {
-      let getUser = inputBody.assignUsers.find( ( ele ) => ele.userEmail.toLowerCase() == user.toLowerCase() );
+    // await Promise.all( newUsers.map( async ( user ) => {
+    //   let getUser = inputBody.assignUsers.find( ( ele ) => ele.userEmail.toLowerCase() == user.toLowerCase() );
+    //   let userData = {
+    //     userName: getUser.userName,
+    //     email: user,
+    //     mobileNumber: getUser?.phone,
+    //     clientId: inputBody.clientId,
+    //   };
+    //   await createUser( userData );
+    // } ) );
+    for ( let i = 0; i < newUsers.length; i++ ) {
+      let getUser = inputBody.assignUsers.find( ( ele ) => ele.userEmail.toLowerCase() == newUsers[i].toLowerCase() );
       let userData = {
         userName: getUser.userName,
-        email: user,
+        email: newUsers[i],
         mobileNumber: getUser?.phone,
         clientId: inputBody.clientId,
       };
       await createUser( userData );
-    } ) );
+    }
     let assignData = [];
     await Promise.all( assignDetails.map( async ( assign ) => {
       assign.checklistId = inputBody.taskId;

package/src/service/user.service.js

@@ -20,6 +20,10 @@ export const updateOne = async ( query = {}, record={} ) => {
   return model.userModel.updateOne( query, { $set: record } );
 };
 
+export const upsert = async ( query = {}, record={} ) => {
+  return model.userModel.updateOne( query, { $set: record }, { upsert: true } );
+};
+
 export const aggregate = async ( query = {} ) => {
   return model.userModel.aggregate( query );
 };