tango-app-api-trax 3.4.0-flag-6 → 3.4.0-flag-8

package/index.js

@@ -8,5 +8,5 @@ import { downloadRouter } from './src/routes/download.router.js';
 import { mobileRouter } from './src/routes/mobileTrax.routes.js';
 import { internalTraxRouter } from './src/routes/internalTraxApi.router.js';
 import { locusOrderRouter } from './src/routes/locus.router.js';
-import { activityLogRouter } from './src/routes/activityLog.router.js';
-export { traxDashboardRouter, traxFlagRouter, traxRouter, galleryRouter, downloadRouter, mobileRouter, internalTraxRouter, locusOrderRouter, activityLogRouter };
+import { traxActivityLogRouter } from './src/routes/activityLog.router.js';
+export { traxDashboardRouter, traxFlagRouter, traxRouter, galleryRouter, downloadRouter, mobileRouter, internalTraxRouter, locusOrderRouter, traxActivityLogRouter };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-trax",
-    "version": "3.4.0-flag-6",
+    "version": "3.4.0-flag-8",
     "description": "Trax",
     "main": "index.js",
     "type": "module",

package/src/controllers/activityLog.controller.js

@@ -4,7 +4,6 @@ import * as checklistService from '../services/checklist.service.js';
 
 export const insertLog = async ( req, res ) => {
   try {
-    console.log( 'insertLog' );
     // let currentDate = new Date();
     let inserttraxlogs = {
       'client_id': '11',
@@ -71,7 +70,7 @@ export const insertLog = async ( req, res ) => {
         'userRemoved': [ 'LKST1166@yopmail.com', 'LKST1177@yopmail.com', 'LKST1188@yopmail.com', 'LKST1199@yopmail.com', 'LKST1155@yopmail.com', 'LKST1144@yopmail.com', 'LKST1133@yopmail.com', 'LKST1122@yopmail.com', 'LkST1111@yopmail.com' ],
       },
     };
-    let insertOS = await insertOpenSearchData( 'test-traxlogs', inserttraxlogs );
+    let insertOS = await insertOpenSearchData( JSON.parse( process.env.OPENSEARCH ).traxActivityLog, inserttraxlogs );
     console.log( 'insertOS', insertOS );
     return res.sendSuccess( 'insert successfully' );
     // if ( insertOS && insertOS.body.result == 'created' ) {
@@ -95,7 +94,7 @@ export const updateLog = async ( req, res ) => {
         // storeIds: [ '347-1' ],
       },
     };
-    let updateResult = await updateOpenSearchData( 'test-traxlogs', '5DwBYZUBcRcpuflp5oek', document );
+    let updateResult = await updateOpenSearchData( JSON.parse( process.env.OPENSEARCH ).traxActivityLog, '5DwBYZUBcRcpuflp5oek', document );
     console.log( 'updateResult', updateResult );
     if ( updateResult?.statusCode == 200 && updateResult?.body?.result == 'updated' ) {
       return res.sendSuccess( 'Email Send Successfully' );
@@ -108,39 +107,6 @@ export const updateLog = async ( req, res ) => {
     return res.sendError( e, 500 );
   }
 };
-export const listLogOld = async ( req, res ) => {
-  try {
-    console.log( 'list' );
-    const mustConditions = [];
-    // mustConditions.push( { match: { _id: '5DwBYZUBcRcpuflp5oek' } } );
-    let query = {
-      from: 1,
-      size: 2000,
-      query: {
-        bool: {
-          must: mustConditions,
-        },
-      },
-      sort: [
-        {
-          createAt: {
-            order: 'desc',
-          },
-        },
-      ],
-    };
-    let result = await getOpenSearchData( 'test-traxlogs', query );
-    console.log( 'result', result );
-    if ( !result || !result.body.hits.hits.length ) {
-      return res.sendError( 'no data found', 204 );
-    }
-    return res.sendSuccess( { count: result.body.hits.total.value, result: result.body.hits.hits } );
-  } catch ( e ) {
-    console.log( 'listLog', e );
-    // logger.error( 'listLog =>', e );
-    return res.sendError( e, 500 );
-  }
-};
 export const listLog = async ( req, res ) => {
   try {
     let requestBody = req.body;
@@ -244,110 +210,13 @@ export const listLog = async ( req, res ) => {
         },
       ],
     };
-    let result = await getOpenSearchData( 'test-traxlogs', query );
-    // console.log( 'result', result );
-    if ( !result || !result.body.hits.hits.length ) {
-      return res.sendError( 'no data found', 204 );
-    }
-    return res.sendSuccess( { count: result.body.hits.total.value, result: result.body.hits.hits } );
-  } catch ( e ) {
-    console.log( 'listLog', e );
-    return res.sendError( e, 500 );
-  }
-};
-
-export const listLogNotwork = async ( req, res ) => {
-  try {
-    let requestBody = req.body;
-    let from = ( requestBody.offset ) * requestBody.limit;
-
-    // let start = new Date( requestBody.fromDate );
-    // let userTimezoneOffset = start.getTimezoneOffset() * 60000;
-    // start = new Date( start.getTime() - userTimezoneOffset );
-    // start.setUTCHours( 0, 0, 0, 0 );
-    // let end = new Date( requestBody.toDate );
-    // end = new Date( end.getTime() - userTimezoneOffset );
-    // end.setUTCHours( 23, 59, 59, 59 );
-
-    // console.log( 'list' );
-    const mustConditions = [];
-    // if user role is admin fetch checklist owners
-
-
-    if ( requestBody.clientId ) {
-      mustConditions.push( { term: { client_id: requestBody.clientId } } );
-    }
-
-    // if ( req.user.userType == 'client' && req.user.role == 'admin' ) {
-    //   const sourceCheckListIds = await checklistService.aggregate( [
-    //     { $match: { 'owner.value': req.user.email } },
-    //     { $group: { _id: null, checklistIds: { $push: { $toString: '$_id' } } } },
-    //     { $project: { _id: 0, checklistIds: 1 } },
-    //   ] );
-
-    //   mustConditions.push( { terms: { $or: [ { store_id: { $in: requestBody.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: requestBody.userEmailes } }, { sourceCheckList_id: { $in: sourceCheckListIds } } ] } } );
-    // }
-
-    if ( requestBody.type ) {
-      mustConditions.push( { term: { type: requestBody.type } } );
-    }
-
-    if ( requestBody.action ) {
-      mustConditions.push( { terms: { action: { $in: requestBody.action } } } );
-    }
-
-    if ( requestBody.searchValue ) {
-      mustConditions.push( { multi_match: {
-        'query': requestBody.searchValue,
-        'fields': [ 'checkListName', 'storeName', 'userEmail' ],
-        'type': 'phrase_prefix',
-      },
-      } );
-    }
-    // console.log( 'Generated Query:', JSON.stringify( mustConditions, null, 2 ) );
-
-    // console.log( 'mustConditions =>', mustConditions );
-    // if ( requestBody.dateRange ) {
-    //   mustConditions.push( {
-    //     range: {
-    //       createdAt: {
-    //         gte: start, // Start date
-    //         lte: end, // End date
-    //       },
-    //     },
-    //   } );
-    // }
-    let sortCreatedAt = 'desc';
-    if ( requestBody.sortColumnName && requestBody.sortColumnName != '' ) {
-      if ( requestBody.sortBy == '1' ) {
-        sortCreatedAt = 'asc';
-      }
-    }
-    let query = {
-      from: parseInt( from ),
-      size: parseInt( requestBody.limit ),
-      query: {
-        bool: {
-          must: mustConditions,
-        },
-      },
-      sort: [
-        {
-          createAt: {
-            order: sortCreatedAt,
-          },
-        },
-      ],
-    };
-    let result = await getOpenSearchData( 'test-traxlogs', query );
-    console.log( 'result', result );
+    let result = await getOpenSearchData( JSON.parse( process.env.OPENSEARCH ).traxActivityLog, query );
     if ( !result || !result.body.hits.hits.length ) {
       return res.sendError( 'no data found', 204 );
     }
     return res.sendSuccess( { count: result.body.hits.total.value, result: result.body.hits.hits } );
   } catch ( e ) {
     console.log( 'listLog', e );
-    logger.error( 'listLog =>', e );
     return res.sendError( e, 500 );
   }
 };

package/src/controllers/mobileTrax.controller.js

@@ -263,7 +263,7 @@ export async function startChecklist( req, res ) {
           getchecklist[index].questionAnswers[secIndex].questions = questions;
         }
       }
-      let openSearch = JSON.parse( process.env.openSearch );
+      let openSearch = JSON.parse( process.env.OPENSEARCH );
       console.log( 'openSearch', openSearch );
       let inserttraxlogs = {
         client_id: req.user.clientId,
@@ -455,7 +455,7 @@ export async function startTask( req, res ) {
     };
     await checklistLogs.create( logData );
 
-    let openSearch = JSON.parse( process.env.openSearch );
+    let openSearch = JSON.parse( process.env.OPENSEARCH );
     console.log( 'openSearch', openSearch );
     let inserttraxlogs = {
       client_id: req.user.clientId,
@@ -1884,7 +1884,7 @@ export async function submitChecklist( req, res ) {
         if ( requestData.submittype == 'submit' ) {
           updateOpenSearch( req.user, requestData );
 
-          let openSearch = JSON.parse( process.env.openSearch );
+          let openSearch = JSON.parse( process.env.OPENSEARCH );
           console.log( 'openSearch', openSearch );
           let inserttraxlogs = {
             client_id: req.user.clientId,
@@ -2074,7 +2074,7 @@ export async function submitTask( req, res ) {
       if ( submittype == 'submit' ) {
         updateOpenSearchTask( user, requestData );
 
-        let openSearch = JSON.parse( process.env.openSearch );
+        let openSearch = JSON.parse( process.env.OPENSEARCH );
         console.log( 'openSearch', openSearch );
         let inserttraxlogs = {
           client_id: req.user.clientId,

package/src/routes/activityLog.router.js

@@ -1,7 +1,7 @@
 import express from 'express';
 import { isAllowedInternalAPIHandler, isAllowedSessionHandler } from 'tango-app-api-middleware';
 
-export const activityLogRouter = express.Router();
+export const traxActivityLogRouter = express.Router();
 
 import {
   insertLog,
@@ -9,10 +9,10 @@ import {
   listLog,
 } from '../controllers/activityLog.controller.js';
 
-activityLogRouter
+traxActivityLogRouter
     .post( '/insertLog', isAllowedInternalAPIHandler, insertLog )
     .post( '/updateLog', isAllowedInternalAPIHandler, updateLog )
     .post( '/listLog', isAllowedSessionHandler, listLog );
 
 
-export default activityLogRouter;
+export default traxActivityLogRouter;