Skip to content

Commit 3d53369

Browse files
nvmLantananvmLantana
committed
checkin
1 parent fd1f2dd commit 3d53369

3 files changed

Lines changed: 81 additions & 48 deletions

File tree

‎DotNet/Automation.UI/Services/StartScenarioRequestResolver.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public static ResolvedRunOptions Resolve(StartScenarioRequest request)
4040
{
4141
NhsnOrganizationId = MegaPatientTestNhsnOrganizationId
4242
},
43-
AutomationScenarioKind.Custom => new ResolvedRunOptions(10, 250, 20260329, 3, 0, 30, false, true, defaultMeasures, [], [])
43+
AutomationScenarioKind.Custom => new ResolvedRunOptions(10, 250, 20260329, 3, 30, 30, false, true, defaultMeasures, [], [])
4444
{
4545
NhsnOrganizationId = GenerateRandomNhsnOrganizationId()
4646
},

‎DotNet/DMRP/packages.lock.json‎

Lines changed: 75 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -246,10 +246,10 @@
246246
},
247247
"Microsoft.Extensions.Caching.Abstractions": {
248248
"type": "Transitive",
249-
"resolved": "8.0.0",
250-
"contentHash": "3KuSxeHoNYdxVYfg2IRZCThcrlJ1XJqIXkAWikCsbm5C/bCjv7G0WoKDyuR98Q+T607QT2Zl5GsbGRkENcV2yQ==",
249+
"resolved": "10.0.10",
250+
"contentHash": "4ZFBNE+jzR+CrWWlhOesnmywCW7pYKT0dxyAQRdL11yJwxe4jvcAu31eorFtEkoFeCDcUTeNssgPv2yaRRptaQ==",
251251
"dependencies": {
252-
"Microsoft.Extensions.Primitives": "8.0.0"
252+
"Microsoft.Extensions.Primitives": "10.0.10"
253253
}
254254
},
255255
"Microsoft.Extensions.Compliance.Abstractions": {
@@ -377,11 +377,11 @@
377377
},
378378
"Microsoft.Extensions.Logging.Abstractions": {
379379
"type": "Transitive",
380-
"resolved": "10.0.3",
381-
"contentHash": "lxl0WLk7ROgBFAsjcOYjQ8/DVK+VMszxGBzUhgtQmAsTNldLL5pk9NG/cWTsXHq0lUhUEAtZkEE7jOGOA8bGKQ==",
380+
"resolved": "10.0.10",
381+
"contentHash": "zkFxGYUvdxAvIKTyXHrmW+Sux53D4SezD9dMyZ6hrwwzPQJNuwCRy1f5W7AvYTqacEGhWF2XderRQG1OvbV8og==",
382382
"dependencies": {
383-
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.3",
384-
"System.Diagnostics.DiagnosticSource": "10.0.3"
383+
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.10",
384+
"System.Diagnostics.DiagnosticSource": "10.0.10"
385385
}
386386
},
387387
"Microsoft.Extensions.Logging.Configuration": {
@@ -641,12 +641,12 @@
641641
"OpenTelemetry.PersistentStorage.Abstractions": "1.0.2"
642642
}
643643
},
644-
"Pipelines.Sockets.Unofficial": {
644+
"RESPite": {
645645
"type": "Transitive",
646-
"resolved": "2.2.16",
647-
"contentHash": "nonu9l0YrZH6krVYbskBjE7uG0VMAnvOQ9PU+RmzUsy+++vHkqzzCkHRoP877OiA3iRTxJyNDLfpcU8hrJ3/YQ==",
646+
"resolved": "3.1.11",
647+
"contentHash": "jkm3/wiiYN2zRPjR9Yyu5NNVDBxgCYmrqC/u5ZPwJpOHTaT/7OOIU6pqDTHOqvOg5snzPuxPJYS1HOVeRZPpTA==",
648648
"dependencies": {
649-
"System.IO.Pipelines": "8.0.0"
649+
"System.IO.Pipelines": "10.0.5"
650650
}
651651
},
652652
"runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": {
@@ -968,8 +968,8 @@
968968
},
969969
"System.Diagnostics.DiagnosticSource": {
970970
"type": "Transitive",
971-
"resolved": "10.0.3",
972-
"contentHash": "IuZXyF3K5X+mCsBKIQ87Cn/V4Nyb39vyCbzfH/AkoneSWNV/ExGQ/I0m4CEaVAeFh9fW6kp2NVObkmevd1Ys7A=="
971+
"resolved": "10.0.10",
972+
"contentHash": "cjtKi6ERMYWp6b9UTVPcwDT29PjKDtlM3W9OwnWL5abRsI8ku42Q2wqZoLIIXJnT/XF2s2CjuK8Nl4a3mmTxQQ=="
973973
},
974974
"System.Diagnostics.Tools": {
975975
"type": "Transitive",
@@ -1113,13 +1113,13 @@
11131113
},
11141114
"System.IO.Hashing": {
11151115
"type": "Transitive",
1116-
"resolved": "10.0.3",
1117-
"contentHash": "La6ICwsdTKhVX+LKN+pvFjQRR3LhLwq3uKdi2knjLzRyPYBSydF4cjXidYxIiTcDD6XVYdsBWQEI8ZxiZ/OdIg=="
1116+
"resolved": "10.0.5",
1117+
"contentHash": "8IBJWcCT9+e4Bmevm4T7+fQEiAh133KGiz4oiVTgJckd3Q76OFdR1falgn9lpz7+C4HJvogCDJeAa2QmvbeVtg=="
11181118
},
11191119
"System.IO.Pipelines": {
11201120
"type": "Transitive",
1121-
"resolved": "10.0.3",
1122-
"contentHash": "WMxiA2jGdHnRBmoVK55YUq5VPaxW0Sg2frPtXV+urUMvpqHIga6lleV/YuryHIuGsAKVjQAjv6PrQ6IJpoLohQ=="
1121+
"resolved": "10.0.5",
1122+
"contentHash": "8/ZHN/j2y1t+7McdCf1wXku2/c7wtrGLz3WQabIoPuLAn3bHDWT6YOJYreJq8sCMPSo6c8iVYXUdLlFGX5PEqw=="
11231123
},
11241124
"System.Linq": {
11251125
"type": "Transitive",
@@ -1752,10 +1752,10 @@
17521752
"Microsoft.EntityFrameworkCore.SqlServer": "[8.0.27, )",
17531753
"Microsoft.EntityFrameworkCore.Sqlite": "[8.0.27, )",
17541754
"Microsoft.EntityFrameworkCore.Sqlite.Core": "[8.0.27, )",
1755-
"Microsoft.Extensions.Caching.StackExchangeRedis": "[8.0.27, )",
1755+
"Microsoft.Extensions.Caching.StackExchangeRedis": "[10.0.10, )",
17561756
"Microsoft.Extensions.Configuration.AzureAppConfiguration": "[7.3.0, )",
17571757
"Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore": "[8.0.27, )",
1758-
"Microsoft.Extensions.Options": "[10.0.3, )",
1758+
"Microsoft.Extensions.Options": "[10.0.10, )",
17591759
"Microsoft.Extensions.Telemetry": "[10.1.0, )",
17601760
"MongoDB.Driver": "[3.9.0, )",
17611761
"OpenTelemetry": "[1.15.3, )",
@@ -1774,7 +1774,10 @@
17741774
"Quartz.Plugins.TimeZoneConverter": "[3.18.1, )",
17751775
"Quartz.Serialization.Json": "[3.18.1, )",
17761776
"Quartz.Serialization.SystemTextJson": "[3.18.1, )",
1777-
"StackExchange.Redis": "[2.13.17, )",
1777+
"StackExchange.Redis": "[3.1.11, )",
1778+
"StackExchange.Redis.Extensions.AspNetCore": "[13.0.1, )",
1779+
"StackExchange.Redis.Extensions.Core": "[13.0.1, )",
1780+
"StackExchange.Redis.Extensions.System.Text.Json": "[13.0.1, )",
17781781
"Swashbuckle.AspNetCore.SwaggerGen": "[9.0.6, )",
17791782
"Swashbuckle.AspNetCore.SwaggerUI": "[6.9.0, )",
17801783
"System.Text.Encodings.Web": "[10.0.3, )",
@@ -2102,13 +2105,13 @@
21022105
},
21032106
"Microsoft.Extensions.Caching.StackExchangeRedis": {
21042107
"type": "CentralTransitive",
2105-
"requested": "[8.0.27, )",
2106-
"resolved": "8.0.27",
2107-
"contentHash": "8H+885iKNAAqx66D7gO0lZJ12Lu/QUg1jhb7JGTICxdYUmDArnmumWbhugx/TsvmaoVlziAuIWCIr4bNU/v7og==",
2108+
"requested": "[10.0.10, )",
2109+
"resolved": "10.0.10",
2110+
"contentHash": "E+3pfEY68WQh1ZVFTGDNK0JCoayzL3aIDgVHHM85HIbQO7MiABG14A7+ajHH2P/y3a4W2Rla5p2nzut3+mzoyQ==",
21082111
"dependencies": {
2109-
"Microsoft.Extensions.Caching.Abstractions": "8.0.0",
2110-
"Microsoft.Extensions.Logging.Abstractions": "8.0.3",
2111-
"Microsoft.Extensions.Options": "8.0.2",
2112+
"Microsoft.Extensions.Caching.Abstractions": "10.0.10",
2113+
"Microsoft.Extensions.Logging.Abstractions": "10.0.10",
2114+
"Microsoft.Extensions.Options": "10.0.10",
21122115
"StackExchange.Redis": "2.7.27"
21132116
}
21142117
},
@@ -2129,7 +2132,7 @@
21292132
},
21302133
"Microsoft.Extensions.DependencyInjection": {
21312134
"type": "CentralTransitive",
2132-
"requested": "[10.0.3, )",
2135+
"requested": "[10.0.10, )",
21332136
"resolved": "8.0.1",
21342137
"contentHash": "BmANAnR5Xd4Oqw7yQ75xOAYODybZQRzdeNucg7kS5wWKd2PNnMdYtJ2Vciy0QLylRmv42DGl5+AFL9izA6F1Rw==",
21352138
"dependencies": {
@@ -2138,9 +2141,9 @@
21382141
},
21392142
"Microsoft.Extensions.DependencyInjection.Abstractions": {
21402143
"type": "CentralTransitive",
2141-
"requested": "[10.0.3, )",
2142-
"resolved": "10.0.3",
2143-
"contentHash": "bwGMrRcAMWx2s/RDgja97p27rxSz2pEQW0+rX5cWAUWVETVJ/eyxGfjAl8vuG5a+lckWmPIE+vcuaZNVB5YDdw=="
2144+
"requested": "[10.0.10, )",
2145+
"resolved": "10.0.10",
2146+
"contentHash": "z/2xXlFw2aLGjHyEm6E0tQ+In6VfzQzTrtArbQ2c0TQE16ZbyDCMGPvaUT9I0s8rgy9sRWlU2P9waW37qV04qA=="
21442147
},
21452148
"Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore": {
21462149
"type": "CentralTransitive",
@@ -2155,19 +2158,19 @@
21552158
},
21562159
"Microsoft.Extensions.Options": {
21572160
"type": "CentralTransitive",
2158-
"requested": "[10.0.3, )",
2159-
"resolved": "10.0.3",
2160-
"contentHash": "hU6WzGTPvPoLA2ng1ILvWQb3g0qORdlHNsxI8IcPLumJb3suimYUl+bbDzdo1V4KFsvVhnMWzysHpKbZaoDQPQ==",
2161+
"requested": "[10.0.10, )",
2162+
"resolved": "10.0.10",
2163+
"contentHash": "srnhnk7nE8krBiIXp71LvBmKBtraBONWSRzdjJgRv1Ko9Mp8IVNqv4vIS9hGeVteBig8aQkva9ZG+sC+o5sVcA==",
21612164
"dependencies": {
2162-
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.3",
2163-
"Microsoft.Extensions.Primitives": "10.0.3"
2165+
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.10",
2166+
"Microsoft.Extensions.Primitives": "10.0.10"
21642167
}
21652168
},
21662169
"Microsoft.Extensions.Primitives": {
21672170
"type": "CentralTransitive",
2168-
"requested": "[10.0.3, )",
2169-
"resolved": "10.0.3",
2170-
"contentHash": "GEcpTwo7sUoLGGNTqV1FZEuL+tTD9m81NX/mh099dqGNna07/UGZShKQNZRw4hv6nlliSUwYQgSYc7OR99Jufg=="
2171+
"requested": "[10.0.10, )",
2172+
"resolved": "10.0.10",
2173+
"contentHash": "5wu/GrYVd8mG2DVUw3vFJzF+O336TyTGg/Kmcgw9bfwYhCoFiV5lR5QeEmKecJyrW4W54nMfD3p3589E8a7czQ=="
21712174
},
21722175
"Microsoft.Extensions.Telemetry": {
21732176
"type": "CentralTransitive",
@@ -2376,13 +2379,41 @@
23762379
},
23772380
"StackExchange.Redis": {
23782381
"type": "CentralTransitive",
2379-
"requested": "[2.13.17, )",
2380-
"resolved": "2.13.17",
2381-
"contentHash": "P7o7ZDBAmBrOLQEw8Pt44iIA08ioj48smRxn4Jp6yzCu6P3DOSU6lj7f+IOtN3pPvSgC9YufvM92ycukEEBCYQ==",
2382+
"requested": "[3.1.11, )",
2383+
"resolved": "3.1.11",
2384+
"contentHash": "E+HnHo9rw8OZEz0QAoMEup8lwRi6DbQh/nTBGPrCpJLS+L/JrtbPSURgpYjI7TnAvtUsfo9AMYNlqfU1awYPLg==",
2385+
"dependencies": {
2386+
"Microsoft.Extensions.Logging.Abstractions": "10.0.5",
2387+
"RESPite": "3.1.11",
2388+
"System.IO.Hashing": "10.0.5",
2389+
"System.IO.Pipelines": "10.0.5"
2390+
}
2391+
},
2392+
"StackExchange.Redis.Extensions.AspNetCore": {
2393+
"type": "CentralTransitive",
2394+
"requested": "[13.0.1, )",
2395+
"resolved": "13.0.1",
2396+
"contentHash": "sxM+jTOqtgWY7UAS71y4O4sv6B5HB8JhdAZRIMS9P7hTtwHZ6Gt0ln9lAzlUf0VdCOtIL2dceRNAeA772grA+Q==",
2397+
"dependencies": {
2398+
"StackExchange.Redis.Extensions.Core": "13.0.1"
2399+
}
2400+
},
2401+
"StackExchange.Redis.Extensions.Core": {
2402+
"type": "CentralTransitive",
2403+
"requested": "[13.0.1, )",
2404+
"resolved": "13.0.1",
2405+
"contentHash": "kN4bLpJ/Ifhjp0zoO6jiq4d8CMYM1Zx2vwIDDbWYZlALdFf/saikUCIxVk3nTwdpQz/+X17AtVMllSvYCigQPg==",
2406+
"dependencies": {
2407+
"StackExchange.Redis": "[2.12.14, 4.0.0)"
2408+
}
2409+
},
2410+
"StackExchange.Redis.Extensions.System.Text.Json": {
2411+
"type": "CentralTransitive",
2412+
"requested": "[13.0.1, )",
2413+
"resolved": "13.0.1",
2414+
"contentHash": "9jZ5mSnd0gaGgWVKQSO1KCd1wts4wPAuBCPdSQnO1NOld9FJXWOeapv53TQE/FMs7lC8LdVqxmG4RG+2bF4lng==",
23822415
"dependencies": {
2383-
"Microsoft.Extensions.Logging.Abstractions": "8.0.0",
2384-
"Pipelines.Sockets.Unofficial": "2.2.16",
2385-
"System.IO.Hashing": "10.0.2"
2416+
"StackExchange.Redis.Extensions.Core": "13.0.1"
23862417
}
23872418
},
23882419
"Swashbuckle.AspNetCore.SwaggerGen": {

‎DotNet/ServiceTests/UnitTests/AutomationUI/StartScenarioRequestResolverTests.cs‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ public class StartScenarioRequestResolverTests
1212
// ---------- Non-Custom scenarios use scenario-kind defaults outright ----------
1313

1414
[Theory]
15-
[InlineData(AutomationScenarioKind.AdhocReportTest, 1, 1000, 20260326)]
16-
[InlineData(AutomationScenarioKind.MultiPatientTest, 1000, 100, 20260328)]
15+
[InlineData(AutomationScenarioKind.AdhocReportTest, 1, 1000, 20260326, 0)]
16+
[InlineData(AutomationScenarioKind.MultiPatientTest, 1000, 100, 20260328, 0)]
1717
public void Non_custom_scenarios_use_scenario_kind_defaults(
18-
AutomationScenarioKind scenario, int expectedPatientCount, int expectedResources, int expectedSeed)
18+
AutomationScenarioKind scenario, int expectedPatientCount, int expectedResources, int expectedSeed, int expectedMaxPollingDurationMinutes)
1919
{
2020
var request = new StartScenarioRequest
2121
{
@@ -31,6 +31,7 @@ public void Non_custom_scenarios_use_scenario_kind_defaults(
3131
options.PatientCount.Should().Be(expectedPatientCount);
3232
options.ResourcesPerPatient.Should().Be(expectedResources);
3333
options.Seed.Should().Be(expectedSeed);
34+
options.MaxPollingDurationMinutes.Should().Be(expectedMaxPollingDurationMinutes);
3435
}
3536

3637
[Fact]
@@ -76,6 +77,7 @@ public void Custom_scenario_typed_overrides_replace_defaults()
7677
options.PatientCount.Should().Be(7);
7778
options.ResourcesPerPatient.Should().Be(250);
7879
options.Seed.Should().Be(12345);
80+
options.MaxPollingDurationMinutes.Should().Be(30);
7981
options.CleanupServiceData.Should().BeTrue();
8082
options.CleanupFhirData.Should().BeFalse();
8183
options.ReportMethod.Should().Be(ReportMethod.RegenerateReport);

0 commit comments

Comments
 (0)