tango-app-api-store-builder 1.0.0-beta-65 → 1.0.0-beta-67

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-store-builder",
-    "version": "1.0.0-beta-65",
+    "version": "1.0.0-beta-67",
     "description": "storeBuilder",
     "main": "index.js",
     "type": "module",

package/src/controllers/script.controller.js

@@ -8,12 +8,12 @@ import * as storeFixtureService from '../service/storeFixture.service.js';
 import * as fixtureShelfService from '../service/fixtureShelf.service.js';
 import * as planoProductService from '../service/planoProduct.service.js';
 import * as planoMappingService from '../service/planoMapping.service.js';
+import * as planoTaskService from '../service/planoTask.service.js';
 // 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 mongoose from 'mongoose';
-import model from 'tango-api-schema';
 
 export async function getStoreNames( req, res ) {
   try {
@@ -1760,82 +1760,14 @@ export async function getProdTaskData( req, res ) {
       return res.sendError( 'Unauthorized', 401 );
     }
 
-    const db = mongoose.createConnection( 'mongodb+srv://tango-api-production:5TdxKKSkZiRVtjta@production.qc4rw.mongodb.net/tango-retail?authSource=admin', {
-      useNewUrlParser: true,
-      useUnifiedTopology: true,
-    } );
-
-    const planoModel = db.model( 'planogram', model.planogramModel.schema );
-
-    const planoData = await planoModel.findOne( { storeName: req.body.store } );
 
-    const planoTaskModel = db.model( 'planotaskcompliance', model.planoTaskCompliance.schema );
+    const planoData = await planoService.findOne( { storeName: req.body.store } );
 
-    let fixtureDetails = await planoTaskModel.find( { planoId: planoData.toObject()._id, type: req.body.type } );
+    let fixtureDetails = await planoTaskService.find( { planoId: planoData.toObject()._id, type: req.body.type } );
     if ( !fixtureDetails ) {
       return res.sendError( 'No data found', 204 );
     }
 
-    // for ( let i = 0; i < fixtureDetails.length; i++ ) {
-    //   const data = await Promise.all( fixtureDetails?.[i].answers.map( async ( ans ) => {
-    //     if ( ans?.correctedFixture?.length ) {
-    //       for ( let fixture of ans.correctedFixture ) {
-    //         if ( fixture.image ) {
-    //           let params = {
-    //             Bucket: JSON.parse( process.env.BUCKET ).storeBuilder,
-    //             file_path: fixture.image,
-    //           };
-    //           fixture.image = await signedUrl( params );
-    //         }
-    //         if ( fixture.video ) {
-    //           let params = {
-    //             Bucket: JSON.parse( process.env.BUCKET ).storeBuilder,
-    //             file_path: fixture.video,
-    //           };
-    //           fixture.video = await signedUrl( params );
-    //         }
-    //       }
-    //     }
-    //     if ( ans?.newVms?.length ) {
-    //       for ( let fixture of ans.newVms ) {
-    //         if ( fixture.imageUrl ) {
-    //           let params = {
-    //             Bucket: JSON.parse( process.env.BUCKET ).storeBuilder,
-    //             file_path: fixture.imageUrl,
-    //           };
-    //           fixture.imageUrl = await signedUrl( params );
-    //         }
-    //         if ( fixture.video ) {
-    //           let params = {
-    //             Bucket: JSON.parse( process.env.BUCKET ).storeBuilder,
-    //             file_path: fixture.video,
-    //           };
-    //           fixture.video = await signedUrl( params );
-    //         }
-    //       }
-    //     }
-    //     if ( ans.image ) {
-    //       let params = {
-    //         Bucket: JSON.parse( process.env.BUCKET ).storeBuilder,
-    //         file_path: ans.image,
-    //       };
-    //       let imageUrl = await signedUrl( params );
-    //       ans.image = imageUrl;
-    //     }
-    //     if ( ans.video ) {
-    //       let params = {
-    //         Bucket: JSON.parse( process.env.BUCKET ).storeBuilder,
-    //         file_path: ans.video,
-    //       };
-    //       let imageUrl = await signedUrl( params );
-    //       ans.video = imageUrl;
-    //     }
-    //     return ans;
-    //   } ) );
-    //   fixtureDetails[i].answers = data;
-    // }
-
-
     return res.sendSuccess( fixtureDetails );
   } catch ( e ) {
     logger.error( { functionName: 'getProdTaskData', error: e } );

package/src/controllers/task.controller.js

@@ -471,7 +471,7 @@ export async function updateAnswers( req, res ) {
       type: req.body.type,
     };
 
-    await planoTaskService.updateOne( { fixtureId: req.body.fixtureId, type: req.body.type }, data );
+    await planoTaskService.updateOne( { planoId: req.body.planoId, floorId: req.body.floorId, fixtureId: req.body.fixtureId, type: req.body.type, date_string: dayjs().format( 'YYYY-MM-DD' ) }, data );
     return res.sendSuccess( 'Fixture details updated successfully' );
   } catch ( e ) {
     logger.error( { functionName: 'updateAnswers', error: e } );

package/src/routes/script.routes.js

@@ -16,4 +16,4 @@ scriptRouter
     .post( '/updateinventory', scriptController.updateInventory )
     .post( '/updateRfidProduct', scriptController.updateRfidProduct )
     .post( '/updateRfidProduct2', scriptController.updateRfidProduct2 )
-    .post('/getProdTaskData', scriptController.getProdTaskData );
+    .post( '/getProdTaskData', scriptController.getProdTaskData );

package/src/service/planoTask.service.js

@@ -12,6 +12,10 @@ export async function findOne( query={}, field={} ) {
   return model.planoTaskCompliance.findOne( query, field );
 }
 
+export async function find( query={}, field={} ) {
+  return model.planoTaskCompliance.find( query, field );
+}
+
 export async function count( data ) {
   return model.planoTaskCompliance.countDocuments( data );
 }