Skip to content

Commit a873ca8

Browse files
arianamihailescuarianamihailescu
authored
Merge branch 'dev' into LEGLINK-820-implement-reporting-plans
2 parents 2e99c6d + a787711 commit a873ca8

100 files changed

Lines changed: 2206 additions & 1400 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Config/app-config.dev.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1102,7 +1102,7 @@
11021102
},
11031103
{
11041104
"key": "ConnectionStrings:Redis",
1105-
"value": "nhsnlink-dev-redis-managed.southcentralus.redis.azure.net:10000",
1105+
"value": "nhsnlink-dev-redis-managed.southcentralus.redis.azure.net:10000,abortConnect=false,resolveDns=true,allowAdmin=true",
11061106
"label": null,
11071107
"content_type": "",
11081108
"tags": {
@@ -1584,7 +1584,7 @@
15841584
"label": null,
15851585
"content_type": "",
15861586
"tags": {
1587-
"link:consumers": "Account,AdminBFF,Audit,AutomationUI,Census,DataAcquisition,DataAcquisitionWorker,Normalization,Notification,QueryDispatch,Report,Submission,Tenant,Terminology"
1587+
"link:consumers": "DataAcquisition,DataAcquisitionWorker,Normalization"
15881588
}
15891589
},
15901590
{
@@ -1593,7 +1593,7 @@
15931593
"label": null,
15941594
"content_type": "",
15951595
"tags": {
1596-
"link:consumers": "Account,AdminBFF,Audit,AutomationUI,Census,DataAcquisition,DataAcquisitionWorker,Normalization,Notification,QueryDispatch,Report,Submission,Tenant,Terminology"
1596+
"link:consumers": "DataAcquisition,DataAcquisitionWorker,Normalization"
15971597
}
15981598
},
15991599
{
@@ -1602,7 +1602,7 @@
16021602
"label": null,
16031603
"content_type": "application/vnd.microsoft.appconfig.keyvaultref+json;charset=utf-8",
16041604
"tags": {
1605-
"link:consumers": "Account,AdminBFF,Audit,AutomationUI,Census,DataAcquisition,DataAcquisitionWorker,Normalization,Notification,QueryDispatch,Report,Submission,Tenant,Terminology"
1605+
"link:consumers": "DataAcquisition,DataAcquisitionWorker,Normalization"
16061606
}
16071607
},
16081608
{
@@ -1611,16 +1611,16 @@
16111611
"label": null,
16121612
"content_type": "",
16131613
"tags": {
1614-
"link:consumers": "Account,AdminBFF,Audit,AutomationUI,Census,DataAcquisition,DataAcquisitionWorker,Normalization,Notification,QueryDispatch,Report,Submission,Tenant,Terminology"
1614+
"link:consumers": "DataAcquisition,DataAcquisitionWorker,Normalization"
16151615
}
16161616
},
16171617
{
16181618
"key": "ResourceCache:Redis:ConnectionString",
1619-
"value": "nhsnlink-dev-redis-managed.southcentralus.redis.azure.net:10000",
1619+
"value": "nhsnlink-dev-redis-managed.southcentralus.redis.azure.net:10000,abortConnect=false,resolveDns=true,allowAdmin=true",
16201620
"label": null,
16211621
"content_type": "",
16221622
"tags": {
1623-
"link:consumers": "Account,AdminBFF,Audit,AutomationUI,Census,DataAcquisition,DataAcquisitionWorker,Normalization,Notification,QueryDispatch,Report,Submission,Tenant,Terminology"
1623+
"link:consumers": "Normalization"
16241624
}
16251625
},
16261626
{
@@ -1629,7 +1629,7 @@
16291629
"label": null,
16301630
"content_type": "",
16311631
"tags": {
1632-
"link:consumers": "Account,AdminBFF,Audit,AutomationUI,Census,DataAcquisition,DataAcquisitionWorker,Normalization,Notification,QueryDispatch,Report,Submission,Tenant,Terminology"
1632+
"link:consumers": "DataAcquisition,DataAcquisitionWorker,Normalization"
16331633
}
16341634
},
16351635
{
@@ -1638,7 +1638,7 @@
16381638
"label": null,
16391639
"content_type": "application/vnd.microsoft.appconfig.keyvaultref+json;charset=utf-8",
16401640
"tags": {
1641-
"link:consumers": "Account,AdminBFF,Audit,AutomationUI,Census,DataAcquisition,DataAcquisitionWorker,Normalization,Notification,QueryDispatch,Report,Submission,Tenant,Terminology"
1641+
"link:consumers": "Normalization"
16421642
}
16431643
},
16441644
{

‎Config/app-config.qa.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1096,7 +1096,7 @@
10961096
},
10971097
{
10981098
"key": "ConnectionStrings:Redis",
1099-
"value": "nhsnlink-qa-redis-managed.southcentralus.redis.azure.net:10000",
1099+
"value": "nhsnlink-qa-redis-managed.southcentralus.redis.azure.net:10000,abortConnect=false,resolveDns=true,allowAdmin=true",
11001100
"label": null,
11011101
"content_type": "",
11021102
"tags": {
@@ -1567,7 +1567,7 @@
15671567
"label": null,
15681568
"content_type": "",
15691569
"tags": {
1570-
"link:consumers": "Account,AdminBFF,Audit,AutomationUI,Census,DataAcquisition,DataAcquisitionWorker,Normalization,Notification,QueryDispatch,Report,Submission,Tenant,Terminology"
1570+
"link:consumers": "DataAcquisition,DataAcquisitionWorker,Normalization"
15711571
}
15721572
},
15731573
{
@@ -1576,7 +1576,7 @@
15761576
"label": null,
15771577
"content_type": "",
15781578
"tags": {
1579-
"link:consumers": "Account,AdminBFF,Audit,AutomationUI,Census,DataAcquisition,DataAcquisitionWorker,Normalization,Notification,QueryDispatch,Report,Submission,Tenant,Terminology"
1579+
"link:consumers": "DataAcquisition,DataAcquisitionWorker,Normalization"
15801580
}
15811581
},
15821582
{
@@ -1585,7 +1585,7 @@
15851585
"label": null,
15861586
"content_type": "application/vnd.microsoft.appconfig.keyvaultref+json;charset=utf-8",
15871587
"tags": {
1588-
"link:consumers": "Account,AdminBFF,Audit,AutomationUI,Census,DataAcquisition,DataAcquisitionWorker,Normalization,Notification,QueryDispatch,Report,Submission,Tenant,Terminology"
1588+
"link:consumers": "Normalization"
15891589
}
15901590
},
15911591
{
@@ -1594,16 +1594,16 @@
15941594
"label": null,
15951595
"content_type": "",
15961596
"tags": {
1597-
"link:consumers": "Account,AdminBFF,Audit,AutomationUI,Census,DataAcquisition,DataAcquisitionWorker,Normalization,Notification,QueryDispatch,Report,Submission,Tenant,Terminology"
1597+
"link:consumers": "DataAcquisition,DataAcquisitionWorker,Normalization"
15981598
}
15991599
},
16001600
{
16011601
"key": "ResourceCache:Redis:ConnectionString",
1602-
"value": "nhsnlink-qa-redis-managed.southcentralus.redis.azure.net:10000",
1602+
"value": "nhsnlink-qa-redis-managed.southcentralus.redis.azure.net:10000,abortConnect=false,resolveDns=true,allowAdmin=true",
16031603
"label": null,
16041604
"content_type": "",
16051605
"tags": {
1606-
"link:consumers": "Account,AdminBFF,Audit,AutomationUI,Census,DataAcquisition,DataAcquisitionWorker,Normalization,Notification,QueryDispatch,Report,Submission,Tenant,Terminology"
1606+
"link:consumers": "Normalization"
16071607
}
16081608
},
16091609
{
@@ -1612,7 +1612,7 @@
16121612
"label": null,
16131613
"content_type": "",
16141614
"tags": {
1615-
"link:consumers": "Account,AdminBFF,Audit,AutomationUI,Census,DataAcquisition,DataAcquisitionWorker,Normalization,Notification,QueryDispatch,Report,Submission,Tenant,Terminology"
1615+
"link:consumers": "DataAcquisition,DataAcquisitionWorker,Normalization"
16161616
}
16171617
},
16181618
{
@@ -1621,7 +1621,7 @@
16211621
"label": null,
16221622
"content_type": "application/vnd.microsoft.appconfig.keyvaultref+json;charset=utf-8",
16231623
"tags": {
1624-
"link:consumers": "Account,AdminBFF,Audit,AutomationUI,Census,DataAcquisition,DataAcquisitionWorker,Normalization,Notification,QueryDispatch,Report,Submission,Tenant,Terminology"
1624+
"link:consumers": "Normalization"
16251625
}
16261626
},
16271627
{

‎Config/app-config.qa2.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1096,7 +1096,7 @@
10961096
},
10971097
{
10981098
"key": "ConnectionStrings:Redis",
1099-
"value": "nhsnlink-qa2-redis-managed.southcentralus.redis.azure.net:10000",
1099+
"value": "nhsnlink-qa2-redis-managed.southcentralus.redis.azure.net:10000,abortConnect=false,resolveDns=true,allowAdmin=true",
11001100
"label": null,
11011101
"content_type": "",
11021102
"tags": {
@@ -1567,7 +1567,7 @@
15671567
"label": null,
15681568
"content_type": "",
15691569
"tags": {
1570-
"link:consumers": "Account,AdminBFF,Audit,AutomationUI,Census,DataAcquisition,DataAcquisitionWorker,Normalization,Notification,QueryDispatch,Report,Submission,Tenant,Terminology"
1570+
"link:consumers": "DataAcquisition,DataAcquisitionWorker,Normalization"
15711571
}
15721572
},
15731573
{
@@ -1576,7 +1576,7 @@
15761576
"label": null,
15771577
"content_type": "",
15781578
"tags": {
1579-
"link:consumers": "Account,AdminBFF,Audit,AutomationUI,Census,DataAcquisition,DataAcquisitionWorker,Normalization,Notification,QueryDispatch,Report,Submission,Tenant,Terminology"
1579+
"link:consumers": "DataAcquisition,DataAcquisitionWorker,Normalization"
15801580
}
15811581
},
15821582
{
@@ -1585,7 +1585,7 @@
15851585
"label": null,
15861586
"content_type": "application/vnd.microsoft.appconfig.keyvaultref+json;charset=utf-8",
15871587
"tags": {
1588-
"link:consumers": "Account,AdminBFF,Audit,AutomationUI,Census,DataAcquisition,DataAcquisitionWorker,Normalization,Notification,QueryDispatch,Report,Submission,Tenant,Terminology"
1588+
"link:consumers": "DataAcquisition,DataAcquisitionWorker,Normalization"
15891589
}
15901590
},
15911591
{
@@ -1594,16 +1594,16 @@
15941594
"label": null,
15951595
"content_type": "",
15961596
"tags": {
1597-
"link:consumers": "Account,AdminBFF,Audit,AutomationUI,Census,DataAcquisition,DataAcquisitionWorker,Normalization,Notification,QueryDispatch,Report,Submission,Tenant,Terminology"
1597+
"link:consumers": "DataAcquisition,DataAcquisitionWorker,Normalization"
15981598
}
15991599
},
16001600
{
16011601
"key": "ResourceCache:Redis:ConnectionString",
1602-
"value": "nhsnlink-qa2-redis-managed.southcentralus.redis.azure.net:10000",
1602+
"value": "nhsnlink-qa2-redis-managed.southcentralus.redis.azure.net:10000,abortConnect=false,resolveDns=true,allowAdmin=true",
16031603
"label": null,
16041604
"content_type": "",
16051605
"tags": {
1606-
"link:consumers": "Account,AdminBFF,Audit,AutomationUI,Census,DataAcquisition,DataAcquisitionWorker,Normalization,Notification,QueryDispatch,Report,Submission,Tenant,Terminology"
1606+
"link:consumers": "Normalization"
16071607
}
16081608
},
16091609
{
@@ -1612,7 +1612,7 @@
16121612
"label": null,
16131613
"content_type": "",
16141614
"tags": {
1615-
"link:consumers": "Account,AdminBFF,Audit,AutomationUI,Census,DataAcquisition,DataAcquisitionWorker,Normalization,Notification,QueryDispatch,Report,Submission,Tenant,Terminology"
1615+
"link:consumers": "DataAcquisition,DataAcquisitionWorker,Normalization"
16161616
}
16171617
},
16181618
{
@@ -1621,7 +1621,7 @@
16211621
"label": null,
16221622
"content_type": "application/vnd.microsoft.appconfig.keyvaultref+json;charset=utf-8",
16231623
"tags": {
1624-
"link:consumers": "Account,AdminBFF,Audit,AutomationUI,Census,DataAcquisition,DataAcquisitionWorker,Normalization,Notification,QueryDispatch,Report,Submission,Tenant,Terminology"
1624+
"link:consumers": "Normalization"
16251625
}
16261626
},
16271627
{

‎Config/app-config.test.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1096,7 +1096,7 @@
10961096
},
10971097
{
10981098
"key": "ConnectionStrings:Redis",
1099-
"value": "nhsnlink-test-redis-managed.southcentralus.redis.azure.net:10000",
1099+
"value": "nhsnlink-test-redis-managed.southcentralus.redis.azure.net:10000,abortConnect=false,resolveDns=true,allowAdmin=true",
11001100
"label": null,
11011101
"content_type": "",
11021102
"tags": {
@@ -1616,7 +1616,7 @@
16161616
"label": null,
16171617
"content_type": "",
16181618
"tags": {
1619-
"link:consumers": "Account,AdminBFF,Audit,AutomationUI,Census,DataAcquisition,DataAcquisitionWorker,Normalization,Notification,QueryDispatch,Report,Submission,Tenant,Terminology"
1619+
"link:consumers": "DataAcquisition,DataAcquisitionWorker,Normalization"
16201620
}
16211621
},
16221622
{
@@ -1625,7 +1625,7 @@
16251625
"label": null,
16261626
"content_type": "",
16271627
"tags": {
1628-
"link:consumers": "Account,AdminBFF,Audit,AutomationUI,Census,DataAcquisition,DataAcquisitionWorker,Normalization,Notification,QueryDispatch,Report,Submission,Tenant,Terminology"
1628+
"link:consumers": "DataAcquisition,DataAcquisitionWorker,Normalization"
16291629
}
16301630
},
16311631
{
@@ -1634,7 +1634,7 @@
16341634
"label": null,
16351635
"content_type": "application/vnd.microsoft.appconfig.keyvaultref+json;charset=utf-8",
16361636
"tags": {
1637-
"link:consumers": "Account,AdminBFF,Audit,AutomationUI,Census,DataAcquisition,DataAcquisitionWorker,Normalization,Notification,QueryDispatch,Report,Submission,Tenant,Terminology"
1637+
"link:consumers": "DataAcquisition,DataAcquisitionWorker,Normalization"
16381638
}
16391639
},
16401640
{
@@ -1643,16 +1643,16 @@
16431643
"label": null,
16441644
"content_type": "",
16451645
"tags": {
1646-
"link:consumers": "Account,AdminBFF,Audit,AutomationUI,Census,DataAcquisition,DataAcquisitionWorker,Normalization,Notification,QueryDispatch,Report,Submission,Tenant,Terminology"
1646+
"link:consumers": "DataAcquisition,DataAcquisitionWorker,Normalization"
16471647
}
16481648
},
16491649
{
16501650
"key": "ResourceCache:Redis:ConnectionString",
1651-
"value": "nhsnlink-test-redis-managed.southcentralus.redis.azure.net:10000",
1651+
"value": "nhsnlink-test-redis-managed.southcentralus.redis.azure.net:10000,abortConnect=false,resolveDns=true,allowAdmin=true",
16521652
"label": null,
16531653
"content_type": "",
16541654
"tags": {
1655-
"link:consumers": "Account,AdminBFF,Audit,AutomationUI,Census,DataAcquisition,DataAcquisitionWorker,Normalization,Notification,QueryDispatch,Report,Submission,Tenant,Terminology"
1655+
"link:consumers": "Normalization"
16561656
}
16571657
},
16581658
{
@@ -1661,7 +1661,7 @@
16611661
"label": null,
16621662
"content_type": "",
16631663
"tags": {
1664-
"link:consumers": "Account,AdminBFF,Audit,AutomationUI,Census,DataAcquisition,DataAcquisitionWorker,Normalization,Notification,QueryDispatch,Report,Submission,Tenant,Terminology"
1664+
"link:consumers": "DataAcquisition,DataAcquisitionWorker,Normalization"
16651665
}
16661666
},
16671667
{
@@ -1670,7 +1670,7 @@
16701670
"label": null,
16711671
"content_type": "application/vnd.microsoft.appconfig.keyvaultref+json;charset=utf-8",
16721672
"tags": {
1673-
"link:consumers": "Account,AdminBFF,Audit,AutomationUI,Census,DataAcquisition,DataAcquisitionWorker,Normalization,Notification,QueryDispatch,Report,Submission,Tenant,Terminology"
1673+
"link:consumers": "Normalization"
16741674
}
16751675
},
16761676
{

‎Directory.Packages.props‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -63,15 +63,15 @@
6363
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.27" />
6464
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.27" />
6565
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="9.0.16" />
66-
<PackageVersion Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="8.0.27" />
66+
<PackageVersion Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="10.0.10" />
6767
<PackageVersion Include="Microsoft.Extensions.Compliance.Redaction" Version="8.10.0" />
6868
<PackageVersion Include="Microsoft.Extensions.Configuration.AzureAppConfiguration" Version="7.3.0" />
69-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.3" />
70-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.3" />
69+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.10" />
70+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.10" />
7171
<PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="8.0.27" />
7272
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
73-
<PackageVersion Include="Microsoft.Extensions.Options" Version="10.0.3" />
74-
<PackageVersion Include="Microsoft.Extensions.Primitives" Version="10.0.3" />
73+
<PackageVersion Include="Microsoft.Extensions.Options" Version="10.0.10" />
74+
<PackageVersion Include="Microsoft.Extensions.Primitives" Version="10.0.10" />
7575
<PackageVersion Include="Microsoft.Extensions.Telemetry" Version="10.1.0" />
7676
<PackageVersion Include="Microsoft.Identity.Client" Version="4.84.1" />
7777
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="7.4.1" />
@@ -112,10 +112,10 @@
112112
<PackageVersion Include="SpecFlow.NUnit" Version="3.9.74" />
113113
<PackageVersion Include="SpecFlow.Plus.LivingDocPlugin" Version="3.9.57" />
114114
<PackageVersion Include="SSH.NET" Version="2024.2.0" />
115-
<PackageVersion Include="StackExchange.Redis" Version="2.13.17" />
116-
<PackageVersion Include="StackExchange.Redis.Extensions.AspNetCore" Version="11.0.0" />
117-
<PackageVersion Include="StackExchange.Redis.Extensions.Core" Version="11.0.0" />
118-
<PackageVersion Include="StackExchange.Redis.Extensions.System.Text.Json" Version="11.0.0" />
115+
<PackageVersion Include="StackExchange.Redis" Version="3.1.11" />
116+
<PackageVersion Include="StackExchange.Redis.Extensions.AspNetCore" Version="13.0.1" />
117+
<PackageVersion Include="StackExchange.Redis.Extensions.Core" Version="13.0.1" />
118+
<PackageVersion Include="StackExchange.Redis.Extensions.System.Text.Json" Version="13.0.1" />
119119
<PackageVersion Include="Swashbuckle.AspNetCore" Version="6.9.0" />
120120
<PackageVersion Include="Swashbuckle.AspNetCore.Annotations" Version="6.9.0" />
121121
<PackageVersion Include="Swashbuckle.AspNetCore.SwaggerGen" Version="9.0.6" />

‎DotNet/Account/Application/Commands/Role/UpdateRole/UpdateRole.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ public async Task<bool> Execute(ClaimsPrincipal? requestor, LinkRoleModel model,
124124
foreach (var user in users)
125125
{
126126
var userKey = $"user:{user.Email}";
127-
_cache.Remove(userKey);
127+
await _cache.RemoveAsync(userKey, cancellationToken);
128128
}
129129
}
130130
}

‎DotNet/Account/Application/Commands/Role/UpdateRoleClaims/UpdateRoleClaims.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ public async Task<bool> Execute(ClaimsPrincipal? requestor, Guid roleId, List<st
117117
foreach (var user in users)
118118
{
119119
var userKey = $"user:{user.Email}";
120-
_cache.Remove(userKey);
120+
await _cache.RemoveAsync(userKey, cancellationToken);
121121
}
122122
}
123123
}

‎DotNet/Account/Application/Commands/User/DeleteUser/DeleteUser.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public async Task<bool> Execute(ClaimsPrincipal? requestor, Guid userId, Cancell
9292

9393
try
9494
{
95-
_cache.Remove(userKey);
95+
await _cache.RemoveAsync(userKey, cancellationToken);
9696
}
9797
catch (Exception ex)
9898
{

‎DotNet/Account/Application/Commands/User/UpdateUser/UpdateUser.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ public async Task<bool> Execute(ClaimsPrincipal? requestor, LinkUserModel model,
186186
try
187187
{
188188

189-
_cache.Remove(userKey);
189+
await _cache.RemoveAsync(userKey, cancellationToken);
190190
}
191191
catch (Exception ex)
192192
{

‎DotNet/Account/Application/Commands/User/UpdateUserClaims/UpdateUserClaims.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ public async Task<bool> Execute(ClaimsPrincipal? requestor, Guid userId, List<st
104104
var userKey = $"user:{user.Email}";
105105
try
106106
{
107-
_cache.Remove(userKey);
107+
await _cache.RemoveAsync(userKey, cancellationToken);
108108
}
109109
catch (Exception ex)
110110
{

0 commit comments

Comments
 (0)