tango-app-api-store-builder 1.0.0-beta-104 → 1.0.0-beta-105

package/package.json

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

package/src/controllers/managePlano.controller.js

@@ -23,6 +23,57 @@ export async function getplanoFeedback( req, res ) {
       $match: {
         planoId: new mongoose.Types.ObjectId( req.body.planoId ),
         floorId: new mongoose.Types.ObjectId( req.body.floorId ),
+        type: 'layout',
+      },
+    },
+    {
+      $lookup: {
+        from: 'processedtasks',
+        let: { 'taskId': '$taskId' },
+        pipeline: [
+          {
+            $match: {
+              $expr: {
+                $and: [
+                  { $eq: [ '$_id', '$$taskId' ] },
+                ],
+              },
+            },
+          },
+          {
+            $project: {
+              'userName': 1,
+              'createdAt': 1,
+              'createdByName': 1,
+              'submitTime_string': 1,
+            },
+          },
+        ],
+        as: 'taskData',
+      },
+
+    }, { $unwind: { path: '$taskData', preserveNullAndEmptyArrays: true } },
+    );
+
+
+    let findPlanoCompliance = await planoTaskService.aggregate( query );
+
+    res.sendSuccess( findPlanoCompliance );
+  } catch ( e ) {
+    logger.error( { functionName: 'getplanoFeedback', error: e, message: req.body } );
+    return res.sendError( e, 500 );
+  }
+}
+export async function getStoreFixturesfeedback( req, res ) {
+  try {
+    let query = [];
+
+
+    query.push( {
+      $match: {
+        planoId: new mongoose.Types.ObjectId( req.body.planoId ),
+        floorId: new mongoose.Types.ObjectId( req.body.floorId ),
+        type: { $ne: 'layout' },
       },
     },
     {
@@ -77,10 +128,10 @@ export async function getplanoFeedback( req, res ) {
 
 
     let findPlanoCompliance = await planoTaskService.aggregate( query );
-    console.log( findPlanoCompliance );
-    res.sendSuccess( findPlanoCompliance );
+    console.log( findPlanoCompliance.length );
+    res.sendSuccess( { count: findPlanoCompliance.length, data: findPlanoCompliance } );
   } catch ( e ) {
-    logger.error( { functionName: 'getplanoFeedback', error: e, message: req.body } );
+    logger.error( { functionName: 'getplanoFeedbackFixture', error: e, message: req.body } );
     return res.sendError( e, 500 );
   }
 }

package/src/controllers/task.controller.js

@@ -250,6 +250,7 @@ export async function createTask( req, res ) {
             taskData.userName = userDetails.userName;
             taskData.userEmail = userDetails.email;
             taskData.planoId = planoDetails?._id;
+            console.log( taskData );
             for ( let i=0; i<req.body.days; i++ ) {
               let currDate = dayjs().add( i, 'day' );
               let insertData = { ...taskData, date_string: currDate.format( 'YYYY-MM-DD' ), date_iso: new Date( currDate.format( 'YYYY-MM-DD' ) ), scheduleStartTime_iso: dayjs.utc( `${currDate.format( 'YYYY-MM-DD' )} 12:00 AM`, 'YYYY-MM-DD hh:mm A' ).format() };

package/src/routes/managePlano.routes.js

@@ -8,6 +8,7 @@ export const managePlanoRouter = express.Router();
 managePlanoRouter
     .post( '/updateStorePlano', managePlanoController.updateStorePlano )
     .post( '/getplanoFeedback', managePlanoController.getplanoFeedback )
+    .post( '/getStoreFixturesfeedback', managePlanoController.getStoreFixturesfeedback )
     .get( '/fixtureList', managePlanoController.fixtureList )
     .get( '/templateList', managePlanoController.templateList )
     .get( '/fixtureBrandsList', managePlanoController.fixtureBrandsList )

package/src/service/fixtureConfig.service.js

@@ -5,7 +5,7 @@ export async function find( query={}, field={} ) {
 }
 
 export async function findOne( query={}, field={} ) {
-  return model.fixtureConfigModel.findOne( query, field );
+  return model.fixtureCpaconfigModel.findOne( query, field );
 }
 
 export async function insertMany( data = [] ) {