Skip to content

Ccm 4996 repoint do not merge #1000

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

Closed
Kennedy1265 wants to merge 4 commits into from
Closed

Ccm 4996 repoint do not merge #1000

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
64d2171
CCM-4996: Remove channel enriched from GET message endpoint
simonlabarere Sep 11, 2025
ced2b61
CCM-4996: Remove channel enriched from GET message endpoint
simonlabarere Sep 11, 2025
aafb9ff
CCM-4996: Remove channel enriched from GET message endpoint
simonlabarere Sep 11, 2025
b85d1ec
CCM-4996: Point at de-rake4
Kennedy1265 Sep 12, 2025
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
12 changes: 8 additions & 4 deletions proxies/live/apiproxy/targets/target.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,14 @@
<SSLInfo>
<Enabled>true</Enabled>
</SSLInfo>
<LoadBalancer>
<Server name="{{ TARGET_SERVER_OVERRIDE | default('communications-manager-target') }}"/>
</LoadBalancer>
<Path>{requestpath}</Path>
{% if ENVIRONMENT_TYPE == 'sandbox' %}
<LoadBalancer>
<Server name="{{ TARGET_SERVER_OVERRIDE | default('communications-manager-target') }}"/>
</LoadBalancer>
<Path>{requestpath}</Path>
{% else %}
<URL>https://comms-apim.de-rake4.communications.national.nhs.uk</URL>
{% endif %}
<Properties>
<Property name="io.timeout.millis">29000</Property>
</Properties>
Expand Down
15 changes: 11 additions & 4 deletions proxies/shared/policies/AssignMessage.MessageBatches.Create.Request.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,17 @@
<Name>target.copy.pathsuffix</Name>
<Value>false</Value>
</AssignVariable>
<AssignVariable>
<Name>requestpath</Name>
<Value>/api/v1/send</Value>
</AssignVariable>
{% if ENVIRONMENT_TYPE == 'sandbox' %}
<AssignVariable>
<Name>requestpath</Name>
<Value>/api/v1/send</Value>
</AssignVariable>
{% else %}
<AssignVariable>
<Name>target.url</Name>
<Value>https://comms-apim.de-rake4.communications.national.nhs.uk/api/v1/send</Value>
</AssignVariable>
{% endif %}
<Set>
<Payload contentType="application/json" variablePrefix="%" variableSuffix="#">%data.payload#</Payload>
<Headers>
Expand Down
15 changes: 11 additions & 4 deletions proxies/shared/policies/AssignMessage.Messages.Create.Request.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,17 @@
<Name>target.copy.pathsuffix</Name>
<Value>false</Value>
</AssignVariable>
<AssignVariable>
<Name>requestpath</Name>
<Value>/api/v1/messages</Value>
</AssignVariable>
{% if ENVIRONMENT_TYPE == 'sandbox' %}
<AssignVariable>
<Name>requestpath</Name>
<Value>/api/v1/messages</Value>
</AssignVariable>
{% else %}
<AssignVariable>
<Name>target.url</Name>
<Value>https://comms-apim.de-rake4.communications.national.nhs.uk/api/v1/messages</Value>
</AssignVariable>
{% endif %}
<Set>
<Payload contentType="application/json" variablePrefix="%" variableSuffix="#">%data.payload#</Payload>
<Headers>
Expand Down
15 changes: 11 additions & 4 deletions proxies/shared/policies/AssignMessage.Messages.GetSingle.Request.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,17 @@
<Name>target.copy.pathsuffix</Name>
<Value>false</Value>
</AssignVariable>
<AssignVariable>
<Name>requestpath</Name>
<Template>/api/v1/messages/{data.messageId}</Template>
</AssignVariable>
{% if ENVIRONMENT_TYPE == 'sandbox' %}
<AssignVariable>
<Name>requestpath</Name>
<Template>/api/v1/messages/{data.messageId}</Template>
</AssignVariable>
{% else %}
<AssignVariable>
<Name>target.url</Name>
<Value>https://comms-apim.de-rake4.communications.national.nhs.uk/api/v1/messages/{data.messageId}</Value>
</AssignVariable>
{% endif %}
<Set>
<Headers>
<Header name="X-Correlation-Id">{backendCorrelationId}</Header>
Expand Down
15 changes: 11 additions & 4 deletions proxies/shared/policies/AssignMessage.NhsAppAccounts.Get.Request.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,17 @@
<Name>target.copy.pathsuffix</Name>
<Value>false</Value>
</AssignVariable>
<AssignVariable>
<Name>requestpath</Name>
<Value>/api/channels/nhsapp/accounts</Value>
</AssignVariable>
{% if ENVIRONMENT_TYPE == 'sandbox' %}
<AssignVariable>
<Name>requestpath</Name>
<Value>/api/channels/nhsapp/accounts</Value>
</AssignVariable>
{% else %}
<AssignVariable>
<Name>target.url</Name>
<Value>https://comms-apim.de-rake4.communications.national.nhs.uk/api/channels/nhsapp/accounts</Value>
</AssignVariable>
{% endif %}
<Set>
<Headers>
<Header name="X-Correlation-Id">{backendCorrelationId}</Header>
Expand Down
1 change: 0 additions & 1 deletion sandbox/messages/2WL3qFTEFM0qMY8xjRbt1LIKCzM.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
"channelStatus": "delivered",
"timestamps": {
"created": "2023-10-09T10:31:59Z",
"enriched": "2023-10-09T10:31:59Z",
"delivered": "2023-10-09T10:52:12Z"
},
"routingPlan": {
Expand Down
1 change: 0 additions & 1 deletion sandbox/messages/2WL3wwFhpZ6blJNIoh747bDEFNv.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
"channelStatus": "delivered",
"timestamps": {
"created": "2023-10-09T10:31:59Z",
"enriched": "2023-10-09T10:31:59Z",
"delivered": "2023-10-09T10:52:12Z"
},
"routingPlan": {
Expand Down
1 change: 0 additions & 1 deletion sandbox/messages/2WL3ydEEk37IzREoWRhuAdolFCE.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
"channelStatus": "delivered",
"timestamps": {
"created": "2023-10-09T10:31:59Z",
"enriched": "2023-10-09T10:31:59Z",
"delivered": "2023-10-09T10:52:12Z"
},
"routingPlan": {
Expand Down
1 change: 0 additions & 1 deletion sandbox/messages/2WL3zxCY9e5vm2VP1ZfYMb53WPF.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
"channelStatus": "delivered",
"timestamps": {
"created": "2023-10-09T10:31:59Z",
"enriched": "2023-10-09T10:31:59Z",
"delivered": "2023-10-09T10:52:12Z"
},
"routingPlan": {
Expand Down
3 changes: 1 addition & 2 deletions sandbox/messages/2WL44QP7vrKxKKBZdTtUQoB2bWl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@
"cascadeOrder": 1,
"channelStatus": "sending",
"timestamps": {
"created": "2023-10-09T10:31:59Z",
"enriched": "2023-10-09T10:39:37Z"
"created": "2023-10-09T10:31:59Z"
},
"routingPlan": {
"id": "b838b13c-f98c-4def-93f0-515d4e4f4ee1",
Expand Down
1 change: 0 additions & 1 deletion sandbox/messages/2WL45YuHOLATvC3GspEu0oSioux.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
"channelFailureReasonCode": "CFR_PDSV_0004",
"timestamps": {
"created": "2023-10-09T10:31:59Z",
"enriched": "2023-10-09T10:31:59Z",
"failed": "2023-10-09T10:52:12Z"
},
"routingPlan": {
Expand Down
3 changes: 1 addition & 2 deletions sandbox/messages/2WL4GEeFVxXG9S57nRlefBwwKxp.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@
"cascadeOrder": 1,
"channelStatus": "sending",
"timestamps": {
"created": "2023-10-09T10:31:59Z",
"enriched": "2023-10-09T10:31:59Z"
"created": "2023-10-09T10:31:59Z"
},
"routingPlan": {
"id": "b838b13c-f98c-4def-93f0-515d4e4f4ee1",
Expand Down
3 changes: 1 addition & 2 deletions sandbox/messages/2WL4JXrfauCaQnSFbAujoImSKwo.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@
"cascadeOrder": 1,
"channelStatus": "sending",
"timestamps": {
"created": "2023-10-09T10:31:59Z",
"enriched": "2023-10-09T10:31:59Z"
"created": "2023-10-09T10:31:59Z"
},
"routingPlan": {
"id": "b838b13c-f98c-4def-93f0-515d4e4f4ee1",
Expand Down
1 change: 0 additions & 1 deletion sandbox/messages/2WL4JtCiOe7l2TT4szwPjNJah3z.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
"channelFailureReasonCode": "CFR_SUPE_0007",
"timestamps": {
"created": "2023-10-09T10:31:59Z",
"enriched": "2023-10-09T10:31:59Z",
"failed": "2023-10-09T10:52:12Z"
},
"routingPlan": {
Expand Down
3 changes: 1 addition & 2 deletions sandbox/messages/2WL4LuyNMtoGAsJQIpTxZLl8e3e.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@
"cascadeOrder": 1,
"channelStatus": "sending",
"timestamps": {
"created": "2023-10-09T10:31:59Z",
"enriched": "2023-10-09T10:31:59Z"
"created": "2023-10-09T10:31:59Z"
},
"routingPlan": {
"id": "b838b13c-f98c-4def-93f0-515d4e4f4ee1",
Expand Down
1 change: 0 additions & 1 deletion sandbox/messages/2WL4MOuSeCTODDAScFG7KIq9a5r.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
"channelFailureReasonCode": "CFR_SUPE_0007",
"timestamps": {
"created": "2023-10-09T10:31:59Z",
"enriched": "2023-10-09T10:31:59Z",
"failed": "2023-10-09T10:52:12Z"
},
"routingPlan": {
Expand Down
1 change: 0 additions & 1 deletion sandbox/messages/2WL4W9RgbuLLByXdR77H8vjKSDd.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
"channelFailureReasonCode": "CFR_SUPE_0007",
"timestamps": {
"created": "2023-10-09T10:31:59Z",
"enriched": "2023-10-09T10:31:59Z",
"failed": "2023-10-09T10:52:12Z"
},
"routingPlan": {
Expand Down
1 change: 0 additions & 1 deletion sandbox/messages/2WL4khXn32dOOj4bB4bi8Tkllrq.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
"messageFailureReasonCode": "MFR_PDSV_0111",
"timestamps": {
"created": "2023-10-09T10:31:37Z",
"enriched": "2023-10-09T10:31:59Z",
"failed": "2023-10-09T10:31:59Z"
},
"metadata": [
Expand Down
1 change: 0 additions & 1 deletion sandbox/messages/2WL4vHFZzInmaYwq6HRNDqTX8dH.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
"channelFailureReasonCode": "CFR_PDSV_0002",
"timestamps": {
"created": "2023-10-09T10:31:59Z",
"enriched": "2023-10-09T10:31:59Z",
"failed": "2023-10-09T10:31:59Z"
},
"routingPlan": {
Expand Down
1 change: 0 additions & 1 deletion sandbox/messages/2WL4xcWKvz4F32g0htBEl8DINzn.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
],
"timestamps": {
"created": "2023-10-09T10:31:37Z",
"enriched": "2023-10-09T10:31:59Z",
"failed": "2023-10-09T10:52:12Z"
},
"metadata": [
Expand Down
1 change: 0 additions & 1 deletion sandbox/messages/2WL50w41YaZXcyFCNT346LY8rlz.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
"channelFailureReasonCode": "CFR_PDSV_0002",
"timestamps": {
"created": "2023-10-09T10:31:59Z",
"enriched": "2023-10-09T10:31:59Z",
"failed": "2023-10-09T10:52:12Z"
},
"routingPlan": {
Expand Down
1 change: 0 additions & 1 deletion sandbox/messages/2WL54x0XQjCbWeE5lN0DKQZcokU.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
"channelFailureReasonCode": "CFR_PDSV_0002",
"timestamps": {
"created": "2023-10-09T10:31:59Z",
"enriched": "2023-10-09T10:31:59Z",
"failed": "2023-10-09T10:52:12Z"
},
"routingPlan": {
Expand Down
1 change: 0 additions & 1 deletion sandbox/messages/2WL5TWl7F7PondWbZ1vctlEtOZ3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
"channelStatus": "delivered",
"timestamps": {
"created": "2023-10-09T10:31:59Z",
"enriched": "2023-10-09T10:39:37Z",
"delivered": "2023-10-09T10:52:12Z"
},
"routingPlan": {
Expand Down
2 changes: 0 additions & 2 deletions sandbox/messages/2WL5eDefrbW31uw1il84WdF8ndH.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
"channelFailureReasonCode": "CFR_PDSV_0004",
"timestamps": {
"created": "2023-10-09T10:31:59Z",
"enriched": "2023-10-09T10:39:37Z",
"failed": "2023-10-09T10:52:12Z"
},
"routingPlan": {
Expand All @@ -39,7 +38,6 @@
"channelStatus": "delivered",
"timestamps": {
"created": "2023-10-09T10:31:59Z",
"enriched": "2023-10-09T10:39:37Z",
"delivered": "2023-10-09T11:25:23Z"
},
"routingPlan": {
Expand Down
3 changes: 0 additions & 3 deletions sandbox/messages/2WL5eYSWGzCHlGmzNxuqVusPxDg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
"channelFailureReasonCode": "CFR_PDSV_0004",
"timestamps": {
"created": "2023-10-09T10:31:59Z",
"enriched": "2023-10-09T10:39:37Z",
"failed": "2023-10-09T10:52:12Z"
},
"routingPlan": {
Expand All @@ -41,7 +40,6 @@
"channelFailureReasonCode": "CFR_SUPE_0007",
"timestamps": {
"created": "2023-10-09T10:31:59Z",
"enriched": "2023-10-09T10:39:37Z",
"failed": "2023-10-09T11:25:23Z"
},
"routingPlan": {
Expand All @@ -58,7 +56,6 @@
"channelStatus": "delivered",
"timestamps": {
"created": "2023-10-09T10:31:59Z",
"enriched": "2023-10-09T10:32:37Z",
"delivered": "2023-10-09T11:48:52Z"
},
"routingPlan": {
Expand Down
4 changes: 0 additions & 4 deletions sandbox/messages/2WL5f8j4XVxUPgd3OOqXVYvVFIW.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
"channelFailureReasonCode": "CFR_PDSV_0004",
"timestamps": {
"created": "2023-10-09T10:31:59Z",
"enriched": "2023-10-09T10:39:37Z",
"failed": "2023-10-09T10:52:12Z"
},
"routingPlan": {
Expand All @@ -41,7 +40,6 @@
"channelFailureReasonCode": "CFR_SUPE_0007",
"timestamps": {
"created": "2023-10-09T10:31:59Z",
"enriched": "2023-10-09T10:39:37Z",
"failed": "2023-10-09T11:25:23Z"
},
"routingPlan": {
Expand All @@ -60,7 +58,6 @@
"channelFailureReasonCode": "CFR_SUPE_0007",
"timestamps": {
"created": "2023-10-09T10:31:59Z",
"enriched": "2023-10-09T10:39:37Z",
"failed": "2023-10-09T11:48:52Z"
},
"routingPlan": {
Expand All @@ -77,7 +74,6 @@
"channelStatus": "delivered",
"timestamps": {
"created": "2023-10-09T10:31:59Z",
"enriched": "2023-10-09T10:39:37Z",
"delivered": "2023-10-12T08:23:41Z"
},
"routingPlan": {
Expand Down
1 change: 0 additions & 1 deletion sandbox/messages/2WL5qbEa7TzSWZXU2IAOCCrLXVL.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
"channelStatus": "delivered",
"timestamps": {
"created": "2023-10-09T10:31:59Z",
"enriched": "2023-10-09T10:31:59Z",
"delivered": "2023-10-09T10:52:12Z"
},
"routingPlan": {
Expand Down
3 changes: 0 additions & 3 deletions sandbox/messages/2n7C5wdJ9JSOSeCJTyd50GvtZeR.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
"channelStatusDescription": "Message not read in specified time frame",
"timestamps": {
"created": "2023-10-09T10:31:59Z",
"enriched": "2023-10-09T10:31:59Z",
"failed": "2023-10-09T10:31:59Z"
},
"routingPlan": {
Expand All @@ -38,7 +37,6 @@
"channelStatus": "delivered",
"timestamps": {
"created": "2023-10-09T10:31:59Z",
"enriched": "2023-10-09T10:32:37Z",
"delivered": "2023-10-09T11:48:52Z"
},
"routingPlan": {
Expand All @@ -55,7 +53,6 @@
"channelStatus": "delivered",
"timestamps": {
"created": "2023-10-09T10:31:59Z",
"enriched": "2023-10-09T10:32:37Z",
"delivered": "2023-10-09T11:48:52Z"
},
"routingPlan": {
Expand Down
5 changes: 0 additions & 5 deletions specification/schemas/responses/MessageResponse.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,11 +78,6 @@ properties:
description: The date and time that this channel was created at.
format: date-time
example: '2023-11-17T14:27:51.413Z'
enriched:
type: string
description: The date and time when we last enriched the contact details associated with this channel.
format: date-time
example: '2023-11-17T14:27:51.413Z'
delivered:
type: string
description: The date and time that this channel was successfully delivered.
Expand Down