Merge pull request #416 from bcgov/test

promote
bcgov · Jan 14, 2024 · 77238b3 · 77238b3
2 parents 9f7bfe0 + e4f2938
commit 77238b3
Show file tree

Hide file tree

Showing 25 changed files with 5,711 additions and 160 deletions.
diff --git a/backend/edt.casemanagement/ServiceEvents/CaseManagement/Handler/CaseAccessRequestHandler.cs b/backend/edt.casemanagement/ServiceEvents/CaseManagement/Handler/CaseAccessRequestHandler.cs
@@ -48,8 +48,6 @@ public async Task<Task> HandleAsync(string consumerName, string key, SubAgencyDo
 
 
 
-        // get the user from keycloak
-
         // get the cases the user currently has access to
         // var currentCases = edtClient.GetUserCases(
         using var trx = this.context.Database.BeginTransaction();

diff --git a/backend/edt.disclosure/EdtDisclosureServiceConfiguration.cs b/backend/edt.disclosure/EdtDisclosureServiceConfiguration.cs
@@ -44,13 +44,13 @@ public class EdtDisclosureClientConfiguration
         public int DefenceFolioTemplateId { get; set; } = -1;
         public int OutOfCustodyTemplateId { get; set; } = -1;
         public string ApiKey { get; set; } = string.Empty;
-        public string CounselGroup { get; set; } = "Counsel";
+        public string CounselGroups { get; set; } = "Counsel";
         public string CourtLocationGroup { get; set; } = string.Empty;
         public string CourtLocationKeyPrefix { get; set; } = "CH-";
         public string DefenceCaseGroups { get; set; } = string.Empty;
         public string DefenceFolioTemplateName { get; set; } = string.Empty;
         public string OutOfCustodyCaseGroups { get; set; } = string.Empty;
-        public string OutOfCustodyGroup { get; set; } = string.Empty;
+        public string OutOfCustodyGroups { get; set; } = string.Empty;
         public string OutOfCustodyOrgName { set; get; } = "Public";
         public string OutOfCustodyOrgType { set; get; } = "Out-of-custody";
         public string OutOfCustodyTemplateName { get; set; } = string.Empty;

diff --git a/backend/edt.disclosure/HttpClients/Services/EdtDIsclosure/EdtDisclosureClient.cs b/backend/edt.disclosure/HttpClients/Services/EdtDIsclosure/EdtDisclosureClient.cs
@@ -253,17 +253,20 @@ public async Task<UserModificationEvent> CreateUser(EdtDisclosureUserProvisionin
             if (newUser != null)
             {
 
-                var groupToAdd = (accessRequest.OrganizationType == this.configuration.EdtClient.OutOfCustodyOrgType) ? this.configuration.EdtClient.OutOfCustodyGroup : this.configuration.EdtClient.CounselGroup;
+                var groupsToAdd = (accessRequest.OrganizationType == this.configuration.EdtClient.OutOfCustodyOrgType) ? this.configuration.EdtClient.OutOfCustodyGroups : this.configuration.EdtClient.CounselGroups;
 
-                var groupAddResponse = await this.AddUserToOUGroup(newUser.Id, groupToAdd);
-                if (!groupAddResponse)
+                foreach (var groupToAdd in groupsToAdd.Split(",", StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries))
                 {
-                    userModificationResponse.successful = false;
-                    userModificationResponse.Errors.Add($"Failed to add user to group {groupToAdd}");
-                }
-                else
-                {
-                    Log.Information($"User {newUser.Id} added to {groupToAdd} in EDT");
+                    var groupAddResponse = await this.AddUserToOUGroup(newUser.Id, groupToAdd);
+                    if (!groupAddResponse)
+                    {
+                        userModificationResponse.successful = false;
+                        userModificationResponse.Errors.Add($"Failed to add user to group {groupToAdd}");
+                    }
+                    else
+                    {
+                        Log.Information($"User {newUser.Id} added to {groupToAdd} in EDT");
+                    }
                 }
 
                 //// add user to their folio folder
@@ -341,24 +344,28 @@ public async Task<UserModificationEvent> UpdateUser(EdtDisclosureUserProvisionin
 
             // check user has folio and is associated
             var groups = await this.GetUserOUGroups(currentUser.Id);
-            var groupToAdd = (accessRequest.OrganizationType == this.configuration.EdtClient.OutOfCustodyOrgType) ? this.configuration.EdtClient.OutOfCustodyGroup : this.configuration.EdtClient.CounselGroup;
+            var groupsToAdd = (accessRequest.OrganizationType == this.configuration.EdtClient.OutOfCustodyOrgType) ? this.configuration.EdtClient.OutOfCustodyGroups : this.configuration.EdtClient.CounselGroups;
 
-            var inGroup = groups.FirstOrDefault(group => group.Name.Equals(groupToAdd, StringComparison.OrdinalIgnoreCase));
-
-            if (inGroup == null)
+            foreach (var groupToAdd in groupsToAdd.Split(",", StringSplitOptions.TrimEntries))
             {
-                Log.Information($"User {currentUser.Id} not currently in {groupToAdd} - adding");
-                var addedToGroup = await this.AddUserToOUGroup(currentUser.Id, groupToAdd);
 
-                if (addedToGroup)
-                {
-                    Log.Information($"Added user {currentUser.Id} to group {groupToAdd}");
-                }
-                else
+                var inGroup = groups.FirstOrDefault(group => group.Name.Equals(groupToAdd, StringComparison.OrdinalIgnoreCase));
+
+                if (inGroup == null)
                 {
-                    Log.Warning($"Failed to add user {currentUser.Id} to group {groupToAdd}");
-                    userModificationResponse.successful = false;
-                    userModificationResponse.Errors.Add($"Failed to add user {currentUser.Id} to group {groupToAdd}");
+                    Log.Information($"User {currentUser.Id} not currently in {groupToAdd} - adding");
+                    var addedToGroup = await this.AddUserToOUGroup(currentUser.Id, groupToAdd);
+
+                    if (addedToGroup)
+                    {
+                        Log.Information($"Added user {currentUser.Id} to group {groupToAdd}");
+                    }
+                    else
+                    {
+                        Log.Warning($"Failed to add user {currentUser.Id} to group {groupToAdd}");
+                        userModificationResponse.successful = false;
+                        userModificationResponse.Errors.Add($"Failed to add user {currentUser.Id} to group {groupToAdd}");
+                    }
                 }
             }
 

diff --git a/backend/edt.disclosure/Kafka/KafkaDeserializer.cs b/backend/edt.disclosure/Kafka/KafkaDeserializer.cs
@@ -5,7 +5,6 @@ namespace edt.disclosure.Kafka;
 using Confluent.Kafka;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using NodaTime.Serialization.JsonNet;
 
 internal sealed class KafkaDeserializer<T> : IDeserializer<T>
 {
@@ -34,7 +33,7 @@ public T Deserialize(ReadOnlySpan<byte> data, bool isNull, SerializationContext
         }
 
 
-        Serilog.Log.Information("Case {0}", dataJson);
+        Serilog.Log.Information("Deserialized {0}", dataJson);
 
         var settings = new JsonSerializerSettings
         {

diff --git a/backend/edt.disclosure/ServiceEvents/UserAccountCreation/Handler/BaseProvisioningHandler.cs b/backend/edt.disclosure/ServiceEvents/UserAccountCreation/Handler/BaseProvisioningHandler.cs
@@ -61,8 +61,8 @@ protected async Task<CaseModel> CreateUserFolio(EdtDisclosureUserProvisioningMod
         }
 
         var caseName = (accessRequestModel is EdtDisclosurePublicUserProvisioningModel)
-            ? accessRequestModel.FullName + "(" + caseKey + " Accused Folio)"
-            : accessRequestModel.FullName + "(" + caseKey + " Defence Folio)";
+            ? accessRequestModel.FullName + " (" + caseKey + " Accused Folio)"
+            : accessRequestModel.FullName + " (" + caseKey + " Defence Folio)";
 
         var caseCreation = (accessRequestModel is EdtDisclosurePublicUserProvisioningModel) ?
             new EdtCaseDto
@@ -100,7 +100,7 @@ protected async Task<bool> LinkUserToFolio(EdtDisclosureUserProvisioningModel ac
         var user = await this.edtClient.GetUser(accessRequestModel.Key!) ?? throw new EdtDisclosureServiceException($"User was not found {accessRequestModel.Key}");
 
         var caseGroups = (accessRequestModel.OrganizationType == this.configuration.EdtClient.OutOfCustodyOrgType) ? this.configuration.EdtClient.OutOfCustodyCaseGroups : this.configuration.EdtClient.DefenceCaseGroups;
-        var caseGroupArr = caseGroups.Split(",", StringSplitOptions.TrimEntries);
+        var caseGroupArr = caseGroups.Split(",", StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries);
 
         if (caseGroupArr.Any())
         {