Skip to content

CCM-13367: Allocation Logic #540

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 24 commits into
base: main
Choose a base branch
from
Open

CCM-13367: Allocation Logic #540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
bc68a3b
CCM-13372 - Select Preferred Pack
nhsd-david-wass Mar 19, 2026
d1a0c13
CCM-13371 - Determine Eligible packs
nhsd-david-wass Apr 7, 2026
c92b519
CCM-13372 - Update pk and sk values
nhsd-david-wass Apr 14, 2026
d4dbaaf
CCM-13882 - Calculate-Supplier-Weighting
nhsd-david-wass Apr 16, 2026
fd3c623
CCM-13384 calculate allocation factors
nhsd-david-wass Apr 16, 2026
94469a6
test supplier config
nhsd-david-wass Apr 17, 2026
03b75c9
handle non existent overall allocations
nhsd-david-wass Apr 17, 2026
5ab1cde
store current allocations
nhsd-david-wass Apr 17, 2026
24e4ec7
debug logging
nhsd-david-wass Apr 17, 2026
c208652
error checking
nhsd-david-wass Apr 17, 2026
5518047
lambda permissions
nhsd-david-wass Apr 17, 2026
54c7fc1
fix date type
nhsd-david-wass Apr 20, 2026
135570c
more logging
nhsd-david-wass Apr 20, 2026
b2eb83f
increment correct supplier
nhsd-david-wass Apr 20, 2026
6fa47eb
refactor for clarity
nhsd-david-wass Apr 21, 2026
0ac881f
add priority
nhsd-david-wass Apr 21, 2026
a5a5844
unit tests
nhsd-david-wass Apr 22, 2026
142fc04
moved types to separate file
nhsd-david-wass Apr 22, 2026
b2c1341
rationalise logging
nhsd-david-wass Apr 22, 2026
4c0c29e
updated to store total daily allocations per supplier
nhsd-david-wass Apr 23, 2026
b93c058
dev test data and ITs
nhsd-david-wass Apr 23, 2026
45c4372
turn it on!
nhsd-david-wass Apr 23, 2026
e0a8d26
pre review tidy
nhsd-david-wass Apr 28, 2026
e4aad0d
review changes
nhsd-david-wass Apr 30, 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