Release/2.7

gitops/charts/traffic-court-dev-values.yaml

@@ -7,14 +7,14 @@ global:
 
 arc-dispute-api:
   image:
-    tag: "2.6.7"
+    tag: "2.7.6"
     pullPolicy: Always
   env: 
     "Swagger__Enabled": "true"
 
 citizen-api:
   image:
-    tag: "2.6.7"
+    tag: "2.7.6"
     pullPolicy: Always
   env:
     "FormRecognizer__ApiVersion": "2022-08-31"
@@ -30,7 +30,7 @@ citizen-api:
 
 citizen-web:
   image:
-    tag: "2.6.7"
+    tag: "2.7.6"
     pullPolicy: Always
   route:
     # https://dev.justice.gov.bc.ca
@@ -39,7 +39,7 @@ citizen-web:
     {
         "production": false,
         "environment": "Dev",
-        "version": "2.6.7",
+        "version": "2.7.6",
         "useMockServices": false,
         "apiBaseUrl": "/api",
         "understandYourTicketLink": "https://understandmyticket.gov.bc.ca/",
@@ -193,7 +193,7 @@ citizen-web:
 
 oracle-data-api:
   image:
-    tag: "2.6.7"
+    tag: "2.7.6"
     pullPolicy: Always
   env:
     "JAVA_OPTS": "-Dlogging.level.ca.bc.gov.open.jag.tco.oracledataapi=DEBUG"
@@ -208,7 +208,7 @@ oracle-data-api:
 
 staff-api:
   image:
-    tag: "2.6.7"
+    tag: "2.7.6"
     pullPolicy: Always
   env:    
     "Jwt__Audience": "staff-api"
@@ -222,7 +222,7 @@ staff-api:
     "TicketSearch__SearchType": "RoadSafety"
 staff-web:
   image:
-    tag: "2.6.7"
+    tag: "2.7.6"
     pullPolicy: Always
   route:
     # https://dev.jag.gov.bc.ca
@@ -241,7 +241,7 @@ staff-web:
     {
         "production": false,
         "environment": "Dev",
-        "version": "2.6.7",
+        "version": "2.7.6",
         "useMockServices": false,
         "apiBaseUrl": "/api",
         "features": {
@@ -251,7 +251,7 @@ staff-web:
 
 workflow-service:
   image:
-    tag: "2.6.7"
+    tag: "2.7.6"
     pullPolicy: Always
   env:
     "EmailConfiguration__Sender": "[email protected]"

gitops/charts/traffic-court-prod-values.yaml

@@ -10,7 +10,7 @@ arc-dispute-api:
   pdb:
     create: true
   image:
-    tag: "2.6.7"
+    tag: "2.7.6"
     pullPolicy: Always
   env: 
     "Swagger__Enabled": "false"
@@ -20,7 +20,7 @@ citizen-api:
   pdb:
     create: true
   image:
-    tag: "2.6.7"
+    tag: "2.7.6"
     pullPolicy: Always
   env:
     "FormRecognizer__ApiVersion": "2022-08-31"
@@ -39,13 +39,13 @@ citizen-web:
   pdb:
     create: true
   image:
-    tag: "2.6.7"
+    tag: "2.7.6"
     pullPolicy: Always
   appConfig: |
     {
         "production": true,
         "environment": "prod",
-        "version": "2.6.7",
+        "version": "2.7.6",
         "useMockServices": false,
         "apiBaseUrl": "/api",
         "understandYourTicketLink": "https://understandmyticket.gov.bc.ca/",
@@ -221,7 +221,7 @@ oracle-data-api:
   pdb:
     create: true
   image:
-    tag: "2.6.7"
+    tag: "2.7.6"
     pullPolicy: Always
   env:
     "JAVA_OPTS": ""
@@ -238,7 +238,7 @@ staff-api:
   pdb:
     create: true
   image:
-    tag: "2.6.7"
+    tag: "2.7.6"
     pullPolicy: Always
   env:    
     "Jwt__Audience": "staff-api"
@@ -263,7 +263,7 @@ staff-web:
   pdb:
     create: true
   image:
-    tag: "2.6.7"
+    tag: "2.7.6"
     pullPolicy: Always
   route:
     # https://test.jag.gov.bc.ca
@@ -282,7 +282,7 @@ staff-web:
     {
         "production": true,
         "environment": "prod",
-        "version": "2.6.7",
+        "version": "2.7.6",
         "useMockServices": false,
         "apiBaseUrl": "/api",
         "features": {
@@ -407,7 +407,7 @@ workflow-service:
   pdb:
     create: true
   image:
-    tag: "2.6.7"
+    tag: "2.7.6"
     pullPolicy: Always
   env:
     "EmailConfiguration__Sender": "[email protected]"

gitops/charts/traffic-court-test-values.yaml

@@ -10,7 +10,7 @@ arc-dispute-api:
   pdb:
     create: true
   image:
-    tag: "2.6.7"
+    tag: "2.7.6"
     pullPolicy: Always
   env: 
     "Swagger__Enabled": "true"
@@ -20,7 +20,7 @@ citizen-api:
   pdb:
     create: true
   image:
-    tag: "2.6.7"
+    tag: "2.7.6"
     pullPolicy: Always
   env:
     "FormRecognizer__ApiVersion": "2022-08-31"
@@ -39,7 +39,7 @@ citizen-web:
   pdb:
     create: true
   image:
-    tag: "2.6.7"
+    tag: "2.7.6"
     pullPolicy: Always
   route:
     # https://test.justice.gov.bc.ca 
@@ -48,7 +48,7 @@ citizen-web:
     {
         "production": false,
         "environment": "Test",
-        "version": "2.6.7",
+        "version": "2.7.6",
         "useMockServices": false,
         "apiBaseUrl": "/api",
         "understandYourTicketLink": "https://bcmoag--staging.sandbox.my.salesforce-sites.com/?tn=BCTC",
@@ -205,7 +205,7 @@ oracle-data-api:
   pdb:
     create: true
   image:
-    tag: "2.6.7"
+    tag: "2.7.6"
     pullPolicy: Always
   env:
     "JAVA_OPTS": ""
@@ -222,7 +222,7 @@ staff-api:
   pdb:
     create: true
   image:
-    tag: "2.6.7"
+    tag: "2.7.6"
     pullPolicy: Always
   env:    
     "Jwt__Audience": "staff-api"
@@ -240,7 +240,7 @@ staff-web:
   pdb:
     create: true
   image:
-    tag: "2.6.7"
+    tag: "2.7.6"
     pullPolicy: Always
   route:
     # https://test.jag.gov.bc.ca
@@ -259,7 +259,7 @@ staff-web:
     {
         "production": false,
         "environment": "Test",
-        "version": "2.6.7",
+        "version": "2.7.6",
         "useMockServices": false,
         "apiBaseUrl": "/api",
         "features": {
@@ -322,7 +322,7 @@ workflow-service:
   pdb:
     create: true
   image:
-    tag: "2.6.7"
+    tag: "2.7.6"
     pullPolicy: Always
   env:
     "EmailConfiguration__Sender": "[email protected]"

src/backend/TrafficCourts/Staff.Service/Controllers/JJController.cs

@@ -93,6 +93,7 @@ public async Task<IActionResult> GetJJDisputesAsync(string? jjAssignedTo, Cancel
     /// <param name="submitted_thru">Disputes sumbitted on or before this date</param>
     /// <param name="ticket_number"></param>
     /// <param name="surname">The case insenstive surname to search for.</param>
+    /// <param name="surname_or_org_name">The case insenstive disputant surname or organization name to search for.</param>
     /// <param name="jj_assigned_to">The JJ assigned user</param>
     /// <param name="jj_decision_dt_from">The jj decision date where greater or equal to this date. Format must be YYYY-MM-DD.</param>
     /// <param name="jj_decision_dt_thru">The jj decision date where less or equal to this date. Format must be YYYY-MM-DD.</param>
@@ -104,7 +105,7 @@ public async Task<IActionResult> GetJJDisputesAsync(string? jjAssignedTo, Cancel
     /// <param name="hearing_type_cd">The hearing type code to search.</param>
     /// <param name="page_number">The page number to fetch. Starts at 1.</param>
     /// <param name="page_size">The page size to use. If not specified, defaults to 25</param>
-    /// <param name="sort_by">The list of columns to sort the result by. To sort descending, add a '-' before the column name.</param>
+    /// <param name="sort_by">The list of columns to sort the result by. To sort descending, add a '-' before the column name. Note: 'surnameOrOrgName' is a pseudo field for sorting by surname or organization name.</param>
     /// <param name="cancellationToken"></param>
     /// <returns></returns>
 #if DEBUG
@@ -126,6 +127,7 @@ public async Task<IActionResult> SearchDisputesAsync(
         string? submitted_thru,
         string? ticket_number,
         string? surname,
+        string? surname_or_org_name,
         string? jj_assigned_to,
         string? jj_decision_dt_from,
         string? jj_decision_dt_thru,
@@ -151,6 +153,7 @@ public async Task<IActionResult> SearchDisputesAsync(
             submitted_thru = submitted_thru,
             ticket_number  = ticket_number,
             surname = surname,
+            surname_or_org_name = surname_or_org_name,
             jj_assigned_to = jj_assigned_to,
             jj_decision_dt_from = jj_decision_dt_from,
             jj_decision_dt_thru = jj_decision_dt_thru,

src/backend/TrafficCourts/Staff.Service/Features/CourtFiles/Summaries/Handler.cs

@@ -140,11 +140,12 @@ private void AddWhere(Dictionary<string, string> parameters, Request request)
         AddUtcDateRangeFilter(parameters, "jj_decision_dt", request.time_zone, request.jj_decision_dt_from, request.jj_decision_dt_thru);
 
         AddDateRangeFilter(parameters, "appr_tm", request.appearance_dt_from, request.appearance_dt_thru);
-
-        // Search where starts with the spuplied value. We could also use "_regexp_like" and use a regex pattern
+        
+        // Search where starts with the supplied value. We could also use "_regexp_like" and use a regex pattern
         // ticket number is always uppercase
         AddLikeFilter(parameters, "ticket_number_txt", request.ticket_number);
         AddLikeFilter(parameters, "prof_surname_nm", request.surname);
+        AddLikeFilter(parameters, "prof_surname_nm_or_org_nm", request.surname_or_org_name);
 
         if (request.jj_assigned_to is not null) parameters.Add("jj_assigned_to_eq", request.jj_assigned_to);
 
@@ -266,6 +267,7 @@ void Append(string direction, string target)
                 "violationDate" => "violation_dt",
                 "toBeHeardAtCourthouseName" => "to_be_heard_at_agen_nm",
                 "surname" => "prof_surname_nm",
+                "surnameOrOrgName" => "prof_surname_nm_or_org_nm",
                 "disputantGivenName1" => "prof_given_1_nm",
                 "status" => "dispute_status_type_dsc",
                 "policeDetachment" => "detachment_agency_nm",
@@ -392,6 +394,7 @@ private DisputeCaseFileSummary Map(OrdsDisputeCaseFileSummary dispute)
             DisputantGivenName1 = dispute.prof_given_1_nm,
             DisputantGivenName2 = dispute.prof_given_2_nm,
             DisputantGivenName3 = dispute.prof_given_3_nm,
+            DisputantOrganizationName = dispute.prof_org_nm,
             FineReductionReason = dispute.fine_reduction_reason_txt,
             TimeToPayReason = dispute.time_to_pay_reason_txt,
             DisputeStatus = new DisputeCaseFileStatus

src/backend/TrafficCourts/Staff.Service/Features/CourtFiles/Summaries/Request.cs

@@ -15,6 +15,7 @@ public class Request : IRequest<Response>
 
     public string? ticket_number { get; set; }
     public string? surname { get; set; }
+    public string? surname_or_org_name { get; set; }
 
     public string? jj_assigned_to { get; set; }
 

src/backend/TrafficCourts/Staff.Service/Features/Lookups/Provinces/Handler.cs

@@ -1,47 +1,21 @@
 using MediatR;
-using TrafficCourts.OrdsDataService.Justin;
-using ZiggyCreatures.Caching.Fusion;
+using TrafficCourts.Staff.Service.Services;
 
 namespace TrafficCourts.Staff.Service.Features.Lookups.Provinces;
 
 public class Handler : IRequestHandler<Request, Response>
 {
-    private readonly IProvinceRepository _repository;
-    private readonly IFusionCache _cache;
-    private readonly ILogger<Handler> _handler;
+    private readonly IProvinceLookupService _lookupService;
 
-    public Handler(IProvinceRepository repository, IFusionCache cache, ILogger<Handler> handler)
+    public Handler(IProvinceLookupService lookupService)
     {
-        _repository = repository ?? throw new ArgumentNullException(nameof(repository));
-        _cache = cache ?? throw new ArgumentNullException(nameof(cache));
-        _handler = handler ?? throw new ArgumentNullException(nameof(handler));
+        _lookupService = lookupService ?? throw new ArgumentNullException(nameof(lookupService));
     }
+
     public async Task<Response> Handle(Request request, CancellationToken cancellationToken)
     {
-        var key = Caching.Cache.Api.Provinces(2);
-
-        var items = await _cache.GetOrSetAsync<List<Domain.Models.Province>>(
-            key,
-            ct => GetItems(ct),
-            options => options.SetDuration(TimeSpan.FromMinutes(10)),
-            token: cancellationToken);
+        var items = await _lookupService.GetListAsync(cancellationToken);
 
         return new Response(items);
     }
-
-    private async Task<List<Domain.Models.Province>> GetItems(CancellationToken cancellationToken)
-    {
-        var items = await _repository.GetListAsync(cancellationToken);
-
-        var models = items.Select(_ => new Domain.Models.Province
-        (
-            _.ctry_id.ToString(),
-            _.prov_seq_no.ToString(),
-            _.prov_nm,
-            _.prov_abbreviation_cd
-        )).ToList();
-
-        return models;
-    }
-
 }

src/backend/TrafficCourts/TrafficCourts.Core/Domain/Models/DisputeCaseFileSummary.cs

@@ -9,21 +9,22 @@
     public long Id { get; set; }
     public DateTimeOffset? SubmittedTs { get; set; }
     public System.DateTimeOffset? JjDecisionDate { get; set; }
     public string SignatoryName { get; set; }
     public string? HearingType { get; set; }
     public string TicketNumber { get; set; }
     public DateTimeOffset? ViolationDate { get; set; }
     public int ViolationDateCount { get; set; }
     public decimal? ToBeHeardAtCourthouseId { get; set; }
     public string ToBeHeardAtCourthouseName { get; set; }
     public string DisputantSurname { get; set; }
     public string DisputantGivenName1 { get; set; }
     public string DisputantGivenName2 { get; set; }
     public string DisputantGivenName3 { get; set; }
+    public string DisputantOrganizationName { get; set; }
 
     public DisputeCaseFileStatus DisputeStatus { get; set; }
 
     public string PoliceDetachment { get; set; }
     public decimal? PoliceDetachmentId { get; set; }
     public YesNo? AccidentYn { get; set; }
     public YesNo? MultipleOfficersYn { get; set; }
@@ -51,6 +52,6 @@
 
 public class DisputeCaseFileStatus
 {
     public string Code { get; set; }
     public string Description { get; set; }
 }

src/backend/TrafficCourts/TrafficCourts.OrdsDataService/Tco/OrdsDisputeCaseFileSummary.cs

@@ -21,6 +21,7 @@ public class OrdsDisputeCaseFileSummary
     public string prof_given_1_nm { get; set; }
     public string prof_given_2_nm { get; set; }
     public string prof_given_3_nm { get; set; }
+    public string prof_org_nm { get; set; }
     public string time_to_pay_reason_txt { get; set; }
     public string fine_reduction_reason_txt { get; set; }
     public string dispute_status_type_cd { get; set; }

src/frontend/citizen-portal/src/app/services/violation-ticket.service.ts

@@ -446,7 +446,7 @@ export class ViolationTicketService {
   }
 
   private openErrorScenarioFourDialog() {
-    return this.openImageTicketNotFoundDialog("Non-MVA ticket", "error2");
+    return this.openImageTicketNotFoundDialog("Invalid ticket type", "error8");
   }
 
   private openErrorScenarioSevenDialog() {
@@ -462,7 +462,7 @@ export class ViolationTicketService {
   }
 
   private openInValidETicketDateDialog() {
-    return this.openImageTicketNotFoundDialog(`Your ticket is past the allowable dispute time period`, "error5");
+    return this.openImageTicketNotFoundDialog(`Your ticket is over 30 days old`, "error5");
   }
 
   private openInValidISCTicketDateDialog() {