move all mapping code

hmcts · Nov 3, 2023 · 769cacd · 769cacd
1 parent 5b91fab
commit 769cacd
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 47 deletions.
diff --git a/NotificationApi/NotificationApi.Contract/MessageType.cs b/NotificationApi/NotificationApi.Contract/MessageType.cs
@@ -1,6 +1,7 @@
 namespace NotificationApi.Contract
 {
     // Public contract for NotificationApi.Domain.Enums.MessageType
+    [Obsolete("Will be replaced with a new endpoint")]
     public enum MessageType
     {
         Email = 1,

diff --git a/NotificationApi/NotificationApi.Contract/NotificationType.cs b/NotificationApi/NotificationApi.Contract/NotificationType.cs
@@ -1,6 +1,7 @@
 namespace NotificationApi.Contract
 {
     // Public contract for NotificationApi.Domain.Enums.NotificationType
+    [Obsolete("Will be replaced with a new endpoint")]
     public enum NotificationType
     {
         CreateIndividual = 1,

diff --git a/NotificationApi/NotificationApi/Controllers/ParticipantEmailNotificationsController.cs b/NotificationApi/NotificationApi/Controllers/ParticipantEmailNotificationsController.cs
@@ -159,24 +159,7 @@ RoleNames.Judge when request.HasAJudiciaryUsername() => NotificationType.Hearing
             };
 
             var parameters = NotificationParameterMapper.MapToSingleDayConfirmationExistingUser(request);
-
-            if (request.RoleName == RoleNames.Judge)
-            {
-                parameters.Add(NotifyParams.Judge, request.DisplayName);
-                parameters.Add(NotifyParams.CourtroomAccountUserName, request.Username);
-            }
-
-            if (request.RoleName == RoleNames.JudicialOfficeHolder)
-            {
-                parameters.Add(NotifyParams.JudicialOfficeHolder, request.Name);
-            }
-
-            if (request.RoleName == RoleNames.Representative)
-            {
-                parameters.Add(NotifyParams.ClientName, request.Representee);
-                parameters.Add(NotifyParams.SolicitorName, request.Name);
-            }
-
+
             await ProcessRequest(request.ContactEmail, request.ParticipantId, request.HearingId,
                 notificationType, parameters);
 
@@ -213,23 +196,6 @@ RoleNames.Judge when request.HasAJudiciaryUsername() => NotificationType
 
             var parameters = NotificationParameterMapper.MapToMultiDayConfirmationForExistingUser(request);
 
-            if (request.RoleName == RoleNames.Judge)
-            {
-                parameters.Add(NotifyParams.Judge, request.DisplayName);
-                parameters.Add(NotifyParams.CourtroomAccountUserName, request.Username.ToLower());
-            }
-
-            if (request.RoleName == RoleNames.JudicialOfficeHolder)
-            {
-                parameters.Add(NotifyParams.JudicialOfficeHolder, request.Name);
-            }
-
-            if (request.RoleName == RoleNames.Representative)
-            {
-                parameters.Add(NotifyParams.ClientName, request.Representee);
-                parameters.Add(NotifyParams.SolicitorName, request.Name);
-            }
-
             await ProcessRequest(request.ContactEmail, request.ParticipantId, request.HearingId,
                 notificationType, parameters);
 
@@ -260,18 +226,7 @@ RoleNames.JudicialOfficeHolder when request.HasAJudiciaryUsername() => Notificat
             };
 
             var parameters = NotificationParameterMapper.MapToSingleDayReminder(request);
-
-            if (request.RoleName == RoleNames.JudicialOfficeHolder)
-            {
-                parameters.Add(NotifyParams.JudicialOfficeHolder, request.Name);
-            }
-
-            if (request.RoleName == RoleNames.Representative)
-            {
-                parameters.Add(NotifyParams.ClientName, request.Representee);
-                parameters.Add(NotifyParams.SolicitorName, request.Name);
-            }
-
+
             await ProcessRequest(request.ContactEmail, request.ParticipantId, request.HearingId,
                 notificationType, parameters);
             return Ok();

diff --git a/NotificationApi/NotificationApi/Services/NotificationParameterMapper.cs b/NotificationApi/NotificationApi/Services/NotificationParameterMapper.cs
@@ -80,6 +80,24 @@ public static Dictionary<string, string> MapToSingleDayConfirmationExistingUser(
             {NotifyParams.UserName, request.Username.ToLower()},
             {NotifyParams.DayMonthYearCy, request.ScheduledDateTime.ToEmailDateCyLocale()}
         };
+
+        if (request.RoleName == RoleNames.Judge)
+        {
+            parameters.Add(NotifyParams.Judge, request.DisplayName);
+            parameters.Add(NotifyParams.CourtroomAccountUserName, request.Username);
+        }
+
+        if (request.RoleName == RoleNames.JudicialOfficeHolder)
+        {
+            parameters.Add(NotifyParams.JudicialOfficeHolder, request.Name);
+        }
+
+        if (request.RoleName == RoleNames.Representative)
+        {
+            parameters.Add(NotifyParams.ClientName, request.Representee);
+            parameters.Add(NotifyParams.SolicitorName, request.Name);
+        }
+
         return parameters;
     }
 
@@ -99,6 +117,24 @@ public static Dictionary<string, string> MapToMultiDayConfirmationForExistingUse
             {NotifyParams.UserName, request.Username.ToLower()},
             {NotifyParams.TotalDays, request.TotalDays.ToString()},
         };
+
+        if (request.RoleName == RoleNames.Judge)
+        {
+            parameters.Add(NotifyParams.Judge, request.DisplayName);
+            parameters.Add(NotifyParams.CourtroomAccountUserName, request.Username.ToLower());
+        }
+
+        if (request.RoleName == RoleNames.JudicialOfficeHolder)
+        {
+            parameters.Add(NotifyParams.JudicialOfficeHolder, request.Name);
+        }
+
+        if (request.RoleName == RoleNames.Representative)
+        {
+            parameters.Add(NotifyParams.ClientName, request.Representee);
+            parameters.Add(NotifyParams.SolicitorName, request.Name);
+        }
+
         return parameters;
     }
 
@@ -115,6 +151,17 @@ public static Dictionary<string, string> MapToSingleDayReminder(SingleDayHearing
             {NotifyParams.StartTime, request.ScheduledDateTime.ToEmailTimeGbLocale()},
             {NotifyParams.UserName, request.Username.ToLower()},
         };
+
+        if (request.RoleName == RoleNames.JudicialOfficeHolder)
+        {
+            parameters.Add(NotifyParams.JudicialOfficeHolder, request.Name);
+        }
+
+        if (request.RoleName == RoleNames.Representative)
+        {
+            parameters.Add(NotifyParams.ClientName, request.Representee);
+            parameters.Add(NotifyParams.SolicitorName, request.Name);
+        }
         return parameters;
     }