Merge pull request #764 from bcgov/develop

promote

backend/edt.disclosure/HttpClients/Services/EdtDIsclosure/EdtDisclosureClient.cs

@@ -857,7 +857,7 @@ public async Task<int> CreateCase(EdtCaseDto caseInfo)
     /// <exception cref="EdtDisclosureServiceException"></exception>
     public async Task<IEnumerable<KeyIdPair>> GetUserCases(string userIdOrKey)
     {
-        this.logger.LogInformation($"Getting cases for user {userIdOrKey}");
+        this.logger.LogInformation($"Getting cases for user {userIdOrKey} org-unit {this.EdtOrgUnitId}");
 
         var response = await this.GetAsync<IEnumerable<KeyIdPair>>($"api/v1/org-units/{this.EdtOrgUnitId}/users/{userIdOrKey}/cases");
 

backend/webapi/Features/Parties/ProfileStatus.Model.cs

@@ -1,6 +1,8 @@
 namespace Pidp.Features.Parties;
 
 using System.Security.Claims;
+using Microsoft.EntityFrameworkCore;
+using Pidp.Data;
 using Pidp.Extensions;
 using Pidp.Infrastructure.HttpClients.Claims;
 using Pidp.Models;
@@ -451,15 +453,25 @@ protected override void SetAlertsAndStatus(ProfileStatusDto profile)
 
         public class DefenceDelegateControls : ProfileSection
         {
+            private readonly PidpDbContext context;
+
             internal override string SectionName => "digitalEvidenceCounselDelegateControls";
-            public DefenceDelegateControls(ProfileStatusDto profile) : base(profile) { }
+
+            public DefenceDelegateControls(ProfileStatusDto profile) : base(profile)
+            {
+
+            }
+
             protected override void SetAlertsAndStatus(ProfileStatusDto profile)
             {
                 if (!profile.UserIsInLawSociety)
                 {
                     this.StatusCode = StatusCode.Hidden;
                     return;
                 }
+
+
+
                 if (profile.CompletedEnrolments.Contains(AccessTypeCode.DigitalEvidenceDefence))
                 {
                     this.StatusCode = StatusCode.Available;
@@ -472,27 +484,39 @@ protected override void SetAlertsAndStatus(ProfileStatusDto profile)
                 }
                 this.StatusCode = StatusCode.Incomplete;
             }
+
         }
 
         public class DefenseDelegateAccess : ProfileSection
         {
+            private readonly PidpDbContext context;
+
             internal override string SectionName => "digitalEvidenceCounselDelegateAccess";
-            public DefenseDelegateAccess(ProfileStatusDto profile) : base(profile) { }
+            public DefenseDelegateAccess(ProfileStatusDto profile) : base(profile)
+            {
+
+            }
+
+
+
             protected override void SetAlertsAndStatus(ProfileStatusDto profile)
             {
                 if (!profile.UserIsBcServicesCardDefenseDelegate)
                 {
                     this.StatusCode = StatusCode.Hidden;
                     return;
                 }
-                if (profile.CompletedEnrolments.Contains(AccessTypeCode.DigitalEvidenceDefence))
+
+                if (!profile.DemographicsEntered)
                 {
-                    this.StatusCode = StatusCode.Available;
+                    this.StatusCode = StatusCode.Locked;
                     return;
                 }
-                if (!profile.DemographicsEntered)
+
+
+                if (profile.IsActiveDelegateUser)
                 {
-                    this.StatusCode = StatusCode.Locked;
+                    this.StatusCode = StatusCode.Complete;
                     return;
                 }
                 this.StatusCode = StatusCode.Incomplete;

backend/webapi/Features/Parties/ProfileStatus.cs

@@ -28,10 +28,14 @@ namespace Pidp.Features.Parties;
 public partial class ProfileStatus
 {
     private readonly PidpConfiguration configuration;
+    private readonly ILogger<ProfileStatus> logger;
+    private readonly PidpDbContext dbContext;
 
-    public ProfileStatus(PidpConfiguration configuration)
+    public ProfileStatus(PidpConfiguration configuration, ILogger<ProfileStatus> logger, PidpDbContext dbContext)
     {
         this.configuration = configuration;
+        this.logger = logger;
+        this.dbContext = dbContext;
     }
     private static readonly Histogram ProfileDuration = Metrics.CreateHistogram("pidp_profile_duration", "Histogram of profile duration requests.");
 
@@ -67,6 +71,7 @@ public abstract class ProfileSection
             public ProfileSection(ProfileStatusDto profile) => this.SetAlertsAndStatus(profile);
 
             protected abstract void SetAlertsAndStatus(ProfileStatusDto profile);
+
         }
 
 
@@ -186,6 +191,7 @@ await this.profileUpdateService.UpdateUserProfile(new UpdatePersonContactInfoMod
                     : null;
 
 
+
                 // if the user is a BCPS user then we'll flag this portion as completed
                 if (profile.OrganizationDetailEntered && profile.OrganizationCode == OrganizationCode.CorrectionService && orgCorrectionDetail != null)
                 {
@@ -273,7 +279,11 @@ await this.profileUpdateService.UpdateUserProfile(new UpdatePersonContactInfoMod
                     profile.UserTypes = lookups;
                 }
 
-
+                if (profile.UserIsBcServicesCardDefenseDelegate)
+                {
+                    var validDelegate = this.context.DelegateAccessRequests.Where(req => req.Party == party && req.RequestStatus == "Granted").Any();
+                    profile.IsActiveDelegateUser = validDelegate;
+                }
 
 
                 var profileStatus = new Model
@@ -289,15 +299,16 @@ await this.profileUpdateService.UpdateUserProfile(new UpdatePersonContactInfoMod
                     new Model.DigitalEvidenceCaseManagement(profile),
                     // controls for the lawyer to manage delegates
                     new Model.DefenceDelegateControls(profile),
-                    // controls for delegates to request access
                     new Model.DefenseDelegateAccess(profile),
+                    // controls for delegates to request access
                     new Model.DefenseAndDutyCounsel(profile),
                     //new Model.Uci(profile),
                     new Model.SubmittingAgencyCaseManagement(profile),
                 }
                     .ToDictionary(section => section.SectionName, section => section)
                 };
 
+
                 // handle ordering
                 this.OrderProfile(command.User, profileStatus);
 
@@ -390,6 +401,7 @@ public class ProfileStatusDto
         public PublicUserValidation? CodeValidations { get; set; }
         public string? JusticeSectorService { get; set; }
         public string? EmployeeIdentifier { get; set; }
+        public bool IsActiveDelegateUser { get; set; }
         //public bool OrganizationDetailEntered { get; set; }
         public IEnumerable<AccessTypeCode> CompletedEnrolments { get; set; } = Enumerable.Empty<AccessTypeCode>();
         public IEnumerable<string> UserTypes { get; set; } = Enumerable.Empty<string>();

backend/webapi/Features/SanityChecks/CaseRequests/CaseSanityChecks.cs

@@ -22,9 +22,10 @@ public async Task<int> HandlePendingCases()
         if (longRunningCases.Count > 0)
         {
             logger.LogError($"*** We have {longRunningCases} that have not completed within 15 minutes ***");
+        }
+
 
 
-        }
 
         // find any cases that are not complete or deleted
         var cases = dbContext.SubmittingAgencyRequests.Include(r => r.Party).Where(c => c.RequestStatus != EventStatus.Complete && c.RequestStatus != EventStatus.Deleted && c.Modified <= republishTimeout).ToList();

backend/webapi/Features/SanityChecks/DelegateRequests/DelegateAccessChecks.cs

@@ -0,0 +1,30 @@
+namespace Pidp.Features.SanityChecks.DelegateRequests;
+
+using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore;
+using NodaTime;
+using Pidp.Data;
+
+public class DelegateAccessChecks(ILogger<DelegateAccessChecks> logger, PidpConfiguration configuration, PidpDbContext context, IClock clock) : IDelegateAccessChecks
+{
+    public async Task<int> FlagExpiredRequestsAsync()
+    {
+        var expiredDate = clock.GetCurrentInstant().Minus(Duration.FromDays(configuration.DelegateAccessExpiryDays));
+        var expiredRequests = await context.DelegateAccessRequests
+            .Where(req => req.RequestStatus == "Submitted" && req.Created < expiredDate).ToListAsync();
+
+        foreach (var request in expiredRequests)
+        {
+            // Update request status or perform other actions
+            request.RequestStatus = "Expired";
+            request.ResponseDate = clock.GetCurrentInstant();
+        }
+
+        if (expiredRequests.Count > 0)
+        {
+            logger.LogInformation($"Flagged {expiredRequests.Count} expired requests");
+        }
+
+        return await context.SaveChangesAsync();
+    }
+}

backend/webapi/Features/SanityChecks/DelegateRequests/DelegateAccessSanityCheckTask.cs

@@ -0,0 +1,21 @@
+namespace Pidp.Features.SanityChecks.DelegateRequests;
+
+using Quartz;
+
+[PersistJobDataAfterExecution]
+[DisallowConcurrentExecution]
+public class DelegateAccessSanityCheckTask(ILogger<DelegateAccessSanityCheckTask> logger, IDelegateAccessChecks delegateChecks) : IJob
+{
+
+    public async Task Execute(IJobExecutionContext context)
+    {
+        logger.LogDebug("Delegate sanity check task started");
+
+        var updates = await delegateChecks.FlagExpiredRequestsAsync();
+        if (updates > 0)
+        {
+            logger.LogInformation($"Flagged {updates} expired requests");
+        }
+
+    }
+}

backend/webapi/Features/SanityChecks/DelegateRequests/IDelegateAccessChecks.cs

@@ -0,0 +1,7 @@
+namespace Pidp.Features.SanityChecks.DelegateRequests;
+
+public interface IDelegateAccessChecks
+{
+    public Task<int> FlagExpiredRequestsAsync();
+
+}

backend/webapi/Features/SanityChecks/Onboarding/SanityCheckTask.cs

@@ -11,7 +11,7 @@ public class SanityCheckTask(ILogger<SanityCheckTask> logger, ICaseSanityChecks
 
     public Task Execute(IJobExecutionContext context)
     {
-        logger.LogInformation("Sanity check task started");
+        logger.LogDebug("Sanity check task started");
 
         var updates = caseSanityChecks.HandlePendingCases();
 

backend/webapi/PidpConfiguration.cs

@@ -11,6 +11,7 @@ public class PidpConfiguration
     public string ApplicationUrl { get; set; } = string.Empty;
     public string CorrectionsIDP { get; set; } = "siteminder";
     public int AUFToolsCaseId { get; set; }
+    public int DelegateAccessExpiryDays { get; set; } = 30;
     public AddressAutocompleteClientConfiguration AddressAutocompleteClient { get; set; } = new();
     public ConnectionStringConfiguration ConnectionStrings { get; set; } = new();
     public ChesClientConfiguration ChesClient { get; set; } = new();
@@ -46,7 +47,7 @@ public class BackGroundServicesConfiguration
     {
         public DecomissionCaseAccessService DecomissionCaseAccessService { get; set; } = new DecomissionCaseAccessService();
         public SyncCaseAccessService SyncCaseAccessService { get; set; } = new SyncCaseAccessService();
-
+        public DelegateAccessService DelegateAccessService { get; set; } = new DelegateAccessService();
     }
 
     public class PersonLookupType
@@ -62,6 +63,13 @@ public class SplunkConfiguration
         public string CollectorToken { get; set; } = string.Empty;
     }
 
+    public class DelegateAccessService
+    {
+        public int GracePeriod { get; set; }
+        public string PollCron { get; set; } = "0 * * * * ?";
+    }
+
+
     public class DecomissionCaseAccessService
     {
         //  public int PeriodicTimer { get; set; }

backend/webapi/Startup.cs

@@ -37,6 +37,7 @@ namespace Pidp;
 using Pidp.Features.Organization.UserTypeService;
 using Pidp.Features.Parties;
 using Pidp.Features.SanityChecks.CaseRequests;
+using Pidp.Features.SanityChecks.DelegateRequests;
 using Pidp.Features.SanityChecks.Onboarding;
 using Pidp.Helpers.Middleware;
 using Pidp.Infrastructure;
@@ -165,6 +166,8 @@ public void ConfigureServices(IServiceCollection services)
         services.AddScoped<ICourtAccessService, CourtAccessService>();
         services.AddScoped<IProfileUpdateService, ProfileUpdateServiceImpl>();
         services.AddScoped<ICaseSanityChecks, CaseSanityChecks>();
+        services.AddScoped<IDelegateAccessChecks, DelegateAccessChecks>();
+
         services.AddScoped<IDIAMAdminService, DIAMAdminService>();
 
         services.AddSingleton(typeof(IKafkaProducer<,>), typeof(KafkaProducer<,>));
@@ -303,17 +306,19 @@ public void ConfigureServices(IServiceCollection services)
 
             q.AddJob<CourtAccessScheduledJob>(opts => opts.WithIdentity(jobKey));
 
-            // add case decommision job
-            var decommisionJobKey = new JobKey("Decommission case access trigger");
-            q.AddJob<CaseAccessDecommissionJob>(opts => opts.WithIdentity(decommisionJobKey));
+            // add case decommission job
+            var decommissionJobKey = new JobKey("Decommission case access trigger");
+            q.AddJob<CaseAccessDecommissionJob>(opts => opts.WithIdentity(decommissionJobKey));
             Log.Information($"Scheduling Case Decommission with params [{config.BackGroundServices.DecomissionCaseAccessService.PollCron}]");
 
             // Create a trigger for the job
             q.AddTrigger(opts => opts
-                .ForJob(decommisionJobKey) // link to the HelloWorldJob
+                .ForJob(decommissionJobKey) // link to the HelloWorldJob
                 .WithIdentity("case-decommission-trigger") // give the trigger a unique name
                 .WithCronSchedule(config.BackGroundServices.DecomissionCaseAccessService.PollCron));
 
+
+
             // add case sync job
             var caseAccessSyncJobKey = new JobKey("Case access sync trigger");
             q.AddJob<SyncCaseAccessJob>(opts => opts.WithIdentity(caseAccessSyncJobKey));
@@ -326,6 +331,17 @@ public void ConfigureServices(IServiceCollection services)
                 .WithCronSchedule(config.BackGroundServices.SyncCaseAccessService.PollCron));
 
 
+
+            // add delegate access job
+            var delegateAccessJob = new JobKey("Delegated access sanity trigger");
+            q.AddJob<DelegateAccessSanityCheckTask>(opts => opts.WithIdentity(delegateAccessJob));
+            Log.Information($"Scheduling Delegate Sanity Check with params [{config.BackGroundServices.DecomissionCaseAccessService.PollCron}]");
+
+            // Create a trigger for the job
+            q.AddTrigger(opts => opts
+                .ForJob(delegateAccessJob) // link to the HelloWorldJob
+                .WithIdentity("delegate-access-trigger") // give the trigger a unique name
+                .WithCronSchedule(config.BackGroundServices.DelegateAccessService.PollCron));
         });
 
 

backend/webapi/appsettings.json

@@ -96,6 +96,9 @@
       "GracePeriod": 30, // 30 days,
       "PollCron": "0 0 0 ? * * *"
     },
+    "DelegateAccessService": {
+      "PollCron": "0 0 1 ? * * *"
+    },
     "SyncCaseAccessService": {
       "PollCron": "0 0 * ? * * *"
     }

workspace/apps/pidp/src/app/features/access/pages/digital-evidence/digital-evidence-counsel-delegate/digital-evidence-counsel-delegate.page.html

@@ -141,6 +141,7 @@ <h2>Existing Disclosure Access Requests</h2>
         </table>
       </ng-container>
       <mat-paginator
+        [ngClass]="{'no-background':true}"
         [pageSizeOptions]="[5, 10, 25 ,50]"
         [pageSize]="pageSize"
         [hidePageSize]="false"

workspace/apps/pidp/src/app/features/access/pages/digital-evidence/digital-evidence-counsel-delegate/digital-evidence-counsel-delegate.page.scss

@@ -20,6 +20,10 @@ button.primary {
   color: white !important;
 }
 
-mat-form-field.mat-paginator-pagesize-select {
+.no-background {
+  background-color: white !important;
+}
+
+::ng-deep.mat-paginator {
   background-color: white !important;
 }

workspace/apps/pidp/src/app/features/access/pages/digital-evidence/digital-evidence-counsel-delegate/digital-evidence-counsel-delegate.page.ts

@@ -304,6 +304,7 @@ export class DigitalEvidenceCounselDelegatePage
         req.requestStatus != 'Deleted' &&
         req.requestStatus != 'Rescinded' &&
         req.requestStatus != 'Error' &&
+        req.requestStatus != 'Expired' &&
         req.requestStatus != 'Denied'
     );
   }
@@ -354,7 +355,7 @@ export class DigitalEvidenceCounselDelegatePage
               this.submitText = 'Submit';
               this.formState.LawyerEMailAddress.disable();
               this.stagingId = response.responseData['id'];
-              this.validationMessage = `${response.responseData['firstName']} ${response.responseData['lastName']} is a valid email address - click Submit to request delegate access`;
+              this.validationMessage = `EMail entered is for is for ${response.responseData['firstName']} ${response.responseData['lastName']} - click Submit to request delegate access`;
               if (response.information.length === 1) {
                 this.toastService.openInfoToast(
                   response.information[0] +

workspace/apps/pidp/src/app/features/access/pages/digital-evidence/digital-evidence-counsel/digital-evidence-counsel-delegate-controls/digital-evidence-counsel-delegate-controls.page.html

@@ -131,6 +131,7 @@
         </table>
       </ng-container>
       <mat-paginator
+        [ngClass]="{'no-background':true}"
         [pageSizeOptions]="[5, 10, 25,50]"
         [pageSize]="pageSize"
         [hidePageSize]="false"

workspace/apps/pidp/src/app/features/access/pages/digital-evidence/digital-evidence-counsel/digital-evidence-counsel-delegate-controls/digital-evidence-counsel-delegate-controls.page.scss

@@ -17,6 +17,10 @@ button .deny {
   margin-left: 1.3rem;
 }
 
-mat-form-field.mat-paginator-pagesize-select {
+.no-background {
+  background-color: white !important;
+}
+
+.mat-form-field::ng-deep.mat-paginator {
   background-color: white !important;
 }