tango-app-api-infra 3.8.2 → 3.8.4

package/README.md

@@ -1,29 +1,29 @@
-# README #
-
-This README would normally document whatever steps are necessary to get your application up and running.
-
-### What is this repository for? ###
-
-* Quick summary
-* Version
-* [Learn Markdown](https://bitbucket.org/tutorials/markdowndemo)
-
-### How do I get set up? ###
-
-* Summary of set up
-* Configuration
-* Dependencies
-* Database configuration
-* How to run tests
-* Deployment instructions
-
-### Contribution guidelines ###
-
-* Writing tests
-* Code review
-* Other guidelines
-
-### Who do I talk to? ###
-
-* Repo owner or admin
+# README #
+
+This README would normally document whatever steps are necessary to get your application up and running.
+
+### What is this repository for? ###
+
+* Quick summary
+* Version
+* [Learn Markdown](https://bitbucket.org/tutorials/markdowndemo)
+
+### How do I get set up? ###
+
+* Summary of set up
+* Configuration
+* Dependencies
+* Database configuration
+* How to run tests
+* Deployment instructions
+
+### Contribution guidelines ###
+
+* Writing tests
+* Code review
+* Other guidelines
+
+### Who do I talk to? ###
+
+* Repo owner or admin
 * Other community or team contact

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-infra",
-    "version": "3.8.2",
+    "version": "3.8.4",
     "description": "infra",
     "main": "index.js",
     "type": "module",

package/src/controllers/footfallDirectory.controllers.js

@@ -22,9 +22,11 @@ export async function createTicket( req, res ) {
     inputData.duplicateACCount = 0;
     inputData.employeeACCount = 0;
     inputData.houseKeepingACCount = 0;
-    inputData.houseKeepingCount = inputData.houseKeepingCount || 0;
-    inputData.duplicateCount = inputData.duplicateCount || 0;
-    inputData.employeeCount = inputData.employeeCount || 0;
+    inputData.junkACCount = 0;
+    inputData.houseKeepingCount = inputData?.houseKeepingCount || 0;
+    inputData.duplicateCount = inputData?.duplicateCount || 0;
+    inputData.employeeCount = inputData?.employeeCount || 0;
+    inputData.junkCount = inputData?.junkCount || 0;
     if ( inputData.houseKeepingCount > 0 ) {
       inputData.houseKeepingStatus = 'pending';
     }
@@ -34,6 +36,9 @@ export async function createTicket( req, res ) {
     if ( inputData.duplicateCount > 0 ) {
       inputData.duplicateStatus = 'pending';
     }
+    if ( inputData.junkCount > 0 ) {
+      inputData.junkStatus = 'pending';
+    }
     const id = `${inputData.storeId}_${inputData.dateString}_footfall-directory-tagging`;
     await insertWithId( openSearch.footfallDirectory, id, inputData );
     // update the status of each tempId to the revop-tagging index
@@ -74,7 +79,18 @@ async function bulkUpdateStatusToPending( indexName, inputData ) {
     }
   }
 
-  // 3. Duplicate Images > data[]
+  // 3. junk
+  if ( inputData.junkCount > 0 ) {
+    for ( const emp of inputData.junk || [] ) {
+      const id = `${inputData.storeId}_${inputData.dateString}_${emp.timeRange}_${emp.tempId}`;
+      bulkBody.push(
+          { update: { _index: indexName, _id: id } },
+          { doc: { status: 'pending' } },
+      );
+    }
+  }
+
+  // 4. Duplicate Images > data[]
   if ( inputData.duplicateCount > 0 ) {
     for ( const dup of inputData.duplicateImages || [] ) {
       let updatedDuplicateImages = [];
@@ -163,6 +179,11 @@ export async function ticketSummary( req, res ) {
             field: 'houseKeepingCount',
           },
         },
+        junkCount: {
+          sum: {
+            field: 'junkCount',
+          },
+        },
       },
     };
 
@@ -177,7 +198,8 @@ export async function ticketSummary( req, res ) {
       duplicateCount: aggs.duplicateCount.value,
       employeeCount: aggs.employeeCount.value,
       houseKeepingCount: aggs.houseKeepingCount.value,
-      noShopper: aggs.duplicateCount.value + aggs.employeeCount.value + aggs.houseKeepingCount.value,
+      junkCount: aggs.junkCount.value,
+      noShopper: aggs.duplicateCount.value + aggs.employeeCount.value + aggs.houseKeepingCount.value + aggs.junkCount.value,
     };
 
     return res.sendSuccess( { result: result } );
@@ -283,9 +305,11 @@ export async function ticketList( req, res ) {
         'duplicateCount',
         'employeeCount',
         'houseKeepingCount',
+        'junkCount',
         'employeeACCount',
         'duplicateACCount',
         'houseKeepingACCount',
+        'junkACCount',
         'status',
         'dateString',
       ],
@@ -320,10 +344,12 @@ export async function ticketList( req, res ) {
           'duplicateCount',
           'employeeCount',
           'houseKeepingCount',
+          'junkCount',
           'status',
           'employeeACCount',
           'duplicateACCount',
           'houseKeepingACCount',
+          'junkACCount',
           'dateString',
         ],
         'from': offset,
@@ -352,6 +378,8 @@ export async function ticketList( req, res ) {
           'employeeCount',
           'houseKeepingACCount',
           'houseKeepingCount',
+          'junkCount',
+          'junkACCount',
           'status',
           'dateString',
         ],
@@ -387,8 +415,9 @@ export async function ticketList( req, res ) {
           'Duplicates': item?._source?.status === 'closed'? item._source.duplicateACCount : item._source.duplicateCount,
           'Employee/Staff': item?._source?.status === 'closed'? item._source.employeeACCount : item._source.employeeCount,
           'HouseKeeping': item?._source?.status === 'closed'? item._source.houseKeepingACCount : item._source.houseKeepingCount,
-          'Revised Footfall': item?._source?.status === 'closed'? item._source.footfallCount - ( item._source.duplicateACCount + item._source.employeeACCount + item._source.houseKeepingACCount ) : item._source.footfallCount - ( item._source.duplicateCount + item._source.employeeCount + item._source.houseKeepingCount ),
-          'Ticket%': item?._source?.status === 'closed'?`${Math.round( ( ( item._source.duplicateACCount + item._source.employeeACCount + item._source.houseKeepingACCount )/ item._source.footfallCount )*100 ).toFixed( 0 )} %` : `${Math.round( ( ( item?._source?.duplicateCount + item?._source?.employeeCount + item?._source?.houseKeepingCount )/ item?._source?.footfallCount )*100 ).toFixed( 0 )} %`,
+          'Junk': item?._source?.status === 'closed'? item._source.junkACCount : item._source.junkCount,
+          'Revised Footfall': item?._source?.status === 'closed'? item._source.footfallCount - ( item._source.duplicateACCount + item._source.employeeACCount + item._source.houseKeepingACCount + item._source.junkACCount ) : item._source.footfallCount - ( item._source.duplicateCount + item._source.employeeCount + item._source.houseKeepingCount + item._source.junkCount ),
+          'Ticket%': item?._source?.status === 'closed'?`${Math.round( ( ( item._source.duplicateACCount + item._source.employeeACCount + item._source.houseKeepingACCount + item._source.junkACCount )/ item._source.footfallCount )*100 ).toFixed( 0 )} %` : `${Math.round( ( ( item?._source?.duplicateCount + item?._source?.employeeCount + item?._source?.houseKeepingCount + item._source.junkCount )/ item?._source?.footfallCount )*100 ).toFixed( 0 )} %`,
           'Status': item._source.status,
         } );
       }
@@ -410,7 +439,7 @@ export async function getTickets( req, res ) {
     const skip = inputData.offset == 0 ? 0 : ( inputData.offset - 1 ) * limit || 0;
     inputData.storeId = inputData.storeId.split( ',' ); // convert strig to array
     logger.info( { inputData: inputData, limit: limit, skip: skip } );
-    let source = [ 'storeId', 'dateString', 'ticketName', 'footfallCount', 'employeeCount', 'houseKeepingCount', 'duplicateCount', 'comments', 'employee', 'houseKeeping', 'duplicateImages', 'ticketId', 'clientId', 'storeName', 'createdAt', 'updatedAt', 'userName', 'email', 'role', 'status', 'employeeStatus', 'houseKeepingStatus', 'duplicateStatus', 'houseKeepingACCount', 'houseKeepingCount', 'employeeCount', 'employeeACCount', 'duplicateCount', 'duplicateACCount', 'approverRole', 'approverUserName', 'approverEmail' ];
+    let source = [ 'storeId', 'dateString', 'ticketName', 'footfallCount', 'employeeCount', 'houseKeepingCount', 'duplicateCount', 'junkCount', 'junkACCount', 'comments', 'employee', 'houseKeeping', 'junk', 'duplicateImages', 'ticketId', 'clientId', 'storeName', 'createdAt', 'updatedAt', 'userName', 'email', 'role', 'status', 'employeeStatus', 'houseKeepingStatus', 'duplicateStatus', 'houseKeepingACCount', 'houseKeepingCount', 'employeeCount', 'employeeACCount', 'duplicateCount', 'duplicateACCount', 'approverRole', 'approverUserName', 'approverEmail' ];
     let filter = [
 
       {
@@ -470,6 +499,14 @@ export async function getTickets( req, res ) {
                 gt: 0,
               },
             },
+          } ) :
+              inputData.revopsType === 'junk' ?
+          filter.push( {
+            range: {
+              junkCount: {
+                gt: 0,
+              },
+            },
           } ) :
           filter.push( {
             range: {
@@ -478,9 +515,10 @@ export async function getTickets( req, res ) {
               },
             },
           } );
-      source = inputData.revopsType == 'employee' ? [ 'storeId', 'dateString', 'ticketName', 'footfallCount', 'employeeCount', 'comments', 'employee', 'ticketId', 'clientId', 'storeName', 'createdAt', 'updatedAt', 'email', 'userName', 'role', 'status', 'employeeStatus', 'houseKeepingStatus', 'duplicateStatus', 'houseKeepingACCount', 'houseKeepingCount', 'employeeCount', 'employeeACCount', 'duplicateCoun', 'duplicateACCount', 'approverRole', 'approverUserName', 'approverEmail' ] :
-        inputData.revopsType == 'houseKeeping' ? [ 'storeId', 'dateString', 'ticketName', 'footfallCount', 'houseKeepingCount', 'comments', 'houseKeeping', 'ticketId', 'clientId', 'storeName', 'createdAt', 'updatedAt', 'userName', 'email', 'role', 'status', 'employeeStatus', 'houseKeepingStatus', 'duplicateStatus', 'houseKeepingACCount', 'houseKeepingCount', 'employeeCount', 'employeeACCount', 'duplicateCount', 'duplicateACCount', 'approverRole', 'approverUserName', 'approverEmail' ] :
-          inputData.revopsType == 'duplicateImages' ? [ 'storeId', 'dateString', 'ticketName', 'footfallCount', 'duplicateCount', 'comments', 'duplicateImages', 'ticketId', 'clientId', 'storeName', 'createdAt', 'updatedAt', 'userName', 'email', 'role', 'status', 'employeeStatus', 'houseKeepingStatus', 'duplicateStatus', 'houseKeepingACCount', 'houseKeepingCount', 'employeeCount', 'employeeACCount', 'duplicateCount', 'duplicateACCount', 'approverRole', 'approverUserName', 'approverEmail' ] : [];
+      source = inputData.revopsType == 'employee' ? [ 'storeId', 'dateString', 'ticketName', 'footfallCount', 'employeeCount', 'comments', 'employee', 'ticketId', 'clientId', 'storeName', 'createdAt', 'updatedAt', 'email', 'userName', 'role', 'status', 'employeeStatus', 'houseKeepingStatus', 'duplicateStatus', 'houseKeepingACCount', 'houseKeepingCount', 'employeeCount', 'employeeACCount', 'duplicateCount', 'duplicateACCount', 'junkCount', 'junkStatus', 'junkACCount', 'approverRole', 'approverUserName', 'approverEmail' ] :
+        inputData.revopsType == 'houseKeeping' ? [ 'storeId', 'dateString', 'ticketName', 'footfallCount', 'houseKeepingCount', 'comments', 'houseKeeping', 'ticketId', 'clientId', 'storeName', 'createdAt', 'updatedAt', 'userName', 'email', 'role', 'status', 'employeeStatus', 'houseKeepingStatus', 'duplicateStatus', 'houseKeepingACCount', 'houseKeepingCount', 'employeeCount', 'employeeACCount', 'duplicateCount', 'duplicateACCount', 'junkCount', 'junkStatus', 'junkACCount', 'approverRole', 'approverUserName', 'approverEmail' ] :
+        inputData.revopsType == 'duplicateImages' ? [ 'storeId', 'dateString', 'ticketName', 'footfallCount', 'duplicateCount', 'comments', 'duplicateImages', 'ticketId', 'clientId', 'storeName', 'createdAt', 'updatedAt', 'userName', 'email', 'role', 'status', 'employeeStatus', 'houseKeepingStatus', 'duplicateStatus', 'houseKeepingACCount', 'houseKeepingCount', 'employeeCount', 'employeeACCount', 'duplicateCount', 'duplicateACCount', 'junkCount', 'junkStatus', 'junkACCount', 'approverRole', 'approverUserName', 'approverEmail' ] :
+        inputData.revopsType == 'junk' ? [ 'storeId', 'dateString', 'ticketName', 'footfallCount', 'duplicateCount', 'comments', 'junk', 'ticketId', 'clientId', 'storeName', 'createdAt', 'updatedAt', 'userName', 'email', 'role', 'status', 'employeeStatus', 'houseKeepingStatus', 'duplicateStatus', 'houseKeepingACCount', 'houseKeepingCount', 'employeeCount', 'employeeACCount', 'duplicateCount', 'duplicateACCount', 'junkCount', 'junkACCount', 'junkStatus', 'approverRole', 'approverUserName', 'approverEmail' ] : [];
     }
 
     if ( inputData.action ) {
@@ -508,6 +546,13 @@ export async function getTickets( req, res ) {
                 _name: 'matched_duplicate',
               },
             },
+            {
+              constant_score: {
+                filter: { term: { 'junkStatus.keyword': inputData.action } },
+                boost: 1,
+                _name: 'matched_junk',
+              },
+            },
           ],
           minimum_should_match: 1,
         },
@@ -527,7 +572,7 @@ export async function getTickets( req, res ) {
         aggs: {
           totalCount: {
             sum: {
-              field: inputData.revopsType == 'employee' ? 'employeeCount' : inputData.revopsType == 'houseKeeping' ? 'houseKeepingCount' : 'duplicateCount',
+              field: inputData.revopsType == 'employee' ? 'employeeCount' : inputData.revopsType == 'houseKeeping' ? 'houseKeepingCount' :inputData.revopsType == 'junk' ? 'junkCount': 'duplicateCount',
             },
           },
         },
@@ -586,6 +631,7 @@ export async function getTickets( req, res ) {
           employeeStatus: hit?._source?.employeeStatus,
           houseKeepingStatus: hit?._source?.houseKeepingStatus,
           duplicateStatus: hit?._source?.duplicateStatus,
+          junkStatus: hit?._source?.junkStatus,
           storeName: hit?._source?.storeName,
           ticketId: hit?._source?.ticketId,
           footfallCount: hit?._source?.footfallCount,
@@ -599,14 +645,14 @@ export async function getTickets( req, res ) {
           houseKeepingCount: hit?._source?.houseKeepingCount,
           employeeCount: hit?._source?.employeeCount,
           duplicateCount: hit?._source?.duplicateCount,
+          junkCount: hit?._source?.junkCount,
           houseKeepingACCount: hit?._source?.houseKeepingACCount,
           employeeACCount: hit?._source?.employeeACCount,
           duplicateACCount: hit?._source?.duplicateACCount,
+          junkACCount: hit?._source?.junkACCount,
           approverUserName: hit?._source?.approverUserName,
           approverEmail: hit?._source?.approverEmail,
           approverRole: hit?._source?.approverRole,
-
-
         };
         let result;
 
@@ -621,13 +667,17 @@ export async function getTickets( req, res ) {
         if ( matched.includes( 'matched_housekeeping' )&& ( !inputData.revopsType || inputData.revopsType == 'houseKeeping' ) ) {
           result = defaultData;
           result.houseKeeping = hit?._source?.houseKeeping;
-          // result.type = 'houseKeeping';
           result.matched = matched;
         }
         if ( matched.includes( 'matched_duplicate' )&& ( !inputData.revopsType || inputData.revopsType == 'duplicateImages' ) ) {
           result = defaultData;
           result.duplicateImages = hit?._source?.duplicateImages;
-          // result.type = 'duplicateImages';
+          result.matched = matched;
+        }
+
+        if ( matched.includes( 'matched_junk' )&& ( !inputData.revopsType || inputData.revopsType == 'junk' ) ) {
+          result = defaultData;
+          result.junk = hit?._source?.junk;
           result.matched = matched;
         }
 
@@ -817,6 +867,15 @@ async function extractCheckedTempIds( document ) {
     }
   }
 
+  //  junk
+  if ( source.junkACCount > 0 && Array.isArray( source.junk ) ) {
+    for ( const hk of source.junk ) {
+      if ( hk.isChecked === true ) {
+        result.push( { tempId: hk.tempId, timeRange: hk.timeRange } );
+      }
+    }
+  }
+
   //  Duplicate Images
   if ( source.duplicateACCount > 0 && Array.isArray( source.duplicateImages ) ) {
     for ( const image of source.duplicateImages ) {
@@ -1018,7 +1077,8 @@ export async function getTaggedStores( req, res ) {
                   source: `
                   return (doc.containsKey('duplicateCount') ? doc['duplicateCount'].value : 0)
                        + (doc.containsKey('houseKeepingCount') ? doc['houseKeepingCount'].value : 0)
-                       + (doc.containsKey('employeeCount') ? doc['employeeCount'].value : 0);
+                       + (doc.containsKey('employeeCount') ? doc['employeeCount'].value : 0)
+                         + (doc.containsKey('junkCount') ? doc['junkCount'].value : 0);
               `,
                   lang: 'painless',
                 },
@@ -1066,7 +1126,7 @@ export async function downloadTickets( req, res ) {
     const inputData = req.query;
     const limit = inputData.limit;
     const skip = inputData.offset == 0 ? 0 : ( inputData.offset - 1 ) * limit || 0;
-    let source = [ 'storeId', 'dateString', 'ticketName', 'footfallCount', 'employeeCount', 'houseKeepingCount', 'duplicateCount', 'comments', 'employee', 'houseKeeping', 'duplicateImages', 'ticketId', 'clientId', 'storeName', 'createdAt', 'updatedAt', 'userName', 'role', 'status', 'employeeStatus', 'houseKeepingStatus', 'duplicateStatus' ];
+    let source = [ 'storeId', 'dateString', 'ticketName', 'footfallCount', 'employeeCount', 'houseKeepingCount', 'duplicateCount', 'junkCount', 'comments', 'employee', 'junk', 'houseKeeping', 'duplicateImages', 'ticketId', 'clientId', 'storeName', 'createdAt', 'updatedAt', 'userName', 'role', 'status', 'employeeStatus', 'houseKeepingStatus', 'duplicateStatus', 'junkStatus' ];
     let filter = [
 
       {
@@ -1131,7 +1191,17 @@ export async function downloadTickets( req, res ) {
                 gt: 0,
               },
             },
+
           } ) :
+             inputData.revopsType === 'junk' ?
+          filter.push( {
+            range: {
+              junkCount: {
+                gt: 0,
+              },
+            },
+          } ):
+
           filter.push( {
             range: {
               duplicateCount: {
@@ -1139,9 +1209,10 @@ export async function downloadTickets( req, res ) {
               },
             },
           } );
-      source = inputData.revopsType == 'employee' ? [ 'storeId', 'dateString', 'ticketName', 'footfallCount', 'employeeCount', 'comments', 'employee', 'ticketId', 'clientId', 'storeName', 'createdAt', 'updatedAt', 'userName', 'role', 'status', 'employeeStatus', 'houseKeepingStatus', 'duplicateStatus' ] :
-        inputData.revopsType == 'houseKeeping' ? [ 'storeId', 'dateString', 'ticketName', 'footfallCount', 'houseKeepingCount', 'comments', 'houseKeeping', 'ticketId', 'clientId', 'storeName', 'createdAt', 'updatedAt', 'userName', 'role', 'status', 'employeeStatus', 'houseKeepingStatus', 'duplicateStatus' ] :
-          inputData.revopsType == 'duplicateImages' ? [ 'storeId', 'dateString', 'ticketName', 'footfallCount', 'duplicateCount', 'comments', 'duplicateImages', 'ticketId', 'clientId', 'storeName', 'createdAt', 'updatedAt', 'userName', 'role', 'status', 'employeeStatus', 'houseKeepingStatus', 'duplicateStatus' ] : [];
+      source = inputData.revopsType == 'employee' ? [ 'storeId', 'dateString', 'ticketName', 'footfallCount', 'employeeCount', 'comments', 'employee', 'ticketId', 'clientId', 'storeName', 'createdAt', 'updatedAt', 'userName', 'role', 'status', 'employeeStatus', 'houseKeepingStatus', 'duplicateStatus', 'junkStatus' ] :
+        inputData.revopsType == 'houseKeeping' ? [ 'storeId', 'dateString', 'ticketName', 'footfallCount', 'houseKeepingCount', 'comments', 'houseKeeping', 'ticketId', 'clientId', 'storeName', 'createdAt', 'updatedAt', 'userName', 'role', 'status', 'employeeStatus', 'houseKeepingStatus', 'duplicateStatus', 'junkStatus' ] :
+          inputData.revopsType == 'duplicateImages' ? [ 'storeId', 'dateString', 'ticketName', 'footfallCount', 'duplicateCount', 'comments', 'duplicateImages', 'ticketId', 'clientId', 'storeName', 'createdAt', 'updatedAt', 'userName', 'role', 'status', 'employeeStatus', 'houseKeepingStatus', 'duplicateStatus', 'junkStatus' ] :
+          inputData.revopsType == 'junk' ? [ 'storeId', 'dateString', 'ticketName', 'footfallCount', 'junkCount', 'comments', 'junk', 'ticketId', 'clientId', 'storeName', 'createdAt', 'updatedAt', 'userName', 'role', 'status', 'employeeStatus', 'houseKeepingStatus', 'duplicateStatus', 'junkStatus' ] : [];
     }
 
     if ( inputData.action ) {
@@ -1169,6 +1240,13 @@ export async function downloadTickets( req, res ) {
                 _name: 'matched_duplicate',
               },
             },
+            {
+              constant_score: {
+                filter: { term: { 'junkStatus.keyword': inputData.action } },
+                boost: 1,
+                _name: 'matched_junk',
+              },
+            },
           ],
           minimum_should_match: 1,
         },
@@ -1216,6 +1294,7 @@ export async function downloadTickets( req, res ) {
           dateString: hit?._source?.dateString,
           ticketName: hit?._source?.ticketName,
           status: hit?._source?.status,
+          junkStatus: hit?._source?.junkStatus,
           employeeStatus: hit?._source?.employeeStatus,
           houseKeepingStatus: hit?._source?.houseKeepingStatus,
           duplicateStatus: hit?._source?.duplicateStatus,
@@ -1244,18 +1323,20 @@ export async function downloadTickets( req, res ) {
           logger.info( { revop: inputData.revopsType } );
           result = defaultData;
           result.houseKeeping = hit?._source?.houseKeeping;
-          // result.type = 'houseKeeping';
           result.matched = matched;
         }
         if ( matched.includes( 'matched_duplicate' )&& ( !inputData.revopsType || inputData.revopsType == 'duplicateImages' ) ) {
           logger.info( { revop: inputData.revopsType } );
           result = defaultData;
           result.duplicateImages = hit?._source?.duplicateImages;
-          // result.type = 'duplicateImages';
+          result.matched = matched;
+        }
+        if ( matched.includes( 'matched_junk' )&& ( !inputData.revopsType || inputData.revopsType == 'junk' ) ) {
+          result = defaultData;
+          result.junk = hit?._source?.junk;
           result.matched = matched;
         }
         if ( result ) {
-          logger.info( { revop: inputData.revopsType, result: result } );
           const nested = [
             {
               _id: hit._id,
@@ -1359,6 +1440,13 @@ async function extractTempIds( document ) {
     }
   }
 
+  //  junk
+  if ( Array.isArray( source.junk ) ) {
+    for ( const hk of source.junk ) {
+      result.push( hk.filePath );
+    }
+  }
+
   //  Duplicate Images
   if ( Array.isArray( source.duplicateImages ) ) {
     for ( const image of source.duplicateImages ) {

package/src/dtos/footfallDirectory.dtos.js

@@ -10,6 +10,7 @@ export const createTicketSchema = Joi.object().keys( {
   duplicateCount: Joi.number().optional(),
   employeeCount: Joi.number().optional(),
   houseKeepingCount: Joi.number().optional(),
+  junkCount: Joi.number().optional(),
   comments: Joi.string().optional().allow( '' ),
   duplicateImages: Joi.array().items(
       Joi.object( {
@@ -50,6 +51,16 @@ export const createTicketSchema = Joi.object().keys( {
 
   } ) ).optional(),
 
+  junk: Joi.array().items( Joi.object( {
+    tempId: Joi.number().required(),
+    filePath: Joi.string().required(),
+    entryTime: Joi.string().required(),
+    exitTime: Joi.string().required(),
+    timeRange: Joi.string().required(),
+    isChecked: Joi.boolean().required(),
+
+  } ) ).optional(),
+
 
 } );