tango-app-api-store-builder 1.0.0-beta-71 → 1.0.0-beta-72

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-store-builder",
-    "version": "1.0.0-beta-71",
+    "version": "1.0.0-beta-72",
     "description": "storeBuilder",
     "main": "index.js",
     "type": "module",
@@ -24,7 +24,7 @@
         "jszip": "^3.10.1",
         "mongodb": "^6.12.0",
         "nodemon": "^3.1.9",
-        "tango-api-schema": "^2.2.77",
+        "tango-api-schema": "^2.2.94",
         "tango-app-api-middleware": "^3.1.48",
         "winston": "^3.17.0",
         "winston-daily-rotate-file": "^5.0.0",

package/src/controllers/script.controller.js

@@ -1928,6 +1928,8 @@ export async function updatelayoutFeedback( req, res ) {
           },
         ];
 
+        await storeBuilderService.updateOne( { _id: floorDoc._id }, { layoutPolygon: layoutPolygon } );
+
         console.log( layoutPolygon, floorDoc._id );
       }
     }
@@ -1958,3 +1960,16 @@ export async function extractZipFileNames( req, res ) {
     return res.sendError( e.message || 'Internal Server Error', 500 );
   }
 }
+
+export async function updateFixtureFeedback( req, res ) {
+  try {
+    if ( req?.headers?.authorization?.split( ' ' )[1] !== 'hwjXfCD6TgMvc82cuSGZ9bNv9MuXsaiQ6uvx' ) {
+      return res.sendError( 'Unauthorized', 401 );
+    }
+
+    
+  } catch ( e ) {
+    logger.error( { functionName: 'updatelayoutFeedback', error: e } );
+    return res.sendError( e.message || 'Internal Server Error', 500 );
+  }
+}

package/src/controllers/storeBuilder.controller.js

@@ -14,7 +14,7 @@ import * as planoComplianceService from '../service/planoCompliance.service.js';
 import * as planoTaskComplianceService from '../service/planoTask.service.js';
 import * as planoQrConversionRequestService from '../service/planoQrConversionRequest.service.js';
 import * as fixtureConfigService from '../service/fixtureConfig.service.js';
-import * as planoStaticBrandCategoriesService from '../service/planoStaticBrandCategories.service.js';
+import * as planoStaticData from '../service/planoStaticData.service.js';
 
 
 import path from 'path';
@@ -2437,6 +2437,61 @@ export const fixtureQrUpdate = async ( req, res ) => {
   }
 };
 
+export const fixtureQrUpdatev1 = async ( req, res ) => {
+  try {
+    const { fixtureId, date, productQr } = req.body;
+
+    const fixture = await storeFixtureService.findOne( { _id: new mongoose.Types.ObjectId( fixtureId ) }, { _id: 1 } );
+
+    if ( !fixture ) {
+      return res.sendError( { message: 'Invalid fixture Id' }, 400 );
+    }
+
+    const fixtureShelves = await fixtureShelfService.find( { fixtureId: new mongoose.Types.ObjectId( fixtureId ) } );
+
+    let productIndex = 0;
+
+    const complianceData = fixtureShelves.map( ( shelf ) => {
+      const shelfObj = shelf.toObject();
+      const products = shelfObj.shelfCapacity ?
+        Array.from( { length: shelfObj.shelfCapacity }, () => ( {
+          category: shelfObj.sectionName,
+          productIndex: productIndex++,
+          status: 'missing',
+        } ) ) :
+        [];
+
+      return { ...shelfObj, products };
+    } );
+
+    const productMap = new Map();
+    productQr.forEach( ( productCv, i ) => {
+      if ( productCv.parent_brand ) {
+        productMap.set( i, productCv );
+      }
+    } );
+
+    complianceData.forEach( ( shelf ) => {
+      shelf.products.forEach( ( product ) => {
+        const matchedProduct = productMap.get( product.productIndex );
+        if ( matchedProduct && product.category === matchedProduct.parent_brand ) {
+          Object.assign( product, { status: 'proper', barcode: matchedProduct.barcode } );
+        }
+      } );
+    } );
+
+    const currentDate = new Date( date );
+
+    await planoQrConversionRequestService.updateOne( { fixtureId: new mongoose.Types.ObjectId( fixtureId ), date: currentDate }, { status: 'data-received', receivedQr: productQr, processedData: complianceData } );
+
+    res.sendSuccess( complianceData );
+  } catch ( error ) {
+    logger.error( 'fixtureQrUpdate =>', error );
+    return res.sendError( { message: 'Internal Server Error' }, 500 );
+  }
+};
+
+
 export const updateDetailedDistance = async ( req, res ) => {
   try {
     const { floorId, elementNumber, elementType, detailedDistance } = req.body;
@@ -2725,7 +2780,7 @@ export const getFixtureBrands = async ( req, res ) => {
 
     // const [ data ] = sections;
 
-    const brandCategories = await planoStaticBrandCategoriesService.findOne( { } );
+    const brandCategories = await planoStaticData.findOne( { type: 'brandCategory' } );
 
     return res.sendSuccess( brandCategories.toObject().data );
   } catch ( error ) {

package/src/controllers/task.controller.js

@@ -9,6 +9,7 @@ import * as planoTaskService from '../service/planoTask.service.js';
 import * as planoService from '../service/planogram.service.js';
 import * as checklistService from '../service/checklist.service.js';
 import timeZone from 'dayjs/plugin/timezone.js';
+import * as planoProductService from '../service/planoProduct.service.js';
 dayjs.extend( timeZone );
 
 async function createUser( data ) {
@@ -110,6 +111,32 @@ export async function createTask( req, res ) {
     if ( !taskDetails.length ) {
       return res.sendError( 'No data found', 204 );
     }
+    let userEmailList = [ ...new Set( req.body.stores.map( ( ele ) => ele.email ) ) ];
+    for ( let mail of userEmailList ) {
+      let query = [
+        {
+          $addFields: {
+            emailLower: { $toLower: '$email' },
+          },
+        },
+        {
+          $match: {
+            clientId: req.body.clientId,
+            emailLower: mail.toLowerCase(),
+          },
+        },
+      ];
+      userDetails = await userService.aggregate( query );
+      if ( !userDetails.length ) {
+        let userData = {
+          clientId: req.body.clientId,
+          mobileNumber: '',
+          email: mail,
+          userName: mail.split( '@' )[0],
+        };
+        await createUser( userData );
+      }
+    }
     let endDate = dayjs().add( req.body.days, 'day' ).format( 'YYYY-MM-DD' );
     await Promise.all( taskDetails.map( async ( task ) => {
       let data = {
@@ -183,22 +210,22 @@ export async function createTask( req, res ) {
             {
               $match: {
                 clientId: req.body.clientId,
-                email: getUserEmail.email,
+                email: getUserEmail.email.toLowerCase(),
               },
             },
           ];
           userDetails = await userService.aggregate( query );
-          if ( !userDetails.length ) {
-            let userData = {
-              clientId: req.body.clientId,
-              mobileNumber: '',
-              email: getUserEmail.email,
-              userName: getUserEmail.email.split( '@' )[0],
-            };
-            userDetails = await createUser( userData );
-          } else {
-            userDetails = userDetails[0];
-          }
+          // if ( !userDetails.length ) {
+          //   let userData = {
+          //     clientId: req.body.clientId,
+          //     mobileNumber: '',
+          //     email: getUserEmail.email,
+          //     userName: getUserEmail.email.split( '@' )[0],
+          //   };
+          //   userDetails = await createUser( userData );
+          // } else {
+          userDetails = userDetails[0];
+          // }
         }
         let taskData = { ...data };
         taskData.store_id = store.storeId;
@@ -564,3 +591,18 @@ export async function getFixtureDetails( req, res ) {
     return res.sendError( e, 500 );
   }
 }
+
+export async function getVmDetails( req, res ) {
+  try {
+    let getVms = await planoProductService.find( { type: 'vm' }, { productName: 1 } );
+    if ( !getVms.length ) {
+      return res.sendError( 'No data found', 204 );
+    }
+    getVms = [ ...new Set( getVms.map( ( ele ) => ele.productName ) ) ];
+    getVms.push( 'other' );
+    return res.sendSuccess( getVms );
+  } catch ( e ) {
+    logger.error( { functionName: 'getVmDetails', error: e } );
+    return res.sendError( e, 500 );
+  }
+}

package/src/routes/script.routes.js

@@ -18,4 +18,5 @@ scriptRouter
     .post( '/updateRfidProduct2', scriptController.updateRfidProduct2 )
     .post( '/getProdTaskData', scriptController.getProdTaskData )
     .post( '/updateLayoutFeedback', scriptController.updatelayoutFeedback )
+    .post( '/updateFixtureFeedback', scriptController.updateFixtureFeedback )
     .post( '/getFileNames', scriptController.extractZipFileNames );

package/src/routes/storeBuilder.routes.js

@@ -34,6 +34,7 @@ storeBuilderRouter
     .post( '/updateQrCvProcessRequest', isAllowedSessionHandler, storeBuilderController.updateQrCvProcessRequest )
     .post( '/getQrCvProcessRequest', isAllowedSessionHandler, storeBuilderController.getQrCvProcessRequest )
     .post( '/fixtureQrUpdate', isAllowedSessionHandler, storeBuilderController.fixtureQrUpdate )
+    .post( '/fixtureQrUpdatev1', isAllowedSessionHandler, storeBuilderController.fixtureQrUpdatev1 )
     .post( '/updateDeatailedDistance', isAllowedSessionHandler, storeBuilderController.updateDetailedDistance )
     .post( '/upsertFixture', isAllowedSessionHandler, storeBuilderController.upsertFixtures )
     .post( '/getshelfSections', isAllowedSessionHandler, storeBuilderController.getShelfSections )

package/src/routes/task.routes.js

@@ -11,4 +11,5 @@ storeBuilderTaskRouter
     .post( '/uploadImage', isAllowedSessionHandler, taskController.uploadImage )
     .post( '/updateStatus', isAllowedSessionHandler, taskController.updateStatus )
     .post( '/updateAnswers', isAllowedSessionHandler, taskController.updateAnswers )
-    .get( '/getFixtureDetails', isAllowedSessionHandler, taskController.getFixtureDetails );
+    .get( '/getFixtureDetails', isAllowedSessionHandler, taskController.getFixtureDetails )
+    .get( '/getVmDetails', isAllowedSessionHandler, taskController.getVmDetails );

package/src/service/{planoStaticBrandCategories.service.js → planoStaticData.service.js}

@@ -1,8 +1,8 @@
 import model from 'tango-api-schema';
 
 export async function find( query={}, field={} ) {
-  return model.planoStaticBrandCategories.find( query, field );
+  return model.planoStaticData.find( query, field );
 }
 export async function findOne( query={}, field={} ) {
-  return model.planoStaticBrandCategories.findOne( query, field );
+  return model.planoStaticData.findOne( query, field );
 }