tango-app-api-trax 3.4.1-activitylog-2 → 3.4.1-activitylog-4

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-trax",
-    "version": "3.4.1-activitylog-2",
+    "version": "3.4.1-activitylog-4",
     "description": "Trax",
     "main": "index.js",
     "type": "module",

package/src/controllers/activityLog.controller.js

@@ -152,8 +152,8 @@ export const listLog = async ( req, res ) => {
       }
       if ( requestBody.type === 'task' ) {
         const sourceCheckListResult = await taskconfigService.aggregate( [
-          // { $match: { 'owner.value': req.user.email } },
-          { $match: { $or: [ { 'owner.value': req.user.email }, { 'approver.value': req.user.email } ] } },
+          { $match: { createdBy: req.user._id } },
+          // { $match: { $or: [ { 'owner.value': req.user.email }, { 'approver.value': req.user.email } ] } },
           { $group: { _id: null, checklistIds: { $push: { $toString: '$_id' } } } },
           { $project: { _id: 0, checklistIds: 1 } },
         ] );
@@ -190,7 +190,7 @@ export const listLog = async ( req, res ) => {
     if ( requestBody.searchValue ) {
       mustConditions.push( { multi_match: {
         'query': requestBody.searchValue,
-        'fields': [ 'checkListName', 'storeName', 'userEmail' ],
+        'fields': [ 'checkListName', 'storeName', 'createdByEmail' ],
         'type': 'phrase_prefix',
       },
       } );

package/src/controllers/trax.controller.js

@@ -1022,8 +1022,8 @@ export const update = async ( req, res ) => {
           questionAdd: questionList.questionAdd,
           questionEdit: questionList.questionEdit,
           questionDelete: questionList.questionDelete,
-          userType: req.user.userType,
         },
+        userType: req.user.userType,
       };
       insertOpenSearchData( JSON.parse( process.env.OPENSEARCH ).traxActivityLog, insertLogData );
     }