R3.2.0->master

ess/src/API/EMBC.ESS/Engines/Supporting/SupportProcessing/SelfServeSupportEligibilityStrategy.cs

@@ -120,12 +120,12 @@ private async Task<SelfServeSupportEligibility> ValidateEligibility(ValidateSelf
         }
 
         // check if household member composition changed from the last needs assessment
-        var previousNeedsAssessment = ctx.era_needassessments
+        var initialNeedsAssessment = ctx.era_needassessments
             .Expand(na => na.era_era_householdmember_era_needassessment)
-            .Where(na => na.era_needassessmentid != currentNeedsAssessment.era_needassessmentid && na.era_EvacuationFile.era_evacuationfileid == file.era_evacuationfileid).OrderByDescending(na => na.createdon).FirstOrDefault();
-        if (previousNeedsAssessment != null)
+            .Where(na => na.era_needassessmentid != currentNeedsAssessment.era_needassessmentid && na.era_EvacuationFile.era_evacuationfileid == file.era_evacuationfileid).OrderBy(na => na.createdon).FirstOrDefault();
+        if (initialNeedsAssessment != null)
         {
-            if (previousNeedsAssessment.era_era_householdmember_era_needassessment.Count < currentNeedsAssessment.era_era_householdmember_era_needassessment.Count)
+            if (initialNeedsAssessment.era_era_householdmember_era_needassessment.Count < currentNeedsAssessment.era_era_householdmember_era_needassessment.Count)
             {
                 // current needs assessment has more household members than previous needs assessment
                 return NotEligible("Current needs assessment has more household members from the previous needs asessment",
@@ -134,7 +134,7 @@ private async Task<SelfServeSupportEligibility> ValidateEligibility(ValidateSelf
 #pragma warning disable S3267 // Loops should be simplified with "LINQ" expressions
             foreach (var householdMember in currentNeedsAssessment.era_era_householdmember_era_needassessment)
             {
-                var previouseHouseholdMember = previousNeedsAssessment.era_era_householdmember_era_needassessment.SingleOrDefault(hm => hm.era_householdmemberid == householdMember.era_householdmemberid);
+                var previouseHouseholdMember = initialNeedsAssessment.era_era_householdmember_era_needassessment.SingleOrDefault(hm => hm.era_householdmemberid == householdMember.era_householdmemberid);
                 if (previouseHouseholdMember == null)
                 {
                     // not found in previous needs assessment
@@ -314,6 +314,8 @@ private static SelfServeSupportType MapSupportTypeToSelfServeSupportType(Support
 
     private static async Task<IEnumerable<era_evacueesupport>> GetDuplicateSupportsForHouseholdMember(EssContext ctx, era_householdmember hm, int[] similarSupportTypes, DateTimeOffset eligibleFrom, DateTimeOffset eligibleTo, CancellationToken ct)
     {
+        eligibleFrom = eligibleFrom.Date;
+        eligibleTo = eligibleTo.Date;
         return await ctx.era_evacueesupports
             .WhereNotIn(s => s.statuscode.Value, [(int)Resources.Supports.SupportStatus.Cancelled, (int)Resources.Supports.SupportStatus.Void])
             .WhereIn(s => s.era_supporttype.Value, similarSupportTypes)

ess/src/API/EMBC.ESS/Managers/Events/EventsManager.Supports.cs

@@ -353,14 +353,14 @@ public async Task<DraftSelfServeSupportQueryResponse> Handle(DraftSelfServeSuppo
         IEnumerable<SelfServeSupport> supports;
         if (query.Items == null)
         {
-            //generate the supports based on the file
+            //generate the supports based on the needs assessment
             var response = (GenerateSelfServeSupportsResponse)await supportingEngine.Generate(new GenerateSelfServeSupports(
-                mapper.Map<IEnumerable<SelfServeSupportType>>(file.NeedsAssessment.EligibilityCheck.SupportSettings.Select(s => s.Type)),
+                mapper.Map<IEnumerable<SelfServeSupportType>>(file.NeedsAssessment.EligibilityCheck.SupportSettings.Where(s => s.State == Resources.Evacuations.SelfServeSupportEligibilityState.Available).Select(s => s.Type)),
                 task.StartDate.ToPST(),
                 task.EndDate.ToPST(),
                 file.NeedsAssessment.EligibilityCheck.From.Value.ToPST(),
                 file.NeedsAssessment.EligibilityCheck.To.Value.ToPST(),
-                file.HouseholdMembers.Select(hm => new SelfServeHouseholdMember(hm.Id, hm.IsMinor)).ToList()));
+                file.NeedsAssessment.HouseholdMembers.Select(hm => new SelfServeHouseholdMember(hm.Id, hm.IsMinor)).ToList()));
             supports = response.Supports;
         }
         else

ess/src/API/EMBC.Tests.Integration.ESS/Engines/Supporting/ComplianceTests.cs

@@ -30,8 +30,6 @@ public async Task CheckSupportComplianceRequest_OneDuplicate_FlagReturned(Suppor
         {
             var fileId = TestData.EvacuationFileId;
             var householdMembers = TestData.HouseholdMemberIds;
-            //var initialSupport = new ShelterHotelSupport { FileId = fileId, SupportDelivery = new Referral(), NumberOfNights = 3, NumberOfRooms = 3 };
-            //var duplicatedSupport = new ShelterAllowanceSupport { FileId = fileId, SupportDelivery = new Interac(), TotalAmount = 100m };
             await DuplicateCheck(fileId, householdMembers, initialSupport, duplicatedSupport, TimeSpan.FromMinutes(5), TimeSpan.FromMinutes(5));
         }
 

ess/src/API/EMBC.Tests.Integration.ESS/Engines/Supporting/SelfServeTests.cs

@@ -112,6 +112,20 @@ public async Task ValidateEligibility_DuplicateSupports_False()
         await RunEligibilityTest(file2.Id, false, "Overlapping supports found");
     }
 
+    [Fact]
+    public async Task ValidateEligibility_DuplicateSupportsSameDay_False()
+    {
+        var (file1, registrant) = await CreateTestSubjects(taskNumber: TestData.SelfServeActiveTaskId, homeAddress: TestHelper.CreateSelfServeEligibleAddress());
+        var previousSupports = new[]
+        {
+            new ShelterAllowanceSupport{FileId = file1.Id, From = DateTime.Now.AddHours(-72), To = DateTime.Now.AddMinutes(30), IncludedHouseholdMembers = file1.NeedsAssessment.HouseholdMembers.Select(hm=>hm.Id), SupportDelivery = new Referral() }
+        };
+        await SaveSupports(file1.Id, previousSupports);
+
+        var (file2, _) = await CreateTestSubjects(taskNumber: TestData.SelfServeActiveTaskId, homeAddress: TestHelper.CreateSelfServeEligibleAddress(), existingRegistrant: registrant);
+        await RunEligibilityTest(file2.Id, false, "Overlapping supports found");
+    }
+
     [Fact]
     public async Task ValidateEligibility_NotDuplicateSupport_True()
     {
@@ -206,13 +220,30 @@ public async Task ValidateExtensionEligibility_NonExtensibleSupport_True()
         };
         await SaveSupports(file.Id, previousSupports);
 
+        await Task.Delay(1000);
         await UpdateTestFile(file);
 
         var eligibility2 = await RunEligibilityTest(file.Id, true);
         eligibility2.EligibleSupportTypes.ShouldNotContain(SelfServeSupportType.Incidentals);
         eligibility2.OneTimePastSupportTypes.ShouldBe([SelfServeSupportType.Incidentals]);
     }
 
+    [Fact]
+    public async Task ValidateExtensionEligibility_FileUpdatedTwiceWithMoreHouseholdMembers_False()
+    {
+        var (file, _) = await CreateTestSubjects(numberOfHoldholdMembers: 2, needs: [IdentifiedNeed.Food], homeAddress: TestHelper.CreateSelfServeEligibleAddress());
+
+        var newHouseholdMember = file.HouseholdMembers.Last() with { Id = null, IsPrimaryRegistrant = false, DateOfBirth = "1/19/2002" };
+        await UpdateTestFile(file, householdMembers: file.NeedsAssessment.HouseholdMembers.Append(newHouseholdMember));
+        await RunEligibilityTest(file.Id, false, "Current needs assessment has more household members from the previous needs asessment");
+
+        await Task.Delay(1000);
+
+        await UpdateTestFile(file);
+
+        await RunEligibilityTest(file.Id, false, "Current needs assessment has more household members from the previous needs asessment");
+    }
+
     [Fact]
     public async Task ValidateEligibility_PreviousOnetimeSupports_TrueWithoutOneTimeSupports()
     {
@@ -222,8 +253,8 @@ public async Task ValidateEligibility_PreviousOnetimeSupports_TrueWithoutOneTime
             new ClothingSupport
             {
                 FileId = file1.Id,
-                From = DateTime.Now.AddDays(-3).AddHours(-3),
-                To = DateTime.Now.AddHours(-3),
+                From = DateTime.Now.AddDays(-4).AddHours(-3),
+                To = DateTime.Now.AddDays(-1).AddHours(-3),
                 IncludedHouseholdMembers = file1.NeedsAssessment.HouseholdMembers.Select(hm=>hm.Id),
                 SupportDelivery = new Referral()
             }

ess/src/API/EMBC.Tests.Integration.ESS/Resources/TaskTests.cs

@@ -49,5 +49,6 @@ public async System.Threading.Tasks.Task CanGetTaskWithSelfServeSupports()
         task.Id.ShouldBe(TestData.SelfServeActiveTaskId);
         task.Status.ShouldBe(EMBC.ESS.Resources.Tasks.TaskStatus.Active);
         task.EnabledSupports.ShouldNotBeEmpty();
+        task.SelfServeEnabled.ShouldBeTrue();
     }
 }

registrants/src/API/EMBC.Registrants.API/Controllers/EvacuationsController.cs

@@ -164,9 +164,10 @@ public record EvacuationFile
     public string? SecretPhrase { get; set; }
     public bool? SecretPhraseEdited { get; set; }
     public DateTime LastModified { get; set; }
-    public IEnumerable<Support> Supports { get; set; } = Array.Empty<Support>();
+    public IEnumerable<Support> Supports { get; set; } = [];
     public string? ManualFileId { get; set; }
     public bool? IsPaper { get; set; }
+    public bool SelfServeEnabled { get; set; }
 }
 
 /// <summary>
@@ -179,10 +180,10 @@ public record NeedsAssessment
     [Required]
     public InsuranceOption Insurance { get; set; }
 
-    public IEnumerable<HouseholdMember> HouseholdMembers { get; set; } = Array.Empty<HouseholdMember>();
-    public IEnumerable<Pet> Pets { get; set; } = Array.Empty<Pet>();
+    public IEnumerable<HouseholdMember> HouseholdMembers { get; set; } = [];
+    public IEnumerable<Pet> Pets { get; set; } = [];
     public NeedsAssessmentType Type { get; set; }
-    public IEnumerable<IdentifiedNeed> Needs { get; set; } = Array.Empty<IdentifiedNeed>();
+    public IEnumerable<IdentifiedNeed> Needs { get; set; } = [];
 }
 
 [JsonConverter(typeof(JsonStringEnumConverter))]
@@ -321,7 +322,7 @@ public abstract record Support
 
     public abstract SupportSubCategory SubCategory { get; }
 
-    public IEnumerable<string> IncludedHouseholdMembers { get; set; } = Array.Empty<string>();
+    public IEnumerable<string> IncludedHouseholdMembers { get; set; } = [];
     public string? ManualReferralId { get; set; }
 
     public SupportMethod Method { get; set; }

registrants/src/API/EMBC.Registrants.API/Mappers/Mappings.cs

@@ -110,6 +110,7 @@ public Mappings()
                 .ForMember(d => d.SecretPhrase, opts => opts.MapFrom(s => s.SecurityPhrase))
                 .ForMember(d => d.SecretPhraseEdited, opts => opts.MapFrom(s => false))
                 .ForMember(d => d.LastModified, opts => opts.MapFrom(s => s.NeedsAssessment.CompletedOn))
+                .ForMember(d => d.SelfServeEnabled, opts => opts.MapFrom(s => s.RelatedTask != null && s.RelatedTask.SelfServeEnabled))
                 ;
 
             CreateMap<ESS.Shared.Contracts.Events.Support, Support>()

registrants/src/UI/embc-registrant/angular.json

@@ -73,8 +73,12 @@
               "proxyConfig": "proxy.conf.json",
               "buildTarget": "embc-registrant:build:local"
             },
-            "dev": {
-              "proxyConfig": "proxy.dev.conf.json",
+            "dev-prj": {
+              "proxyConfig": "proxy.dev-prj.conf.json",
+              "buildTarget": "embc-registrant:build:local"
+            },
+            "dev-sup": {
+              "proxyConfig": "proxy.dev-sup.conf.json",
               "buildTarget": "embc-registrant:build:local"
             },
             "production": {

registrants/src/UI/embc-registrant/package.json

@@ -3,15 +3,17 @@
   "version": "0.0.0",
   "scripts": {
     "ng": "ng",
-    "start": "ng serve --port 5200 --configuration=dev",
-    "startlocal": "npm run gen-api-local && ng serve --port 5200 --configuration=local",
+    "start-prj": "ng serve --port 5200 --configuration=dev-prj",
+    "start-sup": "ng serve --port 5200 --configuration=dev-sup",
+    "start": "ng serve --port 5200 --configuration=local",
     "build": "ng build",
     "test": "ng test",
     "lint": "ng lint",
     "format:write": "prettier . --write",
     "e2e": "ng e2e",
-    "gen-api": "ng-openapi-gen -i https://dev-era-evacuees.apps.silver.devops.gov.bc.ca/api/openapi/v1/openapi.json -o ./src/app/core/api --ignoreUnusedModels false && npm run format:write",
-    "gen-api-local": "ng-openapi-gen -i http://localhost:5020/api/openapi/v1/openapi.json -o ./src/app/core/api --ignoreUnusedModels false"
+    "gen-api-prj": "ng-openapi-gen -i https://dev-prj-era-evacuees.apps.silver.devops.gov.bc.ca/api/openapi/v1/openapi.json -o ./src/app/core/api --ignoreUnusedModels false && npm run format:write",
+    "gen-api-sup": "ng-openapi-gen -i https://dev-sup-era-evacuees.apps.silver.devops.gov.bc.ca/api/openapi/v1/openapi.json -o ./src/app/core/api --ignoreUnusedModels false && npm run format:write",
+    "gen-api-local": "ng-openapi-gen -i http://localhost:5020/api/openapi/v1/openapi.json -o ./src/app/core/api --ignoreUnusedModels false && npm run format:write"
   },
   "private": true,
   "dependencies": {

registrants/src/UI/embc-registrant/proxy.conf.json

@@ -25,7 +25,7 @@
     "logLevel": "debug"
   },
   "/env/info.json": {
-    "target": "https://dev-era-evacuees.apps.silver.devops.gov.bc.ca",
+    "target": "https://dev-sup-era-evacuees.apps.silver.devops.gov.bc.ca",
     "secure": false,
     "changeOrigin": true,
     "logLevel": "debug"

registrants/src/UI/embc-registrant/proxy.dev.conf.json → registrants/src/UI/embc-registrant/proxy.dev-prj.conf.json

@@ -1,41 +1,41 @@
 {
   "/api": {
-    "target": "https://dev-era-evacuees.apps.silver.devops.gov.bc.ca",
+    "target": "https://dev-prj-era-evacuees.apps.silver.devops.gov.bc.ca",
     "secure": false,
     "changeOrigin": true,
     "logLevel": "debug"
   },
   "/login": {
-    "target": "https://dev-era-evacuees.apps.silver.devops.gov.bc.ca",
+    "target": "https://dev-prj-era-evacuees.apps.silver.devops.gov.bc.ca",
     "secure": false,
     "changeOrigin": true,
     "logLevel": "debug"
   },
   "/token": {
-    "target": "https://dev-era-evacuees.apps.silver.devops.gov.bc.ca",
+    "target": "https://dev-prj-era-evacuees.apps.silver.devops.gov.bc.ca",
     "secure": false,
     "changeOrigin": true,
     "logLevel": "debug"
   },
   "/signin-oidc": {
-    "target": "https://dev-era-evacuees.apps.silver.devops.gov.bc.ca",
+    "target": "https://dev-prj-era-evacuees.apps.silver.devops.gov.bc.ca",
     "secure": false,
     "changeOrigin": true,
     "logLevel": "debug"
   },
   "/join": {
-    "target": "https://dev-era-evacuees.apps.silver.devops.gov.bc.ca",
+    "target": "https://dev-prj-era-evacuees.apps.silver.devops.gov.bc.ca",
     "secure": false,
     "logLevel": "debug"
   },
   "/env/info.json": {
-    "target": "https://dev-era-evacuees.apps.silver.devops.gov.bc.ca",
+    "target": "https://dev-prj-era-evacuees.apps.silver.devops.gov.bc.ca",
     "secure": false,
     "changeOrigin": true,
     "logLevel": "debug"
   },
   "/version": {
-    "target": "https://dev-era-evacuees.apps.silver.devops.gov.bc.ca",
+    "target": "https://dev-prj-era-evacuees.apps.silver.devops.gov.bc.ca",
     "secure": false,
     "changeOrigin": true,
     "logLevel": "debug"

registrants/src/UI/embc-registrant/proxy.dev-sup.conf.json

@@ -0,0 +1,43 @@
+{
+  "/api": {
+    "target": "https://dev-sup-era-evacuees.apps.silver.devops.gov.bc.ca",
+    "secure": false,
+    "changeOrigin": true,
+    "logLevel": "debug"
+  },
+  "/login": {
+    "target": "https://dev-sup-era-evacuees.apps.silver.devops.gov.bc.ca",
+    "secure": false,
+    "changeOrigin": true,
+    "logLevel": "debug"
+  },
+  "/token": {
+    "target": "https://dev-sup-era-evacuees.apps.silver.devops.gov.bc.ca",
+    "secure": false,
+    "changeOrigin": true,
+    "logLevel": "debug"
+  },
+  "/signin-oidc": {
+    "target": "https://dev-sup-era-evacuees.apps.silver.devops.gov.bc.ca",
+    "secure": false,
+    "changeOrigin": true,
+    "logLevel": "debug"
+  },
+  "/join": {
+    "target": "https://dev-sup-era-evacuees.apps.silver.devops.gov.bc.ca",
+    "secure": false,
+    "logLevel": "debug"
+  },
+  "/env/info.json": {
+    "target": "https://dev-sup-era-evacuees.apps.silver.devops.gov.bc.ca",
+    "secure": false,
+    "changeOrigin": true,
+    "logLevel": "debug"
+  },
+  "/version": {
+    "target": "https://dev-sup-era-evacuees.apps.silver.devops.gov.bc.ca",
+    "secure": false,
+    "changeOrigin": true,
+    "logLevel": "debug"
+  }
+}

registrants/src/UI/embc-registrant/src/app/core/api/models/evacuation-file.ts

@@ -26,6 +26,7 @@ export interface EvacuationFile {
   needsAssessment: NeedsAssessment;
   secretPhrase?: string | null;
   secretPhraseEdited?: boolean | null;
+  selfServeEnabled?: boolean;
   status?: EvacuationFileStatus;
   supports?: Array<
     | ClothingSupport

registrants/src/UI/embc-registrant/src/app/core/components/dialog-components/ess-file-update-active-dialog/ess-file-update-active-dialog.component.html

@@ -12,7 +12,7 @@
   <div style="text-align: center; padding: 0 var(--size-2)">
     <h1 mat-dialog-title>Revised Needs Assessment Submitted</h1>
     <p class="card-heading">
-      For {{ supportType }}, please connect with an ESS Responder or proceed to your closet Reception Center.
+      For {{ supportType }}, please connect with an ESS Responder or proceed to your closest Reception Center.
     </p>
   </div>
 

registrants/src/UI/embc-registrant/src/app/core/components/dialog-components/ess-file-update-pending-or-expired-dialog/ess-file-update-pending-or-expired-dialog.component.html

@@ -11,7 +11,7 @@
 <mat-dialog-content>
   <h1 mat-dialog-title>ESS File Successfully Updated</h1>
   <p class="card-heading">
-    For Supports, please connect with an ESS Responder or proceed to your closet Reception Center.
+    For Supports, please connect with an ESS Responder or proceed to your closest Reception Center.
   </p>
 </mat-dialog-content>
 

registrants/src/UI/embc-registrant/src/app/sharedModules/components/evacuation-file/evacuation-card/evacuation-card.component.html

@@ -3,9 +3,11 @@
     <span class="evacuatedSecondary">Evacuated From</span>
     <mat-card-title class="evacuatedTitle">
       {{ evacuationFileCard?.evacuatedAddress?.community?.name }}
-      @if ([EvacuationFileStatus.Active].includes(evacuationFileCard?.status) && hasNoSupports) {
+      @if ([EvacuationFileStatus.Active].includes(evacuationFileCard?.status) && hasNoSupports && canExtendSupports) {
         <mat-chip disabled>Supports available</mat-chip>
-      } @else if ([EvacuationFileStatus.Active].includes(evacuationFileCard?.status) && !hasActiveSupports) {
+      } @else if (
+        [EvacuationFileStatus.Active].includes(evacuationFileCard?.status) && !hasActiveSupports && canExtendSupports
+      ) {
         <mat-chip disabled> Support extensions available</mat-chip>
       }
     </mat-card-title>

registrants/src/UI/embc-registrant/src/app/sharedModules/components/evacuation-file/evacuation-card/evacuation-card.component.ts

@@ -26,6 +26,7 @@ export class EvacuationCardComponent implements OnInit {
 
   hasActiveSupports: boolean = false;
   hasNoSupports: boolean = false;
+  canExtendSupports: boolean = false;
 
   constructor(
     private router: Router,
@@ -41,6 +42,8 @@ export class EvacuationCardComponent implements OnInit {
     this.hasActiveSupports = this.evacuationFileDataService.hasActiveSupports(this.evacuationFileCard.supports);
 
     this.hasNoSupports = this.evacuationFileDataService.hasNoSupports(this.evacuationFileCard.supports);
+
+    this.canExtendSupports = this.evacuationFileCard?.selfServeEnabled ?? false;
   }
 
   changeStatusColor(): void {

registrants/src/UI/embc-registrant/src/app/sharedModules/components/evacuation-file/evacuation-details/evacuation-details.component.html

@@ -56,7 +56,7 @@
       </div>
       <div style="flex: 1; color: #333">
         <h2>Ensure Your Evacuation Details are Up-to-Date</h2>
-        <p>Verify the information provided below and update your ESS File if required.</p>
+        <p><b>Verify the information provided below and update your ESS File if required.</b></p>
       </div>
       <button style="width: 240px" mat-button class="button-p" (click)="gotoUpdateDetails()">
         Update your Details

responders/src/UI/embc-responder/src/app/core/services/global-constants.ts

@@ -643,4 +643,11 @@ export const incidentalsNeedDialog: DialogContent = {
   text: 'Incidentals could include items such as personal hygiene products like toothpaste, laundry soap and/or pet food.'
 };
 
+export const duplicateHouseholdMemberWarning: DialogContent = {
+  title: '<b>Duplicate Household Member Detected</b>',
+  text: `<p>It looks like the member you are trying to add already exists in the household.</p>
+  <p>Please review the existing members before proceeding.</p>`,
+  cancelButton: 'Close'
+};
+
 export const noAssistanceRequired = 'Household currently does not require assistance.';