Skip to content

CCM-13378: Handle no supplier available #552

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nhsd-david-wass wants to merge 26 commits into
base: main
Choose a base branch
from
Open

CCM-13378: Handle no supplier available #552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
582a3c8
CCM-13372 - Select Preferred Pack
nhsd-david-wass Mar 19, 2026
3a74d35
CCM-13371 - Determine Eligible packs
nhsd-david-wass Apr 7, 2026
c42ead3
CCM-13372 - Update pk and sk values
nhsd-david-wass Apr 14, 2026
ac262de
CCM-13882 - Calculate-Supplier-Weighting
nhsd-david-wass Apr 16, 2026
e927a92
CCM-13384 calculate allocation factors
nhsd-david-wass Apr 16, 2026
91a28ed
test supplier config
nhsd-david-wass Apr 17, 2026
54eb645
handle non existent overall allocations
nhsd-david-wass Apr 17, 2026
6202945
store current allocations
nhsd-david-wass Apr 17, 2026
470a04b
debug logging
nhsd-david-wass Apr 17, 2026
d51a8eb
error checking
nhsd-david-wass Apr 17, 2026
99fc0b0
lambda permissions
nhsd-david-wass Apr 17, 2026
4d49fd3
fix date type
nhsd-david-wass Apr 20, 2026
94e0d7c
more logging
nhsd-david-wass Apr 20, 2026
5613638
increment correct supplier
nhsd-david-wass Apr 20, 2026
3ac43f4
refactor for clarity
nhsd-david-wass Apr 21, 2026
8b45a3f
add priority
nhsd-david-wass Apr 21, 2026
dcab03d
unit tests
nhsd-david-wass Apr 22, 2026
6e9da14
moved types to separate file
nhsd-david-wass Apr 22, 2026
e674643
rationalise logging
nhsd-david-wass Apr 22, 2026
b9ea2bb
updated to store total daily allocations per supplier
nhsd-david-wass Apr 23, 2026
c3287cd
dev test data and ITs
nhsd-david-wass Apr 23, 2026
922382c
turn it on!
nhsd-david-wass Apr 23, 2026
e29ff07
pre review tidy
nhsd-david-wass Apr 28, 2026
7a61d3d
review changes
nhsd-david-wass Apr 30, 2026
66b4db4
handle concurrent updates and inserts
nhsd-david-wass May 5, 2026
4027cc4
CCM-13378: Handle No Supplier Available
nhsd-david-wass Apr 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions ...iers/letter-variant/client1-campaign.json → ...ers/letter-variant/client1-campaign1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"campaignIds": [
"client1-campaign"
"client1-campaign1"
],
"clientId": "client1",
"constraints": {
Expand All @@ -25,12 +25,13 @@
"value": 6
}
},
"description": "Colour printing, campaign envelope, Attachment",
"id": "client1-campaign",
"name": "Client1 - campaign",
"description": "Colour printing, campaign1 envelope, Attachment",
"id": "client1-campaign1",
"name": "Client1 - Campaign1",
"packSpecificationIds": [
"client1-campaign"
"client1-campaign1"
],
"priority": 1,
"status": "INT",
"type": "STANDARD",
"volumeGroupId": "volumeGroup-test3"
Expand Down
38 changes: 38 additions & 0 deletions config/suppliers/letter-variant/client1-campaign2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"campaignIds": [
"client1-campaign2"
],
"clientId": "client1",
"constraints": {
"blackCoveragePercentage": {
"operator": "LESS_THAN",
"value": 20
},
"colourCoveragePercentage": {
"operator": "LESS_THAN",
"value": 10
},
"deliveryDays": {
"operator": "LESS_THAN",
"value": 3
},
"sheets": {
"operator": "LESS_THAN",
"value": 5
},
"sides": {
"operator": "LESS_THAN",
"value": 10
}
},
"description": "Admail, colour printing",
"id": "client1-campaign2",
"name": "Client1 - CAMPAIGN2",
"packSpecificationIds": [
"client1-campaign2"
],
"priority": 1,
"status": "INT",
"type": "STANDARD",
"volumeGroupId": "volumeGroup-test3"
}
38 changes: 38 additions & 0 deletions config/suppliers/letter-variant/client1-campaign3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"campaignIds": [
"client1-campaign3"
],
"clientId": "client1",
"constraints": {
"blackCoveragePercentage": {
"operator": "LESS_THAN",
"value": 20
},
"colourCoveragePercentage": {
"operator": "LESS_THAN",
"value": 10
},
"deliveryDays": {
"operator": "LESS_THAN",
"value": 3
},
"sheets": {
"operator": "LESS_THAN",
"value": 5
},
"sides": {
"operator": "LESS_THAN",
"value": 10
}
},
"description": "Admail?, colour printing, booklet",
"id": "client1-campaign3",
"name": "Client1 - Campaign 3",
"packSpecificationIds": [
"client1-campaign3"
],
"priority": 2,
"status": "INT",
"type": "STANDARD",
"volumeGroupId": "volumeGroup-test3"
}
38 changes: 38 additions & 0 deletions config/suppliers/letter-variant/client1-campaign4.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"campaignIds": [
"client1-campaign4"
],
"clientId": "client1",
"constraints": {
"blackCoveragePercentage": {
"operator": "LESS_THAN",
"value": 20
},
"colourCoveragePercentage": {
"operator": "LESS_THAN",
"value": 10
},
"deliveryDays": {
"operator": "LESS_THAN",
"value": 3
},
"sheets": {
"operator": "LESS_THAN",
"value": 5
},
"sides": {
"operator": "LESS_THAN",
"value": 10
}
},
"description": "Admail, colour printing, campaign4 envelope",
"id": "client1-campaign4",
"name": "Client1 - Campaign 4",
"packSpecificationIds": [
"client1-campaign4"
],
"priority": 3,
"status": "INT",
"type": "STANDARD",
"volumeGroupId": "volumeGroup-test3"
}
38 changes: 38 additions & 0 deletions config/suppliers/letter-variant/client1-campaign5.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"campaignIds": [
"client1-campaign5"
],
"clientId": "client1",
"constraints": {
"blackCoveragePercentage": {
"operator": "LESS_THAN",
"value": 20
},
"colourCoveragePercentage": {
"operator": "LESS_THAN",
"value": 10
},
"deliveryDays": {
"operator": "LESS_THAN",
"value": 3
},
"sheets": {
"operator": "LESS_THAN",
"value": 5
},
"sides": {
"operator": "LESS_THAN",
"value": 10
}
},
"description": "Admail, colour printing, Campaign 5 envelope",
"id": "client1-campaign5",
"name": "Client1 - Campaign 5",
"packSpecificationIds": [
"client1-campaign5"
],
"priority": 4,
"status": "PROD",
"type": "STANDARD",
"volumeGroupId": "volumeGroup-test3"
}
38 changes: 38 additions & 0 deletions config/suppliers/letter-variant/client1-campaign6.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"campaignIds": [
"client1-campaign6"
],
"clientId": "client1",
"constraints": {
"blackCoveragePercentage": {
"operator": "LESS_THAN",
"value": 20
},
"colourCoveragePercentage": {
"operator": "LESS_THAN",
"value": 10
},
"deliveryDays": {
"operator": "LESS_THAN",
"value": 3
},
"sheets": {
"operator": "LESS_THAN",
"value": 4
},
"sides": {
"operator": "LESS_THAN",
"value": 8
}
},
"description": "Colour printing, Campaign 6 envelope, Attachment",
"id": "client1-campaign6",
"name": "Client1 - Campaign 6",
"packSpecificationIds": [
"client1-campaign6"
],
"priority": 5,
"status": "INT",
"type": "STANDARD",
"volumeGroupId": "volumeGroup-test3"
}
38 changes: 38 additions & 0 deletions config/suppliers/letter-variant/client1-campaign7.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"campaignIds": [
"client1-campaign7 "
],
"clientId": "client1",
"constraints": {
"blackCoveragePercentage": {
"operator": "LESS_THAN",
"value": 20
},
"colourCoveragePercentage": {
"operator": "LESS_THAN",
"value": 10
},
"deliveryDays": {
"operator": "LESS_THAN",
"value": 3
},
"sheets": {
"operator": "LESS_THAN",
"value": 5
},
"sides": {
"operator": "LESS_THAN",
"value": 10
}
},
"description": "Economy, colour printing",
"id": "client1-campaign7",
"name": "Client1 - Campaign 7",
"packSpecificationIds": [
"notify-c5-colour"
],
"priority": 50,
"status": "INT",
"type": "STANDARD",
"volumeGroupId": "volumeGroup-test3"
}
38 changes: 38 additions & 0 deletions config/suppliers/letter-variant/client1-campaign8.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"campaignIds": [
"client1-campaign8"
],
"clientId": "client1",
"constraints": {
"blackCoveragePercentage": {
"operator": "LESS_THAN",
"value": 20
},
"colourCoveragePercentage": {
"operator": "LESS_THAN",
"value": 10
},
"deliveryDays": {
"operator": "LESS_THAN",
"value": 3
},
"sheets": {
"operator": "LESS_THAN",
"value": 5
},
"sides": {
"operator": "LESS_THAN",
"value": 10
}
},
"description": "Admail?, colour printing, booklet",
"id": "client1-campaign8",
"name": "Client1 - Campaign 8",
"packSpecificationIds": [
"client1-campaign8"
],
"priority": 7,
"status": "INT",
"type": "STANDARD",
"volumeGroupId": "volumeGroup-test3"
}
35 changes: 35 additions & 0 deletions config/suppliers/letter-variant/client2-admail.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"clientId": "Client 2",
"constraints": {
"blackCoveragePercentage": {
"operator": "LESS_THAN",
"value": 20
},
"colourCoveragePercentage": {
"operator": "LESS_THAN",
"value": 10
},
"deliveryDays": {
"operator": "LESS_THAN",
"value": 3
},
"sheets": {
"operator": "LESS_THAN",
"value": 5
},
"sides": {
"operator": "LESS_THAN",
"value": 10
}
},
"description": "Letter with admail postage tariff",
"id": "client2-admail",
"name": "Admail letter",
"packSpecificationIds": [
"notify-admail"
],
"priority": 8,
"status": "INT",
"type": "STANDARD",
"volumeGroupId": "volumeGroup-test3"
}
31 changes: 31 additions & 0 deletions config/suppliers/letter-variant/client3-abnormal-results-braille.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"clientId": "client3",
"constraints": {
"blackCoveragePercentage": {
"operator": "LESS_THAN",
"value": 20
},
"deliveryDays": {
"operator": "LESS_THAN",
"value": 1
},
"sheets": {
"operator": "LESS_THAN",
"value": 4
},
"sides": {
"operator": "LESS_THAN",
"value": 8
}
},
"description": "Same Day, Braille, Whitemail, Booklet",
"id": "client3-abnormal-results-braille",
"name": "Client 3 Braille Abnormal Results",
"packSpecificationIds": [
"client3-abnormal-results-braille"
],
"priority": 10,
"status": "INT",
"type": "BRAILLE",
"volumeGroupId": "volumeGroup-test3"
}
31 changes: 31 additions & 0 deletions config/suppliers/letter-variant/client3-abnormal-results.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"clientId": "client3",
"constraints": {
"blackCoveragePercentage": {
"operator": "LESS_THAN",
"value": 20
},
"deliveryDays": {
"operator": "LESS_THAN",
"value": 1
},
"sheets": {
"operator": "LESS_THAN",
"value": 4
},
"sides": {
"operator": "LESS_THAN",
"value": 8
}
},
"description": "Same Day, Whitemail, Booklet",
"id": "client3-abnormal-results",
"name": "Client 3 Abnormal Results",
"packSpecificationIds": [
"client3-abnormal-results"
],
"priority": 9,
"status": "INT",
"type": "STANDARD",
"volumeGroupId": "volumeGroup-test3"
}
Loading
Loading