tango-app-api-store-builder 1.0.0-beta-119 → 1.0.0-beta-120

package/package.json

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

package/src/controllers/managePlano.controller.js

@@ -504,83 +504,82 @@ export async function updateFixtureStatus( req, res ) {
   }
 }
 
-export async function updateStoreFixture(req, res) {
+export async function updateStoreFixture( req, res ) {
   try {
     const { fixtureId, data } = req.body;
 
-    const currentFixture = await storeFixtureService.findOne({ _id: new mongoose.Types.ObjectId(fixtureId) });
-    let currentFixtureDoc = currentFixture.toObject()
+    const currentFixture = await storeFixtureService.findOne( { _id: new mongoose.Types.ObjectId( fixtureId ) } );
+    let currentFixtureDoc = currentFixture.toObject();
 
     const productBrandName = new Set();
     const productCategory = new Set();
     const productSubCategory = new Set();
 
-      data.shelfConfig.forEach((shelf) => {
-  const { productBrandName: brand, productCategory: category, productSubCategory: subCategory } = shelf;
+    data.shelfConfig.forEach( ( shelf ) => {
+      const { productBrandName: brand, productCategory: category, productSubCategory: subCategory } = shelf;
 
-  if (Array.isArray(brand)) {
-    brand.forEach((b) => productBrandName.add(b));
-  }
+      if ( Array.isArray( brand ) ) {
+        brand.forEach( ( b ) => productBrandName.add( b ) );
+      }
 
-  if (Array.isArray(category)) {
-    category.forEach((c) => productCategory.add(c));
-  }
+      if ( Array.isArray( category ) ) {
+        category.forEach( ( c ) => productCategory.add( c ) );
+      }
 
-  if (Array.isArray(subCategory)) {
-    subCategory.forEach((s) => productSubCategory.add(s));
-  }
-});
-    
+      if ( Array.isArray( subCategory ) ) {
+        subCategory.forEach( ( s ) => productSubCategory.add( s ) );
+      }
+    } );
 
-    if (currentFixtureDoc.fixtureConfigId.toString() !== data.fixtureConfigId) {
-      const newTemplate = await fixtureConfigService.findOne({_id: new mongoose.Types.ObjectId(data.fixtureConfigId) })
+
+    if ( currentFixtureDoc.fixtureConfigId.toString() !== data.fixtureConfigId ) {
+      const newTemplate = await fixtureConfigService.findOne( { _id: data.fixtureConfigId } );
       currentFixtureDoc = {
         ...currentFixtureDoc,
         ...newTemplate.toObject(),
-        fixtureConfigId:newTemplate.toObject()._id,
-        productBrandName:[...productBrandName],
-        productCategory:[...productCategory],
-        productSubCategory:[...productSubCategory]
-      }
-    }else{
+        fixtureConfigDoc: newTemplate.toObject()._id,
+        productBrandName: [ ...productBrandName ],
+        productCategory: [ ...productCategory ],
+        productSubCategory: [ ...productSubCategory ],
+      };
+    } else {
       currentFixtureDoc = {
         ...currentFixtureDoc,
         ...data,
-        productBrandName:[...productBrandName],
-        productCategory:[...productCategory],
-        productSubCategory:[...productSubCategory]
-      }
+        productBrandName: [ ...productBrandName ],
+        productCategory: [ ...productCategory ],
+        productSubCategory: [ ...productSubCategory ],
+      };
     }
 
-    delete currentFixtureDoc._id
+    delete currentFixtureDoc._id;
 
 
-    await storeFixtureService.updateOne({ _id: new mongoose.Types.ObjectId(fixtureId) }, currentFixtureDoc);
+    await storeFixtureService.updateOne( { _id: new mongoose.Types.ObjectId( fixtureId ) }, currentFixtureDoc );
 
-        if (data?.shelfConfig?.length) {
-      await fixtureShelfService.deleteMany({ fixtureId: new mongoose.Types.ObjectId(fixtureId) })
+    if ( data?.shelfConfig?.length ) {
+      await fixtureShelfService.deleteMany( { fixtureId: new mongoose.Types.ObjectId( fixtureId ) } );
 
 
-      data.shelfConfig.forEach(async (shelf) => {
-        delete shelf?._id
+      data.shelfConfig.forEach( async ( shelf ) => {
+        delete shelf?._id;
         const additionalMeta = {
-        clientId: currentFixture.clientId,
-        storeId: currentFixture.storeId,
-        storeName: currentFixture.storeName,
-        planoId: currentFixture.planoId,
-        floorId: currentFixture.floorId,
-        fixtureId: currentFixture._id,
-      }
-
-      await fixtureShelfService.create({ ...additionalMeta, ...shelf });
-      });
+          clientId: currentFixture.clientId,
+          storeId: currentFixture.storeId,
+          storeName: currentFixture.storeName,
+          planoId: currentFixture.planoId,
+          floorId: currentFixture.floorId,
+          fixtureId: currentFixture._id,
+        };
 
+        await fixtureShelfService.create( { ...additionalMeta, ...shelf } );
+      } );
     }
 
-    res.sendSuccess('Updated Successfully');
-  } catch (e) {
-    logger.error({ functionName: 'updateStoreFixture', error: e });
-    return res.sendError(e, 500);
+    res.sendSuccess( 'Updated Successfully' );
+  } catch ( e ) {
+    logger.error( { functionName: 'updateStoreFixture', error: e } );
+    return res.sendError( e, 500 );
   }
 }
 

package/src/controllers/storeBuilder.controller.js

@@ -3054,7 +3054,7 @@ export async function storeFixturesTaskv2( req, res ) {
                               status: compliance?.status ? compliance.status : '',
                               shelfCount: shelves.length,
                               productCount: productCount,
-                              disabled: disabled,
+                              disabled: req?.body?.redo ? disabled : false,
                               vmCount: vmCount,
                               shelfConfig: shelfDetails,
                               vmConfig: vmDetails,
@@ -3143,7 +3143,7 @@ export async function storeFixturesTaskv2( req, res ) {
                         status: compliance?.status ? compliance.status : '',
                         shelfCount: shelves.shelves,
                         productCount: productCount,
-                        disabled: disabled,
+                        disabled: req?.body?.redo ? disabled : false,
                         vmCount: vmCount,
                         shelfConfig: shelfDetails,
                         vms: vmDetails,

package/src/controllers/task.controller.js

@@ -414,12 +414,12 @@ export async function uploadImage( req, res ) {
     if ( !req.files.file ) {
       return res.sendError( 'Please upload a file', 400 );
     }
-
+    console.log( req.files );
     let params = {
       Bucket: JSON.parse( process.env.BUCKET ).storeBuilder,
       Key: `${req.body.taskId}/${req.body.qno}/${Date.now()}/`,
       fileName: req.files.file.name,
-      ContentType: req.files.file.mimeType,
+      ContentType: req.files.file.mimeType?req.files.file.mimeType:req.files.file.mimetypes,
       body: req.files.file.data,
     };
     let fileRes = await fileUpload( params );