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 28 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
28 commits
Select commit Hold shift + click to select a range
29d84cf
CCM-13372 - Select Preferred Pack
nhsd-david-wass Mar 19, 2026
381db9d
CCM-13371 - Determine Eligible packs
nhsd-david-wass Apr 7, 2026
195b6d0
CCM-13372 - Update pk and sk values
nhsd-david-wass Apr 14, 2026
231a3fd
CCM-13882 - Calculate-Supplier-Weighting
nhsd-david-wass Apr 16, 2026
69ed0d3
CCM-13384 calculate allocation factors
nhsd-david-wass Apr 16, 2026
bea1fff
test supplier config
nhsd-david-wass Apr 17, 2026
676688b
handle non existent overall allocations
nhsd-david-wass Apr 17, 2026
20991c7
store current allocations
nhsd-david-wass Apr 17, 2026
6922073
debug logging
nhsd-david-wass Apr 17, 2026
a1fc318
error checking
nhsd-david-wass Apr 17, 2026
61c1983
lambda permissions
nhsd-david-wass Apr 17, 2026
f22f66c
fix date type
nhsd-david-wass Apr 20, 2026
1149a45
more logging
nhsd-david-wass Apr 20, 2026
a067b45
increment correct supplier
nhsd-david-wass Apr 20, 2026
546169a
refactor for clarity
nhsd-david-wass Apr 21, 2026
2acb0ad
add priority
nhsd-david-wass Apr 21, 2026
cabdde0
unit tests
nhsd-david-wass Apr 22, 2026
12f5901
moved types to separate file
nhsd-david-wass Apr 22, 2026
f88845b
rationalise logging
nhsd-david-wass Apr 22, 2026
3760de4
updated to store total daily allocations per supplier
nhsd-david-wass Apr 23, 2026
ed66768
dev test data and ITs
nhsd-david-wass Apr 23, 2026
20f1369
turn it on!
nhsd-david-wass Apr 23, 2026
44922dc
pre review tidy
nhsd-david-wass Apr 28, 2026
abe4ff9
review changes
nhsd-david-wass Apr 30, 2026
9af5652
handle concurrent updates and inserts
nhsd-david-wass May 5, 2026
9937ac0
CCM-13378: Handle No Supplier Available
nhsd-david-wass Apr 29, 2026
ef6ff09
add check for illogical allocation percentage
nhsd-david-wass May 7, 2026
9f55df7
test review changes
nhsd-david-wass May 8, 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