Skip to content

Commit 7c17334

Browse files
authored
CCM-19310: Update constraint operators to LESS_THAN_OR_EQUAL (#63)
* Update constraints operators to LESS_THAN_OR_EQUAL in event envelope and tests * Roll back formatting change to events package
1 parent 7303274 commit 7c17334

3 files changed

Lines changed: 27 additions & 21 deletions

File tree

packages/excel-parser/src/__tests__/parse-excel.letter-variants.test.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ describe("parse-excel letter variants", () => {
5555
});
5656

5757
expect(result.variants["variant-with-constraints"]?.constraints).toEqual({
58-
sheets: { value: 8, operator: "LESS_THAN" },
59-
deliveryDays: { value: 3, operator: "LESS_THAN" },
58+
sheets: { value: 8, operator: "LESS_THAN_OR_EQUAL" },
59+
deliveryDays: { value: 3, operator: "LESS_THAN_OR_EQUAL" },
6060
});
6161
});
6262

@@ -366,9 +366,9 @@ describe("parse-excel letter variants", () => {
366366
});
367367

368368
expect(result.variants["variant-with-sides"]?.constraints).toEqual({
369-
sheets: { value: 8, operator: "LESS_THAN" },
370-
sides: { value: 16, operator: "LESS_THAN" },
371-
deliveryDays: { value: 3, operator: "LESS_THAN" },
369+
sheets: { value: 8, operator: "LESS_THAN_OR_EQUAL" },
370+
sides: { value: 16, operator: "LESS_THAN_OR_EQUAL" },
371+
deliveryDays: { value: 3, operator: "LESS_THAN_OR_EQUAL" },
372372
});
373373
});
374374
});

packages/excel-parser/src/__tests__/parse-excel.pack-specifications.test.ts

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,13 @@ describe("parse-excel pack specifications", () => {
5858
});
5959

6060
expect(result.packs["pack-with-constraints"]?.constraints).toEqual({
61-
sheets: { value: 10, operator: "LESS_THAN" },
62-
deliveryDays: { value: 5, operator: "LESS_THAN" },
63-
blackCoveragePercentage: { value: 80.5, operator: "LESS_THAN" },
64-
colourCoveragePercentage: { value: 50.25, operator: "LESS_THAN" },
61+
sheets: { value: 10, operator: "LESS_THAN_OR_EQUAL" },
62+
deliveryDays: { value: 5, operator: "LESS_THAN_OR_EQUAL" },
63+
blackCoveragePercentage: { value: 80.5, operator: "LESS_THAN_OR_EQUAL" },
64+
colourCoveragePercentage: {
65+
value: 50.25,
66+
operator: "LESS_THAN_OR_EQUAL",
67+
},
6568
});
6669
});
6770

@@ -432,7 +435,7 @@ describe("parse-excel pack specifications", () => {
432435
});
433436

434437
expect(result.packs["pack-partial-1"]?.constraints).toEqual({
435-
sheets: { value: 15, operator: "LESS_THAN" },
438+
sheets: { value: 15, operator: "LESS_THAN_OR_EQUAL" },
436439
});
437440
});
438441

@@ -450,7 +453,7 @@ describe("parse-excel pack specifications", () => {
450453
});
451454

452455
expect(result.packs["pack-partial-2"]?.constraints).toEqual({
453-
deliveryDays: { value: 7, operator: "LESS_THAN" },
456+
deliveryDays: { value: 7, operator: "LESS_THAN_OR_EQUAL" },
454457
});
455458
});
456459

@@ -469,8 +472,11 @@ describe("parse-excel pack specifications", () => {
469472
});
470473

471474
expect(result.packs["pack-partial-3"]?.constraints).toEqual({
472-
blackCoveragePercentage: { value: 90.5, operator: "LESS_THAN" },
473-
colourCoveragePercentage: { value: 60.25, operator: "LESS_THAN" },
475+
blackCoveragePercentage: { value: 90.5, operator: "LESS_THAN_OR_EQUAL" },
476+
colourCoveragePercentage: {
477+
value: 60.25,
478+
operator: "LESS_THAN_OR_EQUAL",
479+
},
474480
});
475481
});
476482

@@ -677,9 +683,9 @@ describe("parse-excel pack specifications", () => {
677683
});
678684

679685
expect(result.packs["pack-with-sides"]?.constraints).toEqual({
680-
sheets: { value: 10, operator: "LESS_THAN" },
681-
sides: { value: 20, operator: "LESS_THAN" },
682-
deliveryDays: { value: 5, operator: "LESS_THAN" },
686+
sheets: { value: 10, operator: "LESS_THAN_OR_EQUAL" },
687+
sides: { value: 20, operator: "LESS_THAN_OR_EQUAL" },
688+
deliveryDays: { value: 5, operator: "LESS_THAN_OR_EQUAL" },
683689
});
684690
});
685691

packages/excel-parser/src/parse-excel.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -167,35 +167,35 @@ function parseConstraints(row: {
167167
if (row["constraints.sheets"]) {
168168
constraints.sheets = {
169169
value: Number.parseInt(row["constraints.sheets"], 10),
170-
operator: "LESS_THAN",
170+
operator: "LESS_THAN_OR_EQUAL",
171171
};
172172
hasConstraints = true;
173173
}
174174
if (row["constraints.sides"]) {
175175
constraints.sides = {
176176
value: Number.parseInt(row["constraints.sides"], 10),
177-
operator: "LESS_THAN",
177+
operator: "LESS_THAN_OR_EQUAL",
178178
};
179179
hasConstraints = true;
180180
}
181181
if (row["constraints.deliveryDays"]) {
182182
constraints.deliveryDays = {
183183
value: Number.parseInt(row["constraints.deliveryDays"], 10),
184-
operator: "LESS_THAN",
184+
operator: "LESS_THAN_OR_EQUAL",
185185
};
186186
hasConstraints = true;
187187
}
188188
if (row["constraints.blackCoveragePercentage"]) {
189189
constraints.blackCoveragePercentage = {
190190
value: Number.parseFloat(row["constraints.blackCoveragePercentage"]),
191-
operator: "LESS_THAN",
191+
operator: "LESS_THAN_OR_EQUAL",
192192
};
193193
hasConstraints = true;
194194
}
195195
if (row["constraints.colourCoveragePercentage"]) {
196196
constraints.colourCoveragePercentage = {
197197
value: Number.parseFloat(row["constraints.colourCoveragePercentage"]),
198-
operator: "LESS_THAN",
198+
operator: "LESS_THAN_OR_EQUAL",
199199
};
200200
hasConstraints = true;
201201
}

0 commit comments

Comments
 (0)