tango-app-api-store-builder 1.0.0-beta-172 → 1.0.0-beta-173

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-172",
3
+ "version": "1.0.0-beta-173",
4
4
  "description": "storeBuilder",
5
5
  "main": "index.js",
6
6
  "type": "module",
@@ -4563,6 +4563,16 @@ export async function getRolloutDetails( req, res ) {
4563
4563
  fixtureCount: { $sum: 1 },
4564
4564
  vmCount: { $sum: { $size: '$vmConfig' } },
4565
4565
  fixtureCapacity: { $sum: '$fixtureCapacity' },
4566
+ merchEditedCount: { $sum: { $cond: {
4567
+ if: { $eq: [ '$isMerchEdited', true ] },
4568
+ then: 1,
4569
+ else: 0,
4570
+ } } },
4571
+ vmEditedCount: { $sum: { $cond: {
4572
+ if: { $eq: [ '$isVmEdited', true ] },
4573
+ then: 1,
4574
+ else: 0,
4575
+ } } },
4566
4576
  },
4567
4577
  },
4568
4578
  ],
@@ -4585,6 +4595,8 @@ export async function getRolloutDetails( req, res ) {
4585
4595
  storeId: 1,
4586
4596
  storeName: 1,
4587
4597
  lastUpdate: '$updatedAt',
4598
+ merchEditedCount: '$fixtureDetails.merchEditedCount',
4599
+ vmEditedCount: '$fixtureDetails.vmEditedCount',
4588
4600
  },
4589
4601
  },
4590
4602
  {
@@ -4899,13 +4911,23 @@ export async function getRolloutDetails( req, res ) {
4899
4911
  {
4900
4912
  $and: [
4901
4913
  { taskDetails: { $elemMatch: { type: 'merchRollout', status: 'submit' } } },
4902
- { 'taskFeedback.fixtureStatus': 'disagree' },
4914
+ { $or: [
4915
+ { 'taskFeedback.fixtureStatus': 'disagree' },
4916
+ { $and: [ { merchEditedCount: { $ne: 0 } }, { $expr: {
4917
+ $eq: [ { $size: { $objectToArray: '$taskFeedback' } }, 0 ],
4918
+ } } ] },
4919
+ ] },
4903
4920
  ],
4904
4921
  },
4905
4922
  {
4906
4923
  $and: [
4907
4924
  { taskDetails: { $elemMatch: { type: 'vmRollout', status: 'submit' } } },
4908
- { 'taskFeedback.vmStatus': 'disagree' },
4925
+ { $or: [
4926
+ { 'taskFeedback.vmStatus': 'disagree' },
4927
+ { $and: [ { vmEditedCount: { $ne: 0 } }, { $expr: {
4928
+ $eq: [ { $size: { $objectToArray: '$taskFeedback' } }, 0 ],
4929
+ } } ] },
4930
+ ] },
4909
4931
  ],
4910
4932
  },
4911
4933
  );
@@ -4939,8 +4961,8 @@ export async function getRolloutDetails( req, res ) {
4939
4961
  $and: [
4940
4962
  {
4941
4963
  $or: [
4942
- { taskDetails: { $elemMatch: { type: 'merchRollout', status: 'submit' } } },
4943
- { taskDetails: { $elemMatch: { type: 'vmRollout', status: 'submit' } } },
4964
+ { $and: [ { taskDetails: { $elemMatch: { type: 'merchRollout', status: 'submit' } } }, { merchEditedCount: 0 } ] },
4965
+ { $and: [ { taskDetails: { $elemMatch: { type: 'vmRollout', status: 'submit' } } }, { vmEditedCount: 0 } ] },
4944
4966
  ],
4945
4967
  },
4946
4968
  {