R3.2.0->master

automated-tests/src/EMBC.Tests.Automation/EMBC.Tests.Automation.Registrants/EMBC.Tests.Automation.Registrants.csproj

@@ -8,20 +8,20 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.*" />
-		<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="6.0.*" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
+		<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.1" />
+		<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
 		<PackageReference Include="Protractor" Version="1.0.0" />
-		<PackageReference Include="Selenium.Support" Version="4.5.0" />
-		<PackageReference Include="Selenium.WebDriver.ChromeDriver" Version="106.0.5249.6100" />
+		<PackageReference Include="Selenium.Support" Version="4.21.0" />
+		<PackageReference Include="Selenium.WebDriver.ChromeDriver" Version="125.0.6422.14100" />
 		<PackageReference Include="SpecFlow.Plus.LivingDocPlugin" Version="3.9.57" />
 		<PackageReference Include="SpecFlow.xUnit" Version="3.9.74" />
-		<PackageReference Include="xunit" Version="2.4.2" />
-		<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+		<PackageReference Include="xunit" Version="2.8.1" />
+		<PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
 		  <PrivateAssets>all</PrivateAssets>
 		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="FluentAssertions" Version="6.7.0" />
+		<PackageReference Include="FluentAssertions" Version="6.12.0" />
 	</ItemGroup>
 
 </Project>

automated-tests/src/EMBC.Tests.Automation/EMBC.Tests.Automation.Responders/EMBC.Tests.Automation.Responders.csproj

@@ -13,20 +13,20 @@
 
 	<ItemGroup>
 		<PackageReference Include="DotNetSeleniumExtras.WaitHelpers" Version="3.11.0" />
-		<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.*" />
-		<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="6.0.*" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
+		<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.1" />
+		<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
 		<PackageReference Include="Protractor" Version="1.0.0" />
-		<PackageReference Include="Selenium.Support" Version="4.5.0" />
-		<PackageReference Include="Selenium.WebDriver.ChromeDriver" Version="106.0.5249.6100" />
+		<PackageReference Include="Selenium.Support" Version="4.21.0" />
+		<PackageReference Include="Selenium.WebDriver.ChromeDriver" Version="125.0.6422.14100" />
 		<PackageReference Include="SpecFlow.Plus.LivingDocPlugin" Version="3.9.57" />
 		<PackageReference Include="SpecFlow.xUnit" Version="3.9.74" />
-		<PackageReference Include="xunit" Version="2.4.2" />
-		<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+		<PackageReference Include="xunit" Version="2.8.1" />
+		<PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
 		  <PrivateAssets>all</PrivateAssets>
 		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="FluentAssertions" Version="6.7.0" />
+		<PackageReference Include="FluentAssertions" Version="6.12.0" />
 	</ItemGroup>
 
 	<ItemGroup>

ess/src/API/EMBC.ESS.Utilities.Cas/EMBC.ESS.Utilities.Cas.csproj

@@ -19,7 +19,7 @@
     <ItemGroup>
         <PackageReference Include="IdentityModel" Version="7.0.0" />
         <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.5" />
+        <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.6" />
         <PackageReference Include="System.Net.Http.Json" Version="8.0.0" />
     </ItemGroup>
 

ess/src/API/EMBC.ESS.Utilities.Dynamics/EMBC.ESS.Utilities.Dynamics.csproj

@@ -33,12 +33,12 @@
         <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
         <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
         <PackageReference Include="Microsoft.Extensions.Options" Version="8.0.2" />
-        <PackageReference Include="Microsoft.OData.Client" Version="7.21.1" />
-        <PackageReference Include="Microsoft.OData.Core" Version="7.21.1" />
-        <PackageReference Include="Microsoft.OData.Edm" Version="7.21.1" />
+        <PackageReference Include="Microsoft.OData.Client" Version="7.21.3" />
+        <PackageReference Include="Microsoft.OData.Core" Version="7.21.3" />
+        <PackageReference Include="Microsoft.OData.Edm" Version="7.21.3" />
         <PackageReference Include="Microsoft.OData.Extensions.Client" Version="1.0.6" />
-        <PackageReference Include="Microsoft.Spatial" Version="7.21.1" />
-        <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.5" />
+        <PackageReference Include="Microsoft.Spatial" Version="7.21.3" />
+        <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.6" />
         <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
         <PackageReference Include="System.Text.Json" Version="8.0.3" />
     </ItemGroup>

ess/src/API/EMBC.ESS/Engines/Supporting/Configuration.cs

@@ -3,31 +3,32 @@
 using EMBC.ESS.Engines.Supporting.SupportGeneration;
 using EMBC.ESS.Engines.Supporting.SupportGeneration.ReferralPrinting;
 using EMBC.ESS.Engines.Supporting.SupportGeneration.SelfServe;
+using EMBC.ESS.Engines.Supporting.SupportGeneration.SelfServe.SupportCreationStrategies;
 using EMBC.ESS.Engines.Supporting.SupportProcessing;
 using EMBC.Utilities.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace EMBC.ESS.Engines.Supporting
+namespace EMBC.ESS.Engines.Supporting;
+
+public class Configuration : IConfigureComponentServices
 {
-    public class Configuration : IConfigureComponentServices
+    public void ConfigureServices(ConfigurationServices configurationServices)
     {
-        public void ConfigureServices(ConfigurationServices configurationServices)
-        {
-            configurationServices.Services
-                .AddTransient<ISupportingEngine, SupportingEngine>()
-                .AddTransient<SupportProcessingStrategyFactory>()
-                .AddTransient<DigitalSupportProcessingStrategy>()
-                .AddTransient<PaperSupportProcessingStrategy>()
-                .AddTransient<SupportGenerationStrategyStrategyFactory>()
-                .AddTransient<SingleDocumentStrategy>()
-                .AddTransient<SupportComplianceStrategyFactory>()
-                .AddTransient<ISupportComplianceCheck, DuplicateSupportComplianceCheck>()
-                .AddTransient<ISupportComplianceCheck, AmountExceededSupportComplianceCheck>()
-                .AddTransient<PaymentGenerationStrategyFactory>()
-                .AddTransient<SelfServeSupportEligibilityStrategy>()
-                .AddTransient<SelfServeSupportGenerator>()
-                .AddTransient<SelfServeEtransferGenerator>()
-                ;
-        }
+        configurationServices.Services
+            .AddTransient<ISupportingEngine, SupportingEngine>()
+            .AddTransient<SupportProcessingStrategyFactory>()
+            .AddTransient<DigitalSupportProcessingStrategy>()
+            .AddTransient<PaperSupportProcessingStrategy>()
+            .AddTransient<SupportGenerationStrategyStrategyFactory>()
+            .AddTransient<SingleDocumentStrategy>()
+            .AddTransient<SupportComplianceStrategyFactory>()
+            .AddTransient<ISupportComplianceCheck, DuplicateSupportComplianceCheck>()
+            .AddTransient<ISupportComplianceCheck, AmountExceededSupportComplianceCheck>()
+            .AddTransient<PaymentGenerationStrategyFactory>()
+            .AddTransient<SelfServeSupportEligibilityStrategy>()
+            .AddTransient<SelfServeSupportGenerator>()
+            .AddTransient<SelfServeEtransferGenerator>()
+            .AddTransient<ISelfServeSupportCreationStrategy, SelfServeSupportCreationStrategy>()
+            ;
     }
 }

ess/src/API/EMBC.ESS/Engines/Supporting/Contract.cs

@@ -164,7 +164,7 @@ public record SelfServeSupportEligibility(
     IEnumerable<SelfServeSupportType> EligibleSupportTypes,
     IEnumerable<SelfServeSupportType> OneTimePastSupportTypes);
 
-public record GenerateSelfServeSupports(IEnumerable<SelfServeSupportType> SupportTypes, DateTime TaskStartDate, DateTime TaskEndDate, DateTime SupportPeriodFrom, DateTime SupportPeriodTo, IEnumerable<SelfServeHouseholdMember> HouseholdMembersIds) : GenerateRequest;
+public record GenerateSelfServeSupports(IEnumerable<SelfServeSupportType> SupportTypes, DateTime SupportPeriodFrom, DateTime SupportPeriodTo, IEnumerable<SelfServeHouseholdMember> HouseholdMembersIds) : GenerateRequest;
 
 public record SelfServeHouseholdMember(string Id, bool IsMinor);
 

ess/src/API/EMBC.ESS/Engines/Supporting/SupportCompliance/ISupportComplianceStrategy.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
@@ -44,11 +45,11 @@ public SupportComplianceStrategy(params ISupportComplianceCheck[] strategies)
 
         public async Task<CheckSupportComplianceResponse> CheckCompliance(CheckSupportComplianceRequest request, CancellationToken ct = default)
         {
-            var flags = new Dictionary<Support, IEnumerable<SupportFlag>>();
-            foreach (var support in request.Supports)
+            var flags = new ConcurrentDictionary<Support, IEnumerable<SupportFlag>>();
+            await Parallel.ForEachAsync(request.Supports, ct, async (support, ct) =>
             {
-                flags.Add(support, await CheckCompliance(support, ct));
-            }
+                flags.TryAdd(support, await CheckCompliance(support, ct));
+            });
             return new CheckSupportComplianceResponse
             {
                 Flags = flags

ess/src/API/EMBC.ESS/Engines/Supporting/SupportGeneration/SelfServe/SelfServeSupportGenerator.cs

@@ -1,190 +1,38 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using EMBC.ESS.Shared.Contracts.Events.SelfServe;
+using EMBC.ESS.Engines.Supporting.SupportGeneration.SelfServe.SupportCreationStrategies;
 
-namespace EMBC.ESS.Engines.Supporting.SupportGeneration.SelfServe
+namespace EMBC.ESS.Engines.Supporting.SupportGeneration.SelfServe;
+
+internal class SelfServeSupportGenerator(ISelfServeSupportCreationStrategy supportCreationStrategy) : ISupportGenerationStrategy
 {
-    internal class SelfServeSupportGenerator : ISupportGenerationStrategy
+    public Task<GenerateResponse> Generate(GenerateRequest request, CancellationToken ct)
     {
-        public Task<GenerateResponse> Generate(GenerateRequest request, CancellationToken ct)
-        {
-            return request switch
-            {
-                GenerateSelfServeSupports req => Handle(req, ct),
-                CalculateSelfServeSupports req => Handle(req, ct),
-
-                _ => throw new NotImplementedException($"{request.GetType().Name}")
-            };
-        }
-
-        private async Task<GenerateResponse> Handle(CalculateSelfServeSupports req, CancellationToken ct)
-        {
-            foreach (var item in req.Supports)
-            {
-                item.TotalAmount = item switch
-                {
-                    SelfServeClothingSupport s => CalculateSelfServeSupportAmount(s),
-                    SelfServeFoodGroceriesSupport s => CalculateSelfServeSupportAmount(s),
-                    SelfServeFoodRestaurantSupport s => CalculateSelfServeSupportAmount(s),
-                    SelfServeIncidentalsSupport s => CalculateSelfServeSupportAmount(s),
-                    SelfServeShelterAllowanceSupport s => CalculateSelfServeSupportAmount(s),
-
-                    _ => throw new NotImplementedException($"{item.GetType().Name}")
-                };
-            }
-
-            return await Task.FromResult(new GenerateSelfServeSupportsResponse(req.Supports));
-        }
-
-        private async Task<GenerateResponse> Handle(GenerateSelfServeSupports req, CancellationToken ct)
-        {
-            var householdMembers = req.HouseholdMembersIds.ToArray();
-            var supports = req.SupportTypes.Select(n => CreateSupportsForNeed(n, req.SupportPeriodFrom, req.SupportPeriodTo, householdMembers)).ToList();
-            return await Task.FromResult(new GenerateSelfServeSupportsResponse(supports));
-        }
-
-        private static IEnumerable<DateOnly> CreateSupportDays(DateTime from, DateTime to)
+        return request switch
         {
-            while (from.Date < to.Date)
-            {
-                yield return DateOnly.FromDateTime(from.Date);
-                from = from.AddDays(1);
-            }
-        }
+            GenerateSelfServeSupports req => Handle(req, ct),
+            CalculateSelfServeSupports req => Handle(req, ct),
 
-        private static SelfServeSupport CreateSupportsForNeed(SelfServeSupportType type, DateTime from, DateTime to, IEnumerable<SelfServeHouseholdMember> householdMembers) =>
-            type switch
-            {
-                SelfServeSupportType.FoodGroceries => CreateSelfServeFoodGroceriesSupport(from, to, householdMembers),
-                SelfServeSupportType.FoodRestaurant => CreateSelfServeFoodRestaurantSupport(from, to, householdMembers),
-                SelfServeSupportType.Incidentals => CreateIncidentalsSupport(householdMembers),
-                SelfServeSupportType.Clothing => CreateClothingSupport(householdMembers),
-                SelfServeSupportType.ShelterAllowance => CreateShelterAllowanceSupport(from, to, householdMembers),
-
-                _ => throw new NotImplementedException($"{type}")
-            };
-
-        private static SelfServeClothingSupport CreateClothingSupport(IEnumerable<SelfServeHouseholdMember> householdMembers)
-        {
-            var support = new SelfServeClothingSupport
-            {
-                IncludedHouseholdMembers = householdMembers.Select(hm => hm.Id).ToList(),
-                TotalAmount = 0d
-            };
-            support.TotalAmount = CalculateSelfServeSupportAmount(support);
-            return support;
-        }
-
-        private static double CalculateSelfServeSupportAmount(SelfServeClothingSupport support) => 150 * support.IncludedHouseholdMembers.Count();
-
-        private static SelfServeIncidentalsSupport CreateIncidentalsSupport(IEnumerable<SelfServeHouseholdMember> householdMembers)
-        {
-            var support = new SelfServeIncidentalsSupport()
-            {
-                IncludedHouseholdMembers = householdMembers.Select(hm => hm.Id).ToList(),
-                TotalAmount = 0d
-            };
-            support.TotalAmount = CalculateSelfServeSupportAmount(support);
-            return support;
-        }
-
-        private static double CalculateSelfServeSupportAmount(SelfServeIncidentalsSupport support) => 50 * support.IncludedHouseholdMembers.Count();
-
-        private static SelfServeShelterAllowanceSupport CreateShelterAllowanceSupport(DateTime from, DateTime to, IEnumerable<SelfServeHouseholdMember> householdMembers)
-        {
-            var support = new SelfServeShelterAllowanceSupport
-            {
-                Nights = CreateSupportDays(from, to).Take(3).ToList(),
-                IncludedHouseholdMembers = householdMembers.Select(hm => hm.Id).ToList(),
-                TotalAmount = 0d
-            };
-            support.TotalAmount = CalculateSelfServeSupportAmount(support);
-            return support;
-        }
-
-        private static double CalculateSelfServeSupportAmount(SelfServeShelterAllowanceSupport support) => support.IncludedHouseholdMembers.Any() ? 200d * support.Nights.Count() : 0d;
-
-        private static SelfServeFoodGroceriesSupport CreateSelfServeFoodGroceriesSupport(DateTime from, DateTime to, IEnumerable<SelfServeHouseholdMember> householdMembers)
-        {
-            var support = new SelfServeFoodGroceriesSupport
-            {
-                Nights = CreateSupportDays(from, to).Take(3).ToList(),
-                IncludedHouseholdMembers = householdMembers.Select(hm => hm.Id).ToList(),
-                TotalAmount = 0d
-            };
-            support.TotalAmount = CalculateSelfServeSupportAmount(support);
-            return support;
-        }
-
-        private static double CalculateSelfServeSupportAmount(SelfServeFoodGroceriesSupport support) => support.IncludedHouseholdMembers.Count() * support.Nights.Count() * 22.5d;
-
-        private static SelfServeFoodRestaurantSupport CreateSelfServeFoodRestaurantSupport(DateTime from, DateTime to, IEnumerable<SelfServeHouseholdMember> householdMembers)
-        {
-            var support = new SelfServeFoodRestaurantSupport
-            {
-                Meals = CalculateMealPlan(from, to),
-                IncludedHouseholdMembers = householdMembers.Select(hm => hm.Id).ToList(),
-                TotalAmount = 0d
-            };
-            support.TotalAmount = CalculateSelfServeSupportAmount(support);
-            return support;
-        }
-
-        private static IEnumerable<SupportDayMeals> CalculateMealPlan(DateTime from, DateTime to)
-        {
-            var meals = new Dictionary<DateOnly, SupportDayMeals>();
-
-            var startingTime = from;
-            var endingTime = to;
-
-            // allow previous day dinner if breakfast is selected for first day
-            if (startingTime.Hour < 11)
-            {
-                var prevDay = DateOnly.FromDateTime(from.AddDays(-1));
-                meals.Add(prevDay, new SupportDayMeals(prevDay) { Dinner = false });
-            }
-
-            while (startingTime < endingTime)
-            {
-                var day = DateOnly.FromDateTime(startingTime);
-                var meal = meals.ContainsKey(day) ? meals[day] : new SupportDayMeals(day);
-                switch (startingTime.Hour)
-                {
-                    case >= 1 and < 11:
-                        meal.Breakfast = meals.Values.Count(m => m.Breakfast == true) < 3;
-                        startingTime = new DateTime(day, new TimeOnly(11, 1), DateTimeKind.Unspecified);
-                        break;
-
-                    case >= 11 and < 15:
-                        meal.Lunch = meals.Values.Count(m => m.Lunch == true) < 3;
-                        startingTime = new DateTime(day, new TimeOnly(15, 1), DateTimeKind.Unspecified);
-                        break;
-
-                    case (>= 15 and <= 24) or (>= 0 and < 1):
-                        meal.Dinner = meals.Values.Count(m => m.Dinner == true) < 3;
-                        startingTime = new DateTime(day.AddDays(1), new TimeOnly(1, 1), DateTimeKind.Unspecified);
-                        break;
-                }
-                meals[day] = meal;
-            }
+            _ => throw new NotImplementedException($"{request.GetType().Name}")
+        };
+    }
 
-            return meals.Values;
-        }
+    private async Task<GenerateResponse> Handle(CalculateSelfServeSupports req, CancellationToken ct)
+    {
+        await Task.CompletedTask;
+        var supports = req.Supports.Select(supportCreationStrategy.Evaluate).Where(supportCreationStrategy.Validate);
+        return new GenerateSelfServeSupportsResponse(supports);
+    }
 
-        private static double CalculateSelfServeSupportAmount(SelfServeFoodRestaurantSupport support)
-        {
-            var numberOfHouseholdMembers = support.IncludedHouseholdMembers.Count();
-            var amount = 0d;
-            foreach (var meal in support.Meals)
-            {
-                if (meal.Breakfast == true) amount += 12.75d * numberOfHouseholdMembers;
-                if (meal.Lunch == true) amount += 14.75d * numberOfHouseholdMembers;
-                if (meal.Dinner == true) amount += 25.50d * numberOfHouseholdMembers;
-            }
-            return amount;
-        }
+    private async Task<GenerateResponse> Handle(GenerateSelfServeSupports req, CancellationToken ct)
+    {
+        await Task.CompletedTask;
+        var supports = req.SupportTypes
+            .Select(t => supportCreationStrategy.Create(new CreateSelfServeSupport(t, req.HouseholdMembersIds, req.SupportPeriodFrom, req.SupportPeriodTo)))
+            .Where(supportCreationStrategy.Validate)
+            .ToList();
+        return new GenerateSelfServeSupportsResponse(supports);
     }
 }