tango-app-api-task 3.2.1-beta-25 → 3.2.1-beta-27

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-task",
-    "version": "3.2.1-beta-25",
+    "version": "3.2.1-beta-27",
     "description": "Task",
     "main": "index.js",
     "type": "module",

package/src/controllers/task.controller.js

@@ -1143,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,
@@ -1225,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;
@@ -3357,6 +3359,26 @@ export async function taskAssign( req, res ) {
     }
     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,
@@ -3386,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' ) {
@@ -3469,7 +3492,7 @@ async function assignUsers( data ) {
       ];
       let storeDetails = await storeService.aggregate( query );
       if ( storeDetails.length ) {
-        let email = !data?.insert ? 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 = {
@@ -3479,6 +3502,7 @@ async function assignUsers( data ) {
             clientId: data.clientId,
           };
           userDetails = await createUser( userData );
+          console.log( 'userDetails =>', userDetails );
         }
         assignedData = {
           store_id: storeDetails?.[0]?.storeId,
@@ -3591,7 +3615,7 @@ async function assignUsers( data ) {
 
   // console.log( assignedData, 'test', data );
   if ( assignedData && !data.upload && data.insert ) {
-    await assignedService.updateOne( { checkListId: assignedData.checkListId, assignId: assignedData.assignId }, assignedData );
+    await taskAssignService.updateOne( { checkListId: assignedData.checkListId, assignId: assignedData.assignId }, assignedData );
   } else {
     return assignedData;
   }
@@ -3606,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 );
 };