tango-app-api-store-builder 1.0.0-beta-36 → 1.0.0-beta-38
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "tango-app-api-store-builder",
|
|
3
|
-
"version": "1.0.0-beta-
|
|
3
|
+
"version": "1.0.0-beta-38",
|
|
4
4
|
"description": "storeBuilder",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"type": "module",
|
|
@@ -23,7 +23,7 @@
|
|
|
23
23
|
"joi": "^17.13.3",
|
|
24
24
|
"mongodb": "^6.12.0",
|
|
25
25
|
"nodemon": "^3.1.9",
|
|
26
|
-
"tango-api-schema": "^2.2.
|
|
26
|
+
"tango-api-schema": "^2.2.62",
|
|
27
27
|
"tango-app-api-middleware": "^3.1.48",
|
|
28
28
|
"winston": "^3.17.0",
|
|
29
29
|
"winston-daily-rotate-file": "^5.0.0"
|
|
@@ -614,9 +614,19 @@ export async function storeFixturesv1( req, res ) {
|
|
|
614
614
|
} ),
|
|
615
615
|
);
|
|
616
616
|
|
|
617
|
+
let fixtureStatus;
|
|
618
|
+
|
|
619
|
+
const cvProcessStatus = await planoQrConversionRequestService.count( { fixtureId: fixture._id, date: currentDate, status: 'initiated' } );
|
|
620
|
+
|
|
621
|
+
if ( cvProcessStatus ) {
|
|
622
|
+
fixtureStatus = 'inprogress';
|
|
623
|
+
} else {
|
|
624
|
+
fixtureStatus = complianceCount === 0 ? '' : complianceCount === productCount ? 'complete' : 'incomplete';
|
|
625
|
+
}
|
|
626
|
+
|
|
617
627
|
return {
|
|
618
628
|
...fixture.toObject(),
|
|
619
|
-
status:
|
|
629
|
+
status: fixtureStatus,
|
|
620
630
|
shelfCount: shelves.length,
|
|
621
631
|
productCount: productCount,
|
|
622
632
|
vmCount: vmCount,
|
|
@@ -682,9 +692,19 @@ export async function storeFixturesv1( req, res ) {
|
|
|
682
692
|
} ),
|
|
683
693
|
);
|
|
684
694
|
|
|
695
|
+
let fixtureStatus;
|
|
696
|
+
|
|
697
|
+
const cvProcessStatus = await planoQrConversionRequestService.count( { fixtureId: fixture._id, date: currentDate, status: 'initiated' } );
|
|
698
|
+
|
|
699
|
+
if ( cvProcessStatus ) {
|
|
700
|
+
fixtureStatus = 'inprogress';
|
|
701
|
+
} else {
|
|
702
|
+
fixtureStatus = complianceCount === 0 ? '' : complianceCount === productCount ? 'complete' : 'incomplete';
|
|
703
|
+
}
|
|
704
|
+
|
|
685
705
|
return {
|
|
686
706
|
...fixture.toObject(),
|
|
687
|
-
status:
|
|
707
|
+
status: fixtureStatus,
|
|
688
708
|
shelfCount: shelves.shelves,
|
|
689
709
|
productCount: productCount,
|
|
690
710
|
vmCount: vmCount,
|
|
@@ -2171,7 +2191,7 @@ export const updateQrCvProcessRequest = async ( req, res ) => {
|
|
|
2171
2191
|
'fixtureId': fixtureId,
|
|
2172
2192
|
'date': dayjs().format( 'YYYY-MM-DD' ),
|
|
2173
2193
|
'bucket': bucket.storeBuilder,
|
|
2174
|
-
'videoPath': videoPath,
|
|
2194
|
+
'videoPath': videoPath ? videoPath.match( /planoQrFixtureVideos\/[^?]+/ )?.[0] : undefined,
|
|
2175
2195
|
};
|
|
2176
2196
|
|
|
2177
2197
|
const sqs = JSON.parse( process.env.SQS || '{}' );
|
|
@@ -2208,7 +2228,6 @@ export const updateQrCvProcessRequest = async ( req, res ) => {
|
|
|
2208
2228
|
},
|
|
2209
2229
|
};
|
|
2210
2230
|
|
|
2211
|
-
|
|
2212
2231
|
await planoQrConversionRequestService.upsertOne( { fixtureId: fixtureData?._id, date: currentDate }, data );
|
|
2213
2232
|
|
|
2214
2233
|
return res.sendSuccess( { message: 'Updated successfully', data } );
|