From 1324dd717147906f34ddf7784f02ca208687874c Mon Sep 17 00:00:00 2001
From: marcogagliardi <marco.gagliardi@justice.gov.uk>
Date: Tue, 5 Sep 2023 11:03:27 +0100
Subject: [PATCH 1/4] VIH-9899 - added new templates and notification types
 (#138)

* added new templates and notification types

* Update NotificationType.cs

* added existing user LIP template

* added existing user template test

* Update TemplateDataForEnvironments.cs

* Update TemplateDataForEnvironments.cs

* Update azure-pipelines.yml

* Update azure-pipelines.yml

* Update azure-pipelines.yml

* Update azure-pipelines.yml

* Update azure-pipelines.yml

* Update azure-pipelines.yml

* Update azure-pipelines.sds.pr-release.yml

* exclusions

* Update azure-pipelines.sds.pr-release.yml

* Update azure-pipelines.sds.pr-release.yml

* Update azure-pipelines.sds.pr-release.yml
---
 .../ApiTests/GetTemplateTests.cs              |    5 +
 .../NotificationType.cs                       |    6 +-
 .../TemplateDataForEnvironments.cs            | 1591 ++++++++---------
 .../Enums/NotificationType.cs                 |    6 +-
 azure-pipelines.sds.pr-release.yml            |    2 +-
 5 files changed, 719 insertions(+), 891 deletions(-)

diff --git a/NotificationApi/NotificationApi.AcceptanceTests/ApiTests/GetTemplateTests.cs b/NotificationApi/NotificationApi.AcceptanceTests/ApiTests/GetTemplateTests.cs
index eedf0a4c..0ccf17c5 100644
--- a/NotificationApi/NotificationApi.AcceptanceTests/ApiTests/GetTemplateTests.cs
+++ b/NotificationApi/NotificationApi.AcceptanceTests/ApiTests/GetTemplateTests.cs
@@ -37,6 +37,7 @@ public class GetTemplateTests : AcApiTest
         [TestCase(NotificationType.EJudJudgeDemoOrTest)]
         [TestCase(NotificationType.TelephoneHearingConfirmation)]
         [TestCase(NotificationType.TelephoneHearingConfirmationMultiDay)]
+        [TestCase(NotificationType.CreateStaffMember)]
         [TestCase(NotificationType.HearingAmendmentStaffMember)]
         [TestCase(NotificationType.HearingConfirmationStaffMember)]
         [TestCase(NotificationType.HearingConfirmationStaffMemberMultiDay)]
@@ -46,6 +47,10 @@ public class GetTemplateTests : AcApiTest
         [TestCase(NotificationType.NewHearingReminderJOH)]
         [TestCase(NotificationType.NewHearingReminderEJUD)]
         [TestCase(NotificationType.NewUserLipWelcome)]
+        [TestCase(NotificationType.NewUserLipConfirmation)]
+        [TestCase(NotificationType.NewUserLipConfirmationMultiDay)]
+        [TestCase(NotificationType.ExistingUserLipConfirmation)]
+        [TestCase(NotificationType.ExistingUserLipConfirmationMultiDay)]
         public async Task should_return_okay_and_template(NotificationType notificationType)
         {
             // act
diff --git a/NotificationApi/NotificationApi.Contract/NotificationType.cs b/NotificationApi/NotificationApi.Contract/NotificationType.cs
index f4a065a9..e5a57fa1 100644
--- a/NotificationApi/NotificationApi.Contract/NotificationType.cs
+++ b/NotificationApi/NotificationApi.Contract/NotificationType.cs
@@ -43,6 +43,10 @@ public enum NotificationType
         NewHearingReminderRepresentative = 38,
         NewHearingReminderJOH = 39,
         NewHearingReminderEJUD = 40,
-        NewUserLipWelcome = 41
+        NewUserLipWelcome = 41,
+        NewUserLipConfirmation = 42,
+        NewUserLipConfirmationMultiDay = 43,
+        ExistingUserLipConfirmation = 44,
+        ExistingUserLipConfirmationMultiDay = 45
     }
 }
diff --git a/NotificationApi/NotificationApi.DAL/TemplateDataForEnvironments.cs b/NotificationApi/NotificationApi.DAL/TemplateDataForEnvironments.cs
index 3c430e6c..7219febd 100644
--- a/NotificationApi/NotificationApi.DAL/TemplateDataForEnvironments.cs
+++ b/NotificationApi/NotificationApi.DAL/TemplateDataForEnvironments.cs
@@ -9,1732 +9,1546 @@ namespace NotificationApi.DAL
     [ExcludeFromCodeCoverage]
     public class TemplateDataForEnvironments
     {
+        private const string CASE_NAME__CASE_NUMBER__JUDICIAL_OFFICE_HOLDER__DAY_MONTH_YEAR__TIME__USERNAME = "case name, case number, judicial office holder, day month year, time, username";
+
+        private static Template CreateTemplate(string guid, NotificationType notificationType, MessageType messageType, string parameters)
+        {
+            return new Template(new Guid(guid), notificationType,
+                messageType, parameters);
+        }
+        
         private readonly IList<Template> _sourceTemplatesDev = new List<Template>()
         {
             {
-                new Template(new Guid("5C862F23-F12A-463E-A140-1C9C8D44EC0A"), NotificationType.CreateIndividual,
-                    MessageType.Email, "name,username,random password", DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("5C862F23-F12A-463E-A140-1C9C8D44EC0A", NotificationType.CreateIndividual,
+                    MessageType.Email, "name,username,random password")
             },
             {
-                new Template(new Guid("E913CED8-CFA2-49EC-8DA4-9353F0105D97"), NotificationType.CreateRepresentative,
-                    MessageType.Email, "name,username,random password", DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("E913CED8-CFA2-49EC-8DA4-9353F0105D97", NotificationType.CreateRepresentative,
+                    MessageType.Email, "name,username,random password")
             },
             {
-                new Template(new Guid("C4D0001F-1706-483C-AB64-0DCB53EB8216"), NotificationType.PasswordReset,
-                    MessageType.Email, "name,password", DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("C4D0001F-1706-483C-AB64-0DCB53EB8216", NotificationType.PasswordReset,
+                    MessageType.Email, "name,password")
             },
             {
-                new Template(new Guid("811125FE-4CAB-4829-88ED-D3E7D4689CDD"),
+                CreateTemplate("811125FE-4CAB-4829-88ED-D3E7D4689CDD",
                     NotificationType.HearingConfirmationJudge, MessageType.Email,
-                    "case name,case number,judge,day month year,time,courtroom account username,account password",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,judge,day month year,time,courtroom account username,account password")
             },
             {
-                new Template(new Guid("1D4ACED7-4A0B-4610-B4C7-71F6C35B4143"), NotificationType.HearingConfirmationJoh,
-                    MessageType.Email, "case name,case number,judicial office holder,Day Month Year,time",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("1D4ACED7-4A0B-4610-B4C7-71F6C35B4143", NotificationType.HearingConfirmationJoh,
+                    MessageType.Email, "case name,case number,judicial office holder,Day Month Year,time")
             },
             {
-                new Template(new Guid("1F507F21-CEE6-430F-AB75-AA95980E369F"), NotificationType.HearingConfirmationLip,
-                    MessageType.Email, "case name,case number,name,Day Month Year,time", DateTime.UtcNow,
-                    DateTime.UtcNow)
+                CreateTemplate("1F507F21-CEE6-430F-AB75-AA95980E369F", NotificationType.HearingConfirmationLip,
+                    MessageType.Email, "case name,case number,name,Day Month Year,time")
             },
             {
-                new Template(new Guid("7CF9B49B-02D6-41C2-BCD0-71E2E9655731"),
+                CreateTemplate("7CF9B49B-02D6-41C2-BCD0-71E2E9655731",
                     NotificationType.HearingConfirmationRepresentative, MessageType.Email,
-                    "case name,case number,client name,solicitor name,Day Month Year,time", DateTime.UtcNow,
-                    DateTime.UtcNow)
+                    "case name,case number,client name,solicitor name,Day Month Year,time")
             },
             {
-                new Template(new Guid("A95A5C70-1E86-4DD6-8972-1993DFB21A18"), NotificationType.HearingReminderJoh,
-                    MessageType.Email, "case name,case number,judicial office holder,day month year,time,username",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("A95A5C70-1E86-4DD6-8972-1993DFB21A18", NotificationType.HearingReminderJoh,
+                    MessageType.Email, "case name,case number,judicial office holder,day month year,time,username")
             },
             {
-                new Template(new Guid("04A2DD3D-06BA-462B-A866-7FC802AAE69A"), NotificationType.HearingReminderLip,
-                    MessageType.Email, "case name,case number,name,day month year,time,username", DateTime.UtcNow,
-                    DateTime.UtcNow)
+                CreateTemplate("04A2DD3D-06BA-462B-A866-7FC802AAE69A", NotificationType.HearingReminderLip,
+                    MessageType.Email, "case name,case number,name,day month year,time,username")
             },
             {
-                new Template(new Guid("64AAA327-B087-4142-BE1A-94238D9248EA"), NotificationType.HearingReminderRepresentative, MessageType.Email,
-                    "case name,case number,client name,solicitor name,day month year,time,username", DateTime.UtcNow,
-                    DateTime.UtcNow)
+                CreateTemplate("64AAA327-B087-4142-BE1A-94238D9248EA",
+                    NotificationType.HearingReminderRepresentative, MessageType.Email,
+                    "case name,case number,client name,solicitor name,day month year,time,username")
             },
             {
-                new Template(new Guid("3210895A-C096-4029-B43E-9FDE4642A254"), NotificationType.HearingAmendmentJudge,
+                CreateTemplate("3210895A-C096-4029-B43E-9FDE4642A254", NotificationType.HearingAmendmentJudge,
                     MessageType.Email,
-                    "case name,case number,judge,New Day Month Year,Old Day Month Year,New time,Old time,courtroom account username,account password",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,judge,New Day Month Year,Old Day Month Year,New time,Old time,courtroom account username,account password")
             },
             {
-                new Template(new Guid("715017DB-24B5-4117-A47D-0F935054A5A0"), NotificationType.HearingAmendmentJoh,
+                CreateTemplate("715017DB-24B5-4117-A47D-0F935054A5A0", NotificationType.HearingAmendmentJoh,
                     MessageType.Email,
-                    "case name,case number,judicial office holder,New Day Month Year,Old Day Month Year,New time,Old time,courtroom account username,account password",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,judicial office holder,New Day Month Year,Old Day Month Year,New time,Old time,courtroom account username,account password")
             },
             {
-                new Template(new Guid("197D2B04-A600-41AE-BF68-8021D6EA0057"), NotificationType.HearingAmendmentLip,
+                CreateTemplate("197D2B04-A600-41AE-BF68-8021D6EA0057", NotificationType.HearingAmendmentLip,
                     MessageType.Email,
-                    "case name,case number,name,New Day Month Year,Old Day Month Year,New time,Old time,courtroom account username,account password",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,name,New Day Month Year,Old Day Month Year,New time,Old time,courtroom account username,account password")
             },
             {
-                new Template(new Guid("70C29995-D6D6-48D4-AB1B-6F957A776F30"),
+                CreateTemplate("70C29995-D6D6-48D4-AB1B-6F957A776F30",
                     NotificationType.HearingAmendmentRepresentative, MessageType.Email,
-                    "case name,case number,client name,solicitor name,New Day Month Year,Old Day Month Year,New time,Old time,courtroom account username,account password",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,client name,solicitor name,New Day Month Year,Old Day Month Year,New time,Old time,courtroom account username,account password")
             },
             {
-                new Template(new Guid("04CD937D-C6EB-4932-A040-469123AFEF67"),
+                CreateTemplate("04CD937D-C6EB-4932-A040-469123AFEF67",
                     NotificationType.HearingConfirmationJudgeMultiDay, MessageType.Email,
-                    "case name,case number,judge,Start Day Month Year,time,number of days,courtroom account username,account password",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,judge,Start Day Month Year,time,number of days,courtroom account username,account password")
             },
             {
-                new Template(new Guid("94A12C16-B291-4F5E-89F0-7AF625F5F51B"),
+                CreateTemplate("94A12C16-B291-4F5E-89F0-7AF625F5F51B",
                     NotificationType.HearingConfirmationJohMultiDay, MessageType.Email,
-                    "case name,case number,judicial office holder,Start Day Month Year,time,number of days,time",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,judicial office holder,Start Day Month Year,time,number of days,time")
             },
             {
-                new Template(new Guid("F7E9BE27-5E7A-439D-B52E-4CFC56C9DD86"),
+                CreateTemplate("F7E9BE27-5E7A-439D-B52E-4CFC56C9DD86",
                     NotificationType.HearingConfirmationLipMultiDay, MessageType.Email,
-                    "case name,case number,name,Start Day Month Year,time,number of days,time", DateTime.UtcNow,
-                    DateTime.UtcNow)
+                    "case name,case number,name,Start Day Month Year,time,number of days,time")
             },
             {
-                new Template(new Guid("8E12EFD7-A6CB-4E43-8757-39CD1D292946"),
+                CreateTemplate("8E12EFD7-A6CB-4E43-8757-39CD1D292946",
                     NotificationType.HearingConfirmationRepresentativeMultiDay, MessageType.Email,
-                    "case name,case number,client name,solicitor name,Start Day Month Year,time,number of days,time",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,client name,solicitor name,Start Day Month Year,time,number of days,time")
             },
             {
-                new Template(new Guid("ED3A7CC4-9F9B-4E3D-A522-5FEFCB59CA01"),
+                CreateTemplate("ED3A7CC4-9F9B-4E3D-A522-5FEFCB59CA01",
                     NotificationType.HearingConfirmationEJudJudge, MessageType.Email,
-                    "case name,case number,judge,day month year,time", DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,judge,day month year,time")
             },
             {
-                new Template(new Guid("2326B59A-4170-45DB-9638-789CA002FC20"),
+                CreateTemplate("2326B59A-4170-45DB-9638-789CA002FC20",
                     NotificationType.HearingConfirmationEJudJudgeMultiDay, MessageType.Email,
-                    "case name,case number,judge,Start Day Month Year,time,number of days", DateTime.UtcNow,
-                    DateTime.UtcNow)
+                    "case name,case number,judge,Start Day Month Year,time,number of days")
             },
             {
-                new Template(new Guid("339EDA5B-2E21-4D75-A768-75648E801738"),
+                CreateTemplate("339EDA5B-2E21-4D75-A768-75648E801738",
                     NotificationType.HearingAmendmentEJudJudge, MessageType.Email,
-                    "case name,case number,judge,New Day Month Year,Old Day Month Year,New time,Old time",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,judge,New Day Month Year,Old Day Month Year,New time,Old time")
             },
             {
-                new Template(new Guid("924E9BAE-0566-43DC-BE26-AAAB4B11F3C5"), NotificationType.HearingAmendmentEJudJoh,
-                    MessageType.Email, "case name,case number,judicial office holder,day month year,time",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("924E9BAE-0566-43DC-BE26-AAAB4B11F3C5", NotificationType.HearingAmendmentEJudJoh,
+                    MessageType.Email, "case name,case number,judicial office holder,day month year,time")
             },
             {
-                new Template(new Guid("45C68EC6-D869-45E4-BC83-E547620E05F9"), NotificationType.HearingReminderEJudJoh,
-                    MessageType.Email, "case name,case number,judicial office holder,day month year,time",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("45C68EC6-D869-45E4-BC83-E547620E05F9", NotificationType.HearingReminderEJudJoh,
+                    MessageType.Email, "case name,case number,judicial office holder,day month year,time")
             },
             {
-                new Template(new Guid("B71B697D-2AC4-4FFD-82C5-C270CD2AA22B"),
+                CreateTemplate("B71B697D-2AC4-4FFD-82C5-C270CD2AA22B",
                     NotificationType.HearingConfirmationEJudJoh, MessageType.Email,
-                    "case name,case number,judicial office holder,day month year,time", DateTime.UtcNow,
-                    DateTime.UtcNow)
+                    "case name,case number,judicial office holder,day month year,time")
             },
             {
-                new Template(new Guid("A9CE6ED1-6618-411F-B100-E1335FED558B"),
+                CreateTemplate("A9CE6ED1-6618-411F-B100-E1335FED558B",
                     NotificationType.HearingConfirmationEJudJohMultiDay, MessageType.Email,
-                    "case name,case number,judicial office holder,Start Day Month Year,time,number of days",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,judicial office holder,Start Day Month Year,time,number of days")
             },
             {
-                new Template(new Guid("B9D88AB8-6FE7-4FBA-98B6-3CA5E9EBBD31"), NotificationType.EJudJohDemoOrTest,
-                    MessageType.Email, "case number,test type,judicial office holder,username,date,time",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("B9D88AB8-6FE7-4FBA-98B6-3CA5E9EBBD31", NotificationType.EJudJohDemoOrTest,
+                    MessageType.Email, "case number,test type,judicial office holder,username,date,time")
             },
             {
-                new Template(new Guid("B00E330B-14F7-4FF1-A511-824F309EC958"), NotificationType.ParticipantDemoOrTest,
-                    MessageType.Email, "test type,case number,date,name,username,time", DateTime.UtcNow,
-                    DateTime.UtcNow)
+                CreateTemplate("B00E330B-14F7-4FF1-A511-824F309EC958", NotificationType.ParticipantDemoOrTest,
+                    MessageType.Email, "test type,case number,date,name,username,time")
             },
             {
-                new Template(new Guid("F966FE18-C817-46EB-8F19-BBE04CE0D940"), NotificationType.EJudJudgeDemoOrTest,
-                    MessageType.Email, "test type,date,time,case number,Judge", DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("F966FE18-C817-46EB-8F19-BBE04CE0D940", NotificationType.EJudJudgeDemoOrTest,
+                    MessageType.Email, "test type,date,time,case number,Judge")
             },
             {
-                new Template(new Guid("E2D7E609-C42A-4C48-8EE3-C6F853267185"), NotificationType.JudgeDemoOrTest,
-                    MessageType.Email, "test type,date,time,case number,Judge,courtroom account username",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("E2D7E609-C42A-4C48-8EE3-C6F853267185", NotificationType.JudgeDemoOrTest,
+                    MessageType.Email, "test type,date,time,case number,Judge,courtroom account username")
             },
             {
-                new Template(new Guid("FC7485B2-36E8-4ED8-A529-3C7777B0212B"),
+                CreateTemplate("FC7485B2-36E8-4ED8-A529-3C7777B0212B",
                     NotificationType.TelephoneHearingConfirmation, MessageType.Email,
-                    "case name,case number,name,day month year,time", DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,name,day month year,time")
             },
             {
-                new Template(new Guid("9EADD247-7B88-4D9F-892B-3F9C62AF67A5"),
+                CreateTemplate("9EADD247-7B88-4D9F-892B-3F9C62AF67A5",
                     NotificationType.TelephoneHearingConfirmationMultiDay, MessageType.Email,
-                    "case name,case number,name,day month year,time,number of days", DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,name,day month year,time,number of days")
             },
             {
-                new Template(new Guid("F521458D-EA14-445B-9FC3-1FA94EF55DC6"), NotificationType.CreateStaffMember,
-                    MessageType.Email, "Name,Username,Password", DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("F521458D-EA14-445B-9FC3-1FA94EF55DC6", NotificationType.CreateStaffMember,
+                    MessageType.Email, "Name,Username,Password")
             },
             {
-                new Template(new Guid("4E8FBBB4-E501-4509-83E2-C0BBB42B9C3C"),
+                CreateTemplate("4E8FBBB4-E501-4509-83E2-C0BBB42B9C3C",
                     NotificationType.HearingAmendmentStaffMember, MessageType.Email,
-                    "case name,case number,staff member,New Day Month Year,Old Day Month Year,New time,Old time",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,staff member,New Day Month Year,Old Day Month Year,New time,Old time")
             },
             {
-                new Template(new Guid("F8467D59-FFFB-44A5-85CE-AD5AE0180F37"),
+                CreateTemplate("F8467D59-FFFB-44A5-85CE-AD5AE0180F37",
                     NotificationType.HearingConfirmationStaffMember, MessageType.Email,
-                    "case name,case number,staff member,day month year,time,username", DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,staff member,day month year,time,username")
             },
             {
-                new Template(new Guid("C869C829-DF92-4BF9-A378-9EDF0C3518C2"),
+                CreateTemplate("C869C829-DF92-4BF9-A378-9EDF0C3518C2",
                     NotificationType.HearingConfirmationStaffMemberMultiDay, MessageType.Email,
-                    "case name,case number,staff member,Start Day Month Year,time,number of days,username",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,staff member,Start Day Month Year,time,number of days,username")
+            },
+            {
+                CreateTemplate("0A755E44-E29E-4BB6-81F2-648553E552BF", NotificationType.StaffMemberDemoOrTest,
+                    MessageType.Email, "test type,date,time,case number,staff member")
+            },
+            {
+                CreateTemplate("E4636FBE-6466-4394-9775-A98FED84FD23", NotificationType.NewHearingReminderLIP,
+                    MessageType.Email, "case name, case number, name, day month year, time, username")
+            },
+            {
+                CreateTemplate("1FB464A6-EB9F-404E-824E-41A6153E9B17",
+                    NotificationType.NewHearingReminderRepresentative,
+                    MessageType.Email,
+                    "case name, case number, client name, solicitor name, day month year, time, username")
             },
             {
-                new Template(new Guid("0A755E44-E29E-4BB6-81F2-648553E552BF"), NotificationType.StaffMemberDemoOrTest,
-                    MessageType.Email, "test type,date,time,case number,staff member", DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("4A6FB490-4CB7-4441-9B00-CCA636A2C455", NotificationType.NewHearingReminderJOH,
+                    MessageType.Email, CASE_NAME__CASE_NUMBER__JUDICIAL_OFFICE_HOLDER__DAY_MONTH_YEAR__TIME__USERNAME)
             },
-            { 
-                new Template(new Guid("E4636FBE-6466-4394-9775-A98FED84FD23"),NotificationType.NewHearingReminderLIP,
-                MessageType.Email,"case name, case number, name, day month year, time, username",DateTime.UtcNow,
-                DateTime.UtcNow ) 
+            {
+                CreateTemplate("1e683018-cd1f-4c41-83c8-3686b697655e", NotificationType.NewHearingReminderEJUD,
+                    MessageType.Email, CASE_NAME__CASE_NUMBER__JUDICIAL_OFFICE_HOLDER__DAY_MONTH_YEAR__TIME__USERNAME)
+            },
+            {
+                CreateTemplate("6c9be8bd-9aaa-468c-ad73-340fb0919b21", NotificationType.NewUserLipWelcome,
+                    MessageType.Email, CASE_NAME__CASE_NUMBER__JUDICIAL_OFFICE_HOLDER__DAY_MONTH_YEAR__TIME__USERNAME)
             },
-            { 
-                new Template(new Guid("1FB464A6-EB9F-404E-824E-41A6153E9B17"),NotificationType.NewHearingReminderRepresentative,
-                MessageType.Email,"case name, case number, client name, solicitor name, day month year, time, username",
-                DateTime.UtcNow,DateTime.UtcNow ) 
+            {
+                CreateTemplate("625bb8c7-b70b-4fde-867e-9e365285d756", NotificationType.NewUserLipConfirmation,
+                    MessageType.Email, CASE_NAME__CASE_NUMBER__JUDICIAL_OFFICE_HOLDER__DAY_MONTH_YEAR__TIME__USERNAME)
             },
-            { 
-                new Template(new Guid("4A6FB490-4CB7-4441-9B00-CCA636A2C455"),NotificationType.NewHearingReminderJOH,
-                MessageType.Email,"case name, case number, judicial office holder, day month year, time, username",
-                DateTime.UtcNow,DateTime.UtcNow ) 
+            {
+                CreateTemplate("14917a84-8a87-4e5e-82d2-6d3402ce1395",
+                    NotificationType.NewUserLipConfirmationMultiDay,
+                    MessageType.Email, CASE_NAME__CASE_NUMBER__JUDICIAL_OFFICE_HOLDER__DAY_MONTH_YEAR__TIME__USERNAME)
             },
             {
-                new Template(new Guid("1e683018-cd1f-4c41-83c8-3686b697655e"),NotificationType.NewHearingReminderEJUD,
-                MessageType.Email,"case name, case number, judicial office holder, day month year, time, username",
-                DateTime.UtcNow,DateTime.UtcNow )
+                CreateTemplate("7458e52d-3954-4f33-bd2d-0a7d2de295fc",
+                    NotificationType.ExistingUserLipConfirmation,
+                    MessageType.Email, CASE_NAME__CASE_NUMBER__JUDICIAL_OFFICE_HOLDER__DAY_MONTH_YEAR__TIME__USERNAME)
             },
             {
-                new Template(new Guid("6c9be8bd-9aaa-468c-ad73-340fb0919b21"),NotificationType.NewUserLipWelcome,
-                    MessageType.Email,"case name, case number, judicial office holder, day month year, time, username",
-                    DateTime.UtcNow,DateTime.UtcNow )
+                CreateTemplate("3d83ee22-71ef-47f6-9557-bdaf0c0eecae",
+                    NotificationType.ExistingUserLipConfirmationMultiDay,
+                    MessageType.Email, CASE_NAME__CASE_NUMBER__JUDICIAL_OFFICE_HOLDER__DAY_MONTH_YEAR__TIME__USERNAME)
             },
         };
 
         private readonly IList<Template> _sourceTemplatesPreview = new List<Template>()
         {
             {
-                new Template(new Guid("94D06843-4608-4CDA-9933-9D0F3D7CE535"), NotificationType.CreateIndividual,
-                    MessageType.Email, "name,username,random password", DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("94D06843-4608-4CDA-9933-9D0F3D7CE535", NotificationType.CreateIndividual,
+                    MessageType.Email, "name,username,random password")
             },
             {
-                new Template(new Guid("E61575FC-05C8-40DA-B7A7-F7B1D04FF2DB"), NotificationType.CreateRepresentative,
-                    MessageType.Email, "name,username,random password", DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("E61575FC-05C8-40DA-B7A7-F7B1D04FF2DB", NotificationType.CreateRepresentative,
+                    MessageType.Email, "name,username,random password")
             },
             {
-                new Template(new Guid("15F91D90-56F0-480A-957D-11245F9C2CD9"), NotificationType.PasswordReset,
-                    MessageType.Email, "name,password", DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("15F91D90-56F0-480A-957D-11245F9C2CD9", NotificationType.PasswordReset,
+                    MessageType.Email, "name,password")
             },
             {
-                new Template(new Guid("6489A0F3-538F-49BC-86C5-B2787C71062A"),
+                CreateTemplate("6489A0F3-538F-49BC-86C5-B2787C71062A",
                     NotificationType.HearingConfirmationJudge, MessageType.Email,
-                    "case name,case number,judge,day month year,time,courtroom account username,account password",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,judge,day month year,time,courtroom account username,account password")
             },
             {
-                new Template(new Guid("7DAF5DE2-256D-400F-854D-B8EA06DF2B84"), NotificationType.HearingConfirmationJoh,
-                    MessageType.Email, "case name,case number,judicial office holder,Day Month Year,time",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("7DAF5DE2-256D-400F-854D-B8EA06DF2B84", NotificationType.HearingConfirmationJoh,
+                    MessageType.Email, "case name,case number,judicial office holder,Day Month Year,time")
             },
             {
-                new Template(new Guid("2CF31323-3533-404D-9B52-73B33CE4A1BE"), NotificationType.HearingConfirmationLip,
-                    MessageType.Email, "case name,case number,name,Day Month Year,time", DateTime.UtcNow,
-                    DateTime.UtcNow)
+                CreateTemplate("2CF31323-3533-404D-9B52-73B33CE4A1BE", NotificationType.HearingConfirmationLip,
+                    MessageType.Email, "case name,case number,name,Day Month Year,time")
             },
             {
-                new Template(new Guid("2D39FF6C-D036-4DE0-A953-F148F9839F3C"),
+                CreateTemplate("2D39FF6C-D036-4DE0-A953-F148F9839F3C",
                     NotificationType.HearingConfirmationRepresentative, MessageType.Email,
-                    "case name,case number,client name,solicitor name,Day Month Year,time", DateTime.UtcNow,
-                    DateTime.UtcNow)
+                    "case name,case number,client name,solicitor name,Day Month Year,time")
             },
             {
-                new Template(new Guid("C0744BD9-4D9B-4F1A-BA3E-148C216FE1EA"), NotificationType.HearingReminderJoh,
-                    MessageType.Email, "case name,case number,judicial office holder,day month year,time,username",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("C0744BD9-4D9B-4F1A-BA3E-148C216FE1EA", NotificationType.HearingReminderJoh,
+                    MessageType.Email, "case name,case number,judicial office holder,day month year,time,username")
             },
             {
-                new Template(new Guid("385F78F3-0E77-45A5-A1B0-6CE793A9CDB2"), NotificationType.HearingReminderLip,
-                    MessageType.Email, "case name,case number,name,day month year,time,username", DateTime.UtcNow,
-                    DateTime.UtcNow)
+                CreateTemplate("385F78F3-0E77-45A5-A1B0-6CE793A9CDB2", NotificationType.HearingReminderLip,
+                    MessageType.Email, "case name,case number,name,day month year,time,username")
             },
             {
-                new Template(new Guid("7C90FEB4-F819-40B8-98CE-F83332B48014"),
+                CreateTemplate("7C90FEB4-F819-40B8-98CE-F83332B48014",
                     NotificationType.HearingReminderRepresentative, MessageType.Email,
-                    "case name,case number,client name,solicitor name,day month year,time,username", DateTime.UtcNow,
-                    DateTime.UtcNow)
+                    "case name,case number,client name,solicitor name,day month year,time,username")
             },
             {
-                new Template(new Guid("7C90E8DA-727B-4614-A3C6-B05219920CDE"), NotificationType.HearingAmendmentJudge,
+                CreateTemplate("7C90E8DA-727B-4614-A3C6-B05219920CDE", NotificationType.HearingAmendmentJudge,
                     MessageType.Email,
-                    "case name,case number,judge,New Day Month Year,Old Day Month Year,New time,Old time,courtroom account username,account password",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,judge,New Day Month Year,Old Day Month Year,New time,Old time,courtroom account username,account password")
             },
             {
-                new Template(new Guid("21A701AD-89D3-451A-9A87-544057541909"), NotificationType.HearingAmendmentJoh,
+                CreateTemplate("21A701AD-89D3-451A-9A87-544057541909", NotificationType.HearingAmendmentJoh,
                     MessageType.Email,
-                    "case name,case number,judicial office holder,New Day Month Year,Old Day Month Year,New time,Old time,courtroom account username,account password",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,judicial office holder,New Day Month Year,Old Day Month Year,New time,Old time,courtroom account username,account password")
             },
             {
-                new Template(new Guid("7F09A0C3-0AF6-49F1-85B4-259511FAD474"), NotificationType.HearingAmendmentLip,
+                CreateTemplate("7F09A0C3-0AF6-49F1-85B4-259511FAD474", NotificationType.HearingAmendmentLip,
                     MessageType.Email,
-                    "case name,case number,name,New Day Month Year,Old Day Month Year,New time,Old time,courtroom account username,account password",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,name,New Day Month Year,Old Day Month Year,New time,Old time,courtroom account username,account password")
             },
             {
-                new Template(new Guid("79BBD6C3-14BA-4C8E-BD7C-10CEDFDFE3F0"),
+                CreateTemplate("79BBD6C3-14BA-4C8E-BD7C-10CEDFDFE3F0",
                     NotificationType.HearingAmendmentRepresentative, MessageType.Email,
-                    "case name,case number,client name,solicitor name,New Day Month Year,Old Day Month Year,New time,Old time,courtroom account username,account password",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,client name,solicitor name,New Day Month Year,Old Day Month Year,New time,Old time,courtroom account username,account password")
             },
             {
-                new Template(new Guid("A85B7C4B-BC32-41B9-AB3B-0EEDC0FF8617"),
+                CreateTemplate("A85B7C4B-BC32-41B9-AB3B-0EEDC0FF8617",
                     NotificationType.HearingConfirmationJudgeMultiDay, MessageType.Email,
-                    "case name,case number,judge,Start Day Month Year,time,number of days,courtroom account username,account password",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,judge,Start Day Month Year,time,number of days,courtroom account username,account password")
             },
             {
-                new Template(new Guid("77F66714-FAFC-4642-B505-33517E8A6BA8"),
+                CreateTemplate("77F66714-FAFC-4642-B505-33517E8A6BA8",
                     NotificationType.HearingConfirmationJohMultiDay, MessageType.Email,
-                    "case name,case number,judicial office holder,Start Day Month Year,time,number of days,time",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,judicial office holder,Start Day Month Year,time,number of days,time")
             },
             {
-                new Template(new Guid("BF20004C-258B-4DE9-83A1-D7B260750B9F"),
+                CreateTemplate("BF20004C-258B-4DE9-83A1-D7B260750B9F",
                     NotificationType.HearingConfirmationLipMultiDay, MessageType.Email,
-                    "case name,case number,name,Start Day Month Year,time,number of days,time", DateTime.UtcNow,
-                    DateTime.UtcNow)
+                    "case name,case number,name,Start Day Month Year,time,number of days,time")
             },
             {
-                new Template(new Guid("C06B60B0-CA26-43EE-B6B6-7E5AA5A2B170"),
+                CreateTemplate("C06B60B0-CA26-43EE-B6B6-7E5AA5A2B170",
                     NotificationType.HearingConfirmationRepresentativeMultiDay, MessageType.Email,
-                    "case name,case number,client name,solicitor name,Start Day Month Year,time,number of days,time",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,client name,solicitor name,Start Day Month Year,time,number of days,time")
             },
             {
-                new Template(new Guid("28B905EA-ECA2-48D3-88EA-B87D578306E9"),
+                CreateTemplate("28B905EA-ECA2-48D3-88EA-B87D578306E9",
                     NotificationType.HearingConfirmationEJudJudge, MessageType.Email,
-                    "case name,case number,judge,day month year,time", DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,judge,day month year,time")
             },
             {
-                new Template(new Guid("152F75BC-291C-4420-9411-F39FE8A433ED"),
+                CreateTemplate("152F75BC-291C-4420-9411-F39FE8A433ED",
                     NotificationType.HearingConfirmationEJudJudgeMultiDay, MessageType.Email,
-                    "case name,case number,judge,Start Day Month Year,time,number of days", DateTime.UtcNow,
-                    DateTime.UtcNow)
+                    "case name,case number,judge,Start Day Month Year,time,number of days")
             },
             {
-                new Template(new Guid("2FF7B633-E285-4E25-9029-83012DD448BA"),
+                CreateTemplate("2FF7B633-E285-4E25-9029-83012DD448BA",
                     NotificationType.HearingAmendmentEJudJudge, MessageType.Email,
-                    "case name,case number,judge,New Day Month Year,Old Day Month Year,New time,Old time",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,judge,New Day Month Year,Old Day Month Year,New time,Old time")
             },
             {
-                new Template(new Guid("CA353650-C43B-46E4-890C-B8DAD47A825A"), NotificationType.HearingAmendmentEJudJoh,
-                    MessageType.Email, "case name,case number,judge,day month year,time", DateTime.UtcNow,
-                    DateTime.UtcNow)
+                CreateTemplate("CA353650-C43B-46E4-890C-B8DAD47A825A", NotificationType.HearingAmendmentEJudJoh,
+                    MessageType.Email, "case name,case number,judge,day month year,time")
             },
             {
-                new Template(new Guid("B5E2E627-398F-4FBF-8853-121D3007E043"), NotificationType.HearingReminderEJudJoh,
-                    MessageType.Email, "case name,case number,judicial office holder,day month year,time",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("B5E2E627-398F-4FBF-8853-121D3007E043", NotificationType.HearingReminderEJudJoh,
+                    MessageType.Email, "case name,case number,judicial office holder,day month year,time")
             },
             {
-                new Template(new Guid("4B6C39A5-88AB-475C-9E3A-62BE1778A16D"),
+                CreateTemplate("4B6C39A5-88AB-475C-9E3A-62BE1778A16D",
                     NotificationType.HearingConfirmationEJudJoh, MessageType.Email,
-                    "case name,case number,judicial office holder,day month year,time", DateTime.UtcNow,
-                    DateTime.UtcNow)
+                    "case name,case number,judicial office holder,day month year,time")
             },
             {
-                new Template(new Guid("ED0F327E-324B-446C-BB0A-48BEA0F67786"),
+                CreateTemplate("ED0F327E-324B-446C-BB0A-48BEA0F67786",
                     NotificationType.HearingConfirmationEJudJohMultiDay, MessageType.Email,
-                    "case name,case number,judicial office holder,Start Day Month Year,time,number of days",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,judicial office holder,Start Day Month Year,time,number of days")
             },
             {
-                new Template(new Guid("6F16C9DF-9DDD-4C4D-A743-7D87853FD753"), NotificationType.EJudJohDemoOrTest,
-                    MessageType.Email, "case number,test type,judicial office holder,date,time", DateTime.UtcNow,
-                    DateTime.UtcNow)
+                CreateTemplate("6F16C9DF-9DDD-4C4D-A743-7D87853FD753", NotificationType.EJudJohDemoOrTest,
+                    MessageType.Email, "case number,test type,judicial office holder,date,time")
             },
             {
-                new Template(new Guid("F0898BA0-3C26-40C6-B311-1EC4B0E5B01C"), NotificationType.ParticipantDemoOrTest,
-                    MessageType.Email, "test type,case number,date,name,username,time", DateTime.UtcNow,
-                    DateTime.UtcNow)
+                CreateTemplate("F0898BA0-3C26-40C6-B311-1EC4B0E5B01C", NotificationType.ParticipantDemoOrTest,
+                    MessageType.Email, "test type,case number,date,name,username,time")
             },
             {
-                new Template(new Guid("56E9FF91-267F-4154-814A-0281DD100CC6"), NotificationType.EJudJudgeDemoOrTest,
-                    MessageType.Email, "test type,date,time,case number,Judge", DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("56E9FF91-267F-4154-814A-0281DD100CC6", NotificationType.EJudJudgeDemoOrTest,
+                    MessageType.Email, "test type,date,time,case number,Judge")
             },
             {
-                new Template(new Guid("E2709C28-9E12-4BC5-B2EA-3FC8147E7373"), NotificationType.JudgeDemoOrTest,
-                    MessageType.Email, "test type,date,time,case number,Judge,courtroom account username",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("E2709C28-9E12-4BC5-B2EA-3FC8147E7373", NotificationType.JudgeDemoOrTest,
+                    MessageType.Email, "test type,date,time,case number,Judge,courtroom account username")
             },
             {
-                new Template(new Guid("720E569B-4FBD-4529-8530-6A51C46EBD87"),
+                CreateTemplate("720E569B-4FBD-4529-8530-6A51C46EBD87",
                     NotificationType.TelephoneHearingConfirmation, MessageType.Email,
-                    "case name,case number,name,day month year,time", DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,name,day month year,time")
             },
             {
-                new Template(new Guid("E870E3BF-8C3D-477C-BFC1-EB4776ABBF66"),
+                CreateTemplate("E870E3BF-8C3D-477C-BFC1-EB4776ABBF66",
                     NotificationType.TelephoneHearingConfirmationMultiDay, MessageType.Email,
-                    "case name,case number,name,day month year,time,number of days", DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,name,day month year,time,number of days")
             },
             {
-                new Template(new Guid("15C78693-F4F1-48E2-A3A0-0C04DF40586C"), NotificationType.CreateStaffMember,
-                    MessageType.Email, "Name,Username,Password", DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("15C78693-F4F1-48E2-A3A0-0C04DF40586C", NotificationType.CreateStaffMember,
+                    MessageType.Email, "Name,Username,Password")
             },
             {
-                new Template(new Guid("F11C7848-8D7B-4045-9C6E-15E7C9EB9060"),
+                CreateTemplate("F11C7848-8D7B-4045-9C6E-15E7C9EB9060",
                     NotificationType.HearingAmendmentStaffMember, MessageType.Email,
-                    "case name,case number,staff member,New Day Month Year,Old Day Month Year,New time,Old time",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,staff member,New Day Month Year,Old Day Month Year,New time,Old time")
             },
             {
-                new Template(new Guid("CD2F20EB-5A32-42B9-A267-135D635FC9C7"),
+                CreateTemplate("CD2F20EB-5A32-42B9-A267-135D635FC9C7",
                     NotificationType.HearingConfirmationStaffMember, MessageType.Email,
-                    "case name,case number,staff member,day month year,time,username", DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,staff member,day month year,time,username")
             },
             {
-                new Template(new Guid("5CCD4DD9-388B-402B-9D58-36720B4346BA"),
+                CreateTemplate("5CCD4DD9-388B-402B-9D58-36720B4346BA",
                     NotificationType.HearingConfirmationStaffMemberMultiDay, MessageType.Email,
-                    "case name,case number,staff member,Start Day Month Year,time,number of days,username",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,staff member,Start Day Month Year,time,number of days,username")
             },
             {
-                new Template(new Guid("3FCA3D41-4129-465D-BBD7-31DAC01D3CA5"), NotificationType.StaffMemberDemoOrTest,
-                    MessageType.Email, "test type,date,time,case number,staff member", DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("3FCA3D41-4129-465D-BBD7-31DAC01D3CA5", NotificationType.StaffMemberDemoOrTest,
+                    MessageType.Email, "test type,date,time,case number,staff member")
             },
             {
-                new Template(new Guid("BB116814-0D4E-4F4B-86B7-E04A437DB31F"), NotificationType.NewHearingReminderLIP,
-                    MessageType.Email, "case name, case number, name, day month year, time, username", DateTime.UtcNow,
-                    DateTime.UtcNow)
+                CreateTemplate("BB116814-0D4E-4F4B-86B7-E04A437DB31F", NotificationType.NewHearingReminderLIP,
+                    MessageType.Email, "case name, case number, name, day month year, time, username")
             },
             {
-                new Template(new Guid("17D911FE-3B90-4443-B113-CB4626179DE9"),
+                CreateTemplate("17D911FE-3B90-4443-B113-CB4626179DE9",
                     NotificationType.NewHearingReminderRepresentative, MessageType.Email,
-                    "case name, case number, client name, solicitor name, day month year, time, username",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name, case number, client name, solicitor name, day month year, time, username")
             },
             {
-                new Template(new Guid("31955C3E-4664-4D7B-A2D3-35CD01B7E923"), NotificationType.NewHearingReminderJOH,
-                    MessageType.Email, "case name, case number, judicial office holder, day month year, time, username",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("31955C3E-4664-4D7B-A2D3-35CD01B7E923", NotificationType.NewHearingReminderJOH,
+                    MessageType.Email, CASE_NAME__CASE_NUMBER__JUDICIAL_OFFICE_HOLDER__DAY_MONTH_YEAR__TIME__USERNAME)
             },
             {
-                new Template(new Guid("3e4168c3-04fd-43fc-a863-6dcc38512cf0"),NotificationType.NewHearingReminderEJUD,
-                MessageType.Email,"case name, case number, judicial office holder, day month year, time, username",
-                DateTime.UtcNow,DateTime.UtcNow )
+                CreateTemplate("3e4168c3-04fd-43fc-a863-6dcc38512cf0", NotificationType.NewHearingReminderEJUD,
+                    MessageType.Email, CASE_NAME__CASE_NUMBER__JUDICIAL_OFFICE_HOLDER__DAY_MONTH_YEAR__TIME__USERNAME)
             },
         };
 
         private readonly IList<Template> _sourceTemplatesAAT = new List<Template>()
         {
             {
-                new Template(new Guid("C7D41520-FA99-42A6-AF89-C99DD750252C"), NotificationType.CreateIndividual,
-                    MessageType.Email, "name,username,random password", DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("C7D41520-FA99-42A6-AF89-C99DD750252C", NotificationType.CreateIndividual,
+                    MessageType.Email, "name,username,random password")
             },
             {
-                new Template(new Guid("B1635497-A4A5-4139-94BE-083A8DC7058D"), NotificationType.CreateRepresentative,
-                    MessageType.Email, "name,username,random password", DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("B1635497-A4A5-4139-94BE-083A8DC7058D", NotificationType.CreateRepresentative,
+                    MessageType.Email, "name,username,random password")
             },
             {
-                new Template(new Guid("C3DDD83A-E5EB-4C24-906A-3E7907FC08C3"), NotificationType.PasswordReset,
-                    MessageType.Email, "name,password", DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("C3DDD83A-E5EB-4C24-906A-3E7907FC08C3", NotificationType.PasswordReset,
+                    MessageType.Email, "name,password")
             },
             {
-                new Template(new Guid("C80E52DD-CAE1-452C-BC8D-EDCD3EC7D71E"),
+                CreateTemplate("C80E52DD-CAE1-452C-BC8D-EDCD3EC7D71E",
                     NotificationType.HearingConfirmationJudge, MessageType.Email,
-                    "case name,case number,judge,day month year,time,courtroom account username,account password",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,judge,day month year,time,courtroom account username,account password")
             },
             {
-                new Template(new Guid("6857660F-430C-457F-ACE5-DB048EA62CBD"), NotificationType.HearingConfirmationJoh,
-                    MessageType.Email, "case name,case number,judicial office holder,Day Month Year,time",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("6857660F-430C-457F-ACE5-DB048EA62CBD", NotificationType.HearingConfirmationJoh,
+                    MessageType.Email, "case name,case number,judicial office holder,Day Month Year,time")
             },
             {
-                new Template(new Guid("8C9F0EEB-5962-4670-B576-9434FCC17DE6"), NotificationType.HearingConfirmationLip,
-                    MessageType.Email, "case name,case number,name,Day Month Year,time", DateTime.UtcNow,
-                    DateTime.UtcNow)
+                CreateTemplate("8C9F0EEB-5962-4670-B576-9434FCC17DE6", NotificationType.HearingConfirmationLip,
+                    MessageType.Email, "case name,case number,name,Day Month Year,time")
             },
             {
-                new Template(new Guid("CF25DDCE-A4DD-4570-BB20-A996B17C3031"),
+                CreateTemplate("CF25DDCE-A4DD-4570-BB20-A996B17C3031",
                     NotificationType.HearingConfirmationRepresentative, MessageType.Email,
-                    "case name,case number,client name,solicitor name,Day Month Year,time", DateTime.UtcNow,
-                    DateTime.UtcNow)
+                    "case name,case number,client name,solicitor name,Day Month Year,time")
             },
             {
-                new Template(new Guid("CDB2D5C4-15E8-4A10-8C82-C65E877A30C0"), NotificationType.HearingReminderJoh,
-                    MessageType.Email, "case name,case number,judicial office holder,day month year,time,username",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("CDB2D5C4-15E8-4A10-8C82-C65E877A30C0", NotificationType.HearingReminderJoh,
+                    MessageType.Email, "case name,case number,judicial office holder,day month year,time,username")
             },
             {
-                new Template(new Guid("FCADCCDA-ED33-470C-BAFF-5E065F5D7ADD"), NotificationType.HearingReminderLip,
-                    MessageType.Email, "case name,case number,name,day month year,time,username", DateTime.UtcNow,
-                    DateTime.UtcNow)
+                CreateTemplate("FCADCCDA-ED33-470C-BAFF-5E065F5D7ADD", NotificationType.HearingReminderLip,
+                    MessageType.Email, "case name,case number,name,day month year,time,username")
             },
             {
-                new Template(new Guid("D4DA0280-CF81-41D3-89BB-8326096BE333"),
+                CreateTemplate("D4DA0280-CF81-41D3-89BB-8326096BE333",
                     NotificationType.HearingReminderRepresentative, MessageType.Email,
-                    "case name,case number,client name,solicitor name,day month year,time,username", DateTime.UtcNow,
-                    DateTime.UtcNow)
+                    "case name,case number,client name,solicitor name,day month year,time,username")
             },
             {
-                new Template(new Guid("B6B8BD0D-4019-4451-B19E-DA7D645CB9E0"), NotificationType.HearingAmendmentJudge,
+                CreateTemplate("B6B8BD0D-4019-4451-B19E-DA7D645CB9E0", NotificationType.HearingAmendmentJudge,
                     MessageType.Email,
-                    "case name,case number,judge,New Day Month Year,Old Day Month Year,New time,Old time,courtroom account username,account password",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,judge,New Day Month Year,Old Day Month Year,New time,Old time,courtroom account username,account password")
             },
             {
-                new Template(new Guid("812589D7-3E36-4C01-8CA2-CBB67597752C"), NotificationType.HearingAmendmentJoh,
+                CreateTemplate("812589D7-3E36-4C01-8CA2-CBB67597752C", NotificationType.HearingAmendmentJoh,
                     MessageType.Email,
-                    "case name,case number,judicial office holder,New Day Month Year,Old Day Month Year,New time,Old time,courtroom account username,account password",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,judicial office holder,New Day Month Year,Old Day Month Year,New time,Old time,courtroom account username,account password")
             },
             {
-                new Template(new Guid("0E284B71-0C8C-4A4D-85EF-B986723F8212"), NotificationType.HearingAmendmentLip,
+                CreateTemplate("0E284B71-0C8C-4A4D-85EF-B986723F8212", NotificationType.HearingAmendmentLip,
                     MessageType.Email,
-                    "case name,case number,name,New Day Month Year,Old Day Month Year,New time,Old time,courtroom account username,account password",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,name,New Day Month Year,Old Day Month Year,New time,Old time,courtroom account username,account password")
             },
             {
-                new Template(new Guid("5FAB1114-172D-4DBB-876E-66EF0AE8FBD3"),
+                CreateTemplate("5FAB1114-172D-4DBB-876E-66EF0AE8FBD3",
                     NotificationType.HearingAmendmentRepresentative, MessageType.Email,
-                    "case name,case number,client name,solicitor name,New Day Month Year,Old Day Month Year,New time,Old time,courtroom account username,account password",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,client name,solicitor name,New Day Month Year,Old Day Month Year,New time,Old time,courtroom account username,account password")
             },
             {
-                new Template(new Guid("A764673E-8EB0-4096-ABF1-963808244EA6"),
+                CreateTemplate("A764673E-8EB0-4096-ABF1-963808244EA6",
                     NotificationType.HearingConfirmationJudgeMultiDay, MessageType.Email,
-                    "case name,case number,judge,Start Day Month Year,time,number of days,courtroom account username,account password",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,judge,Start Day Month Year,time,number of days,courtroom account username,account password")
             },
             {
-                new Template(new Guid("59A1CB05-24D8-4043-AA8E-761ED8D50429"),
+                CreateTemplate("59A1CB05-24D8-4043-AA8E-761ED8D50429",
                     NotificationType.HearingConfirmationJohMultiDay, MessageType.Email,
-                    "case name,case number,judicial office holder,Start Day Month Year,time,number of days,time",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,judicial office holder,Start Day Month Year,time,number of days,time")
             },
             {
-                new Template(new Guid("F825BD34-CABB-4E3A-9A51-C7DEF1299F65"),
+                CreateTemplate("F825BD34-CABB-4E3A-9A51-C7DEF1299F65",
                     NotificationType.HearingConfirmationLipMultiDay, MessageType.Email,
-                    "case name,case number,name,Start Day Month Year,time,number of days,time", DateTime.UtcNow,
-                    DateTime.UtcNow)
+                    "case name,case number,name,Start Day Month Year,time,number of days,time")
             },
             {
-                new Template(new Guid("586FD254-4F9F-4FAA-AD48-38FCF8D92A5A"),
+                CreateTemplate("586FD254-4F9F-4FAA-AD48-38FCF8D92A5A",
                     NotificationType.HearingConfirmationRepresentativeMultiDay, MessageType.Email,
-                    "case name,case number,client name,solicitor name,Start Day Month Year,time,number of days,time",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,client name,solicitor name,Start Day Month Year,time,number of days,time")
             },
             {
-                new Template(new Guid("3C53CB77-BD09-481A-82C0-B015A6925615"),
+                CreateTemplate("3C53CB77-BD09-481A-82C0-B015A6925615",
                     NotificationType.HearingConfirmationEJudJudge, MessageType.Email,
-                    "case name,case number,judge,day month year,time", DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,judge,day month year,time")
             },
             {
-                new Template(new Guid("0818EEDD-1CBA-46F2-8362-9FEB8C8215C1"),
+                CreateTemplate("0818EEDD-1CBA-46F2-8362-9FEB8C8215C1",
                     NotificationType.HearingConfirmationEJudJudgeMultiDay, MessageType.Email,
-                    "case name,case number,judge,Start Day Month Year,time,number of days", DateTime.UtcNow,
-                    DateTime.UtcNow)
+                    "case name,case number,judge,Start Day Month Year,time,number of days")
             },
             {
-                new Template(new Guid("FF62B0DC-4E10-4D02-B58D-7A2A1A0CAB30"),
+                CreateTemplate("FF62B0DC-4E10-4D02-B58D-7A2A1A0CAB30",
                     NotificationType.HearingAmendmentEJudJudge, MessageType.Email,
-                    "case name,case number,judge,New Day Month Year,Old Day Month Year,New time,Old time",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,judge,New Day Month Year,Old Day Month Year,New time,Old time")
             },
             {
-                new Template(new Guid("A1FD5BA6-E915-47DC-A2FC-765C83F99C16"), NotificationType.HearingAmendmentEJudJoh,
-                    MessageType.Email, "case name,case number,judicial office holder,day month year,time",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("A1FD5BA6-E915-47DC-A2FC-765C83F99C16", NotificationType.HearingAmendmentEJudJoh,
+                    MessageType.Email, "case name,case number,judicial office holder,day month year,time")
             },
             {
-                new Template(new Guid("CDBC2F9F-D480-4218-B6D9-765F307CDFEA"), NotificationType.HearingReminderEJudJoh,
-                    MessageType.Email, "case name,case number,judicial office holder,day month year,time",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("CDBC2F9F-D480-4218-B6D9-765F307CDFEA", NotificationType.HearingReminderEJudJoh,
+                    MessageType.Email, "case name,case number,judicial office holder,day month year,time")
             },
             {
-                new Template(new Guid("0F77F8EC-BACA-4F55-99CB-64E371755548"),
+                CreateTemplate("0F77F8EC-BACA-4F55-99CB-64E371755548",
                     NotificationType.HearingConfirmationEJudJoh, MessageType.Email,
-                    "case name,case number,judicial office holder,day month year,time", DateTime.UtcNow,
-                    DateTime.UtcNow)
+                    "case name,case number,judicial office holder,day month year,time")
             },
             {
-                new Template(new Guid("38661950-B4C7-465B-888D-2D3EAB0F666B"),
+                CreateTemplate("38661950-B4C7-465B-888D-2D3EAB0F666B",
                     NotificationType.HearingConfirmationEJudJohMultiDay, MessageType.Email,
-                    "case name,case number,judicial office holder,Start Day Month Year,time,number of days",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,judicial office holder,Start Day Month Year,time,number of days")
             },
             {
-                new Template(new Guid("256FD96C-E177-4727-BD82-FD0BA1558EE1"), NotificationType.EJudJohDemoOrTest,
-                    MessageType.Email, "case number,test type,judicial office holder,username,date,time",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("256FD96C-E177-4727-BD82-FD0BA1558EE1", NotificationType.EJudJohDemoOrTest,
+                    MessageType.Email, "case number,test type,judicial office holder,username,date,time")
             },
             {
-                new Template(new Guid("AB4CF5AE-5CEE-4939-B901-6200CC1DBC94"), NotificationType.ParticipantDemoOrTest,
-                    MessageType.Email, "test type,case number,date,name,username,time", DateTime.UtcNow,
-                    DateTime.UtcNow)
+                CreateTemplate("AB4CF5AE-5CEE-4939-B901-6200CC1DBC94", NotificationType.ParticipantDemoOrTest,
+                    MessageType.Email, "test type,case number,date,name,username,time")
             },
             {
-                new Template(new Guid("A7C402BE-15CE-4B41-AA0B-F4D44A4685A8"), NotificationType.EJudJudgeDemoOrTest,
-                    MessageType.Email, "test type,date,time,case number,Judge", DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("A7C402BE-15CE-4B41-AA0B-F4D44A4685A8", NotificationType.EJudJudgeDemoOrTest,
+                    MessageType.Email, "test type,date,time,case number,Judge")
             },
             {
-                new Template(new Guid("6CDA97F8-E58B-4ECA-BC53-6F0C1D3FC538"), NotificationType.JudgeDemoOrTest,
-                    MessageType.Email, "test type,date,time,case number,Judge,courtroom account username",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("6CDA97F8-E58B-4ECA-BC53-6F0C1D3FC538", NotificationType.JudgeDemoOrTest,
+                    MessageType.Email, "test type,date,time,case number,Judge,courtroom account username")
             },
             {
-                new Template(new Guid("CDDE03E6-A997-43B9-9233-DE5626CCD6A2"),
+                CreateTemplate("CDDE03E6-A997-43B9-9233-DE5626CCD6A2",
                     NotificationType.TelephoneHearingConfirmation, MessageType.Email,
-                    "case name,case number,name,day month year,time", DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,name,day month year,time")
             },
             {
-                new Template(new Guid("9C276903-55C2-4A71-AF11-127996CEB54D"),
+                CreateTemplate("9C276903-55C2-4A71-AF11-127996CEB54D",
                     NotificationType.TelephoneHearingConfirmationMultiDay, MessageType.Email,
-                    "case name,case number,name,day month year,time,number of days", DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,name,day month year,time,number of days")
             },
             {
-                new Template(new Guid("A992739D-6D03-48D5-B07D-E57049F8B4EE"), NotificationType.CreateStaffMember,
-                    MessageType.Email, "Name,Username,Password", DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("A992739D-6D03-48D5-B07D-E57049F8B4EE", NotificationType.CreateStaffMember,
+                    MessageType.Email, "Name,Username,Password")
             },
             {
-                new Template(new Guid("29D9A491-207D-42ED-8EFC-ED8F64C103B1"),
+                CreateTemplate("29D9A491-207D-42ED-8EFC-ED8F64C103B1",
                     NotificationType.HearingAmendmentStaffMember, MessageType.Email,
-                    "case name,case number,staff member,New Day Month Year,Old Day Month Year,New time,Old time",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,staff member,New Day Month Year,Old Day Month Year,New time,Old time")
             },
             {
-                new Template(new Guid("CE4CC40F-2B59-44D7-BF88-4160196A178B"),
+                CreateTemplate("CE4CC40F-2B59-44D7-BF88-4160196A178B",
                     NotificationType.HearingConfirmationStaffMember, MessageType.Email,
-                    "case name,case number,staff member,day month year,time,username", DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,staff member,day month year,time,username")
             },
             {
-                new Template(new Guid("7EE06C78-D186-4F7A-ADF6-E155EDAAFF96"),
+                CreateTemplate("7EE06C78-D186-4F7A-ADF6-E155EDAAFF96",
                     NotificationType.HearingConfirmationStaffMemberMultiDay, MessageType.Email,
-                    "case name,case number,staff member,Start Day Month Year,time,number of days,username",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,staff member,Start Day Month Year,time,number of days,username")
             },
             {
-                new Template(new Guid("880151FE-88C5-4F97-904A-923333DDCEB9"), NotificationType.StaffMemberDemoOrTest,
-                    MessageType.Email, "test type,date,time,case number,staff member", DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("880151FE-88C5-4F97-904A-923333DDCEB9", NotificationType.StaffMemberDemoOrTest,
+                    MessageType.Email, "test type,date,time,case number,staff member")
             },
             {
-                new Template(new Guid("E6E998E7-7185-40E4-8D4A-817D48988047"), NotificationType.NewHearingReminderLIP,
-                    MessageType.Email, "case name, case number, name, day month year, time, username", DateTime.UtcNow,
-                    DateTime.UtcNow)
+                CreateTemplate("E6E998E7-7185-40E4-8D4A-817D48988047", NotificationType.NewHearingReminderLIP,
+                    MessageType.Email, "case name, case number, name, day month year, time, username")
             },
             {
-                new Template(new Guid("8E6C8F86-DA54-442F-9820-C09727552A99"),
+                CreateTemplate("8E6C8F86-DA54-442F-9820-C09727552A99",
                     NotificationType.NewHearingReminderRepresentative, MessageType.Email,
-                    "case name, case number, client name, solicitor name, day month year, time, username",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name, case number, client name, solicitor name, day month year, time, username")
             },
             {
-                new Template(new Guid("8A80D059-D075-45B2-88E0-3B2066E3189A"), NotificationType.NewHearingReminderJOH,
-                    MessageType.Email, "case name, case number, judicial office holder, day month year, time, username",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("8A80D059-D075-45B2-88E0-3B2066E3189A", NotificationType.NewHearingReminderJOH,
+                    MessageType.Email, CASE_NAME__CASE_NUMBER__JUDICIAL_OFFICE_HOLDER__DAY_MONTH_YEAR__TIME__USERNAME)
             },
             {
-                new Template(new Guid("03cd0de3-2f67-44cc-85a5-6c60e4046c8d"),NotificationType.NewHearingReminderEJUD,
-                MessageType.Email,"name, case name, case number", DateTime.UtcNow,DateTime.UtcNow )
+                CreateTemplate("03cd0de3-2f67-44cc-85a5-6c60e4046c8d", NotificationType.NewHearingReminderEJUD,
+                    MessageType.Email, "name, case name, case number")
             },
         };
 
         private readonly IList<Template> _sourceTemplatesTest1 = new List<Template>()
         {
             {
-                new Template(new Guid("7AFBE513-CF4B-4919-860B-A9BDC0B3967E"), NotificationType.CreateIndividual,
-                    MessageType.Email, "name,username,random password", DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("7AFBE513-CF4B-4919-860B-A9BDC0B3967E", NotificationType.CreateIndividual,
+                    MessageType.Email, "name,username,random password")
             },
             {
-                new Template(new Guid("001260B8-E144-4841-9583-7F8D4BBAB43D"), NotificationType.CreateRepresentative,
-                    MessageType.Email, "name,username,random password", DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("001260B8-E144-4841-9583-7F8D4BBAB43D", NotificationType.CreateRepresentative,
+                    MessageType.Email, "name,username,random password")
             },
             {
-                new Template(new Guid("FB6E43B6-BD9A-43D6-A2C6-712EA5202B10"), NotificationType.PasswordReset,
-                    MessageType.Email, "name,password", DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("FB6E43B6-BD9A-43D6-A2C6-712EA5202B10", NotificationType.PasswordReset,
+                    MessageType.Email, "name,password")
             },
             {
-                new Template(new Guid("CEEAD508-DF7E-4CCC-94E2-8571AA6AA0A5"),
+                CreateTemplate("CEEAD508-DF7E-4CCC-94E2-8571AA6AA0A5",
                     NotificationType.HearingConfirmationJudge, MessageType.Email,
-                    "case name,case number,judge,day month year,time,courtroom account username,account password",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,judge,day month year,time,courtroom account username,account password")
             },
             {
-                new Template(new Guid("C0A3B041-1C4B-4252-B3A1-2DCF5194B0E4"), NotificationType.HearingConfirmationJoh,
-                    MessageType.Email, "case name,case number,judicial office holder,Day Month Year,time",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("C0A3B041-1C4B-4252-B3A1-2DCF5194B0E4", NotificationType.HearingConfirmationJoh,
+                    MessageType.Email, "case name,case number,judicial office holder,Day Month Year,time")
             },
             {
-                new Template(new Guid("C6777D56-BF1A-45E6-98A7-2AE829659876"), NotificationType.HearingConfirmationLip,
-                    MessageType.Email, "case name,case number,name,Day Month Year,time", DateTime.UtcNow,
-                    DateTime.UtcNow)
+                CreateTemplate("C6777D56-BF1A-45E6-98A7-2AE829659876", NotificationType.HearingConfirmationLip,
+                    MessageType.Email, "case name,case number,name,Day Month Year,time")
             },
             {
-                new Template(new Guid("4C5B6E67-C531-4387-B09A-659C8C900B84"),
+                CreateTemplate("4C5B6E67-C531-4387-B09A-659C8C900B84",
                     NotificationType.HearingConfirmationRepresentative, MessageType.Email,
-                    "case name,case number,client name,solicitor name,Day Month Year,time", DateTime.UtcNow,
-                    DateTime.UtcNow)
+                    "case name,case number,client name,solicitor name,Day Month Year,time")
             },
             {
-                new Template(new Guid("907249EA-9DB9-4B82-BB39-46594C1D8CB4"), NotificationType.HearingReminderJoh,
-                    MessageType.Email, "case name,case number,judicial office holder,day month year,time,username",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("907249EA-9DB9-4B82-BB39-46594C1D8CB4", NotificationType.HearingReminderJoh,
+                    MessageType.Email, "case name,case number,judicial office holder,day month year,time,username")
             },
             {
-                new Template(new Guid("D69D1F27-4BF2-4C88-BE0D-35CA78B069A4"), NotificationType.HearingReminderLip,
-                    MessageType.Email, "case name,case number,name,day month year,time,username", DateTime.UtcNow,
-                    DateTime.UtcNow)
+                CreateTemplate("D69D1F27-4BF2-4C88-BE0D-35CA78B069A4", NotificationType.HearingReminderLip,
+                    MessageType.Email, "case name,case number,name,day month year,time,username")
             },
             {
-                new Template(new Guid("E4E344EF-CB42-4906-A2B1-0282512E9B1D"),
+                CreateTemplate("E4E344EF-CB42-4906-A2B1-0282512E9B1D",
                     NotificationType.HearingReminderRepresentative, MessageType.Email,
-                    "case name,case number,client name,solicitor name,day month year,time,username", DateTime.UtcNow,
-                    DateTime.UtcNow)
+                    "case name,case number,client name,solicitor name,day month year,time,username")
             },
             {
-                new Template(new Guid("DCA27D07-6804-4493-9661-79263F2FDDBA"), NotificationType.HearingAmendmentJudge,
+                CreateTemplate("DCA27D07-6804-4493-9661-79263F2FDDBA", NotificationType.HearingAmendmentJudge,
                     MessageType.Email,
-                    "case name,case number,judge,New Day Month Year,Old Day Month Year,New time,Old time,courtroom account username,account password",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,judge,New Day Month Year,Old Day Month Year,New time,Old time,courtroom account username,account password")
             },
             {
-                new Template(new Guid("F38144F7-5FBB-4010-AD3D-08199F642566"), NotificationType.HearingAmendmentJoh,
+                CreateTemplate("F38144F7-5FBB-4010-AD3D-08199F642566", NotificationType.HearingAmendmentJoh,
                     MessageType.Email,
-                    "case name,case number,judicial office holder,New Day Month Year,Old Day Month Year,New time,Old time,courtroom account username,account password",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,judicial office holder,New Day Month Year,Old Day Month Year,New time,Old time,courtroom account username,account password")
             },
             {
-                new Template(new Guid("7AE3F1DB-DC84-473D-BD43-D4ABEC5F273C"), NotificationType.HearingAmendmentLip,
+                CreateTemplate("7AE3F1DB-DC84-473D-BD43-D4ABEC5F273C", NotificationType.HearingAmendmentLip,
                     MessageType.Email,
-                    "case name,case number,name,New Day Month Year,Old Day Month Year,New time,Old time,courtroom account username,account password",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,name,New Day Month Year,Old Day Month Year,New time,Old time,courtroom account username,account password")
             },
             {
-                new Template(new Guid("0B1CF0C2-8140-4254-8606-A357FC4CB118"),
+                CreateTemplate("0B1CF0C2-8140-4254-8606-A357FC4CB118",
                     NotificationType.HearingAmendmentRepresentative, MessageType.Email,
-                    "case name,case number,client name,solicitor name,New Day Month Year,Old Day Month Year,New time,Old time,courtroom account username,account password",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,client name,solicitor name,New Day Month Year,Old Day Month Year,New time,Old time,courtroom account username,account password")
             },
             {
-                new Template(new Guid("C4F2DEB1-153D-44D8-BB2A-5A66586EC081"),
+                CreateTemplate("C4F2DEB1-153D-44D8-BB2A-5A66586EC081",
                     NotificationType.HearingConfirmationJudgeMultiDay, MessageType.Email,
-                    "case name,case number,judge,Start Day Month Year,time,number of days,courtroom account username,account password",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,judge,Start Day Month Year,time,number of days,courtroom account username,account password")
             },
             {
-                new Template(new Guid("1A2D5C41-C37F-41F7-8B96-9B7EAAF2AF3F"),
+                CreateTemplate("1A2D5C41-C37F-41F7-8B96-9B7EAAF2AF3F",
                     NotificationType.HearingConfirmationJohMultiDay, MessageType.Email,
-                    "case name,case number,judicial office holder,Start Day Month Year,time,number of days,time",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,judicial office holder,Start Day Month Year,time,number of days,time")
             },
             {
-                new Template(new Guid("2B9514BE-29AA-4CAA-A6D1-94A58D8CED8F"),
+                CreateTemplate("2B9514BE-29AA-4CAA-A6D1-94A58D8CED8F",
                     NotificationType.HearingConfirmationLipMultiDay, MessageType.Email,
-                    "case name,case number,name,Start Day Month Year,time,number of days,time", DateTime.UtcNow,
-                    DateTime.UtcNow)
+                    "case name,case number,name,Start Day Month Year,time,number of days,time")
             },
             {
-                new Template(new Guid("A330590B-06ED-45EF-9087-FA6E089A7542"),
+                CreateTemplate("A330590B-06ED-45EF-9087-FA6E089A7542",
                     NotificationType.HearingConfirmationRepresentativeMultiDay, MessageType.Email,
-                    "case name,case number,client name,solicitor name,Start Day Month Year,time,number of days,time",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,client name,solicitor name,Start Day Month Year,time,number of days,time")
             },
             {
-                new Template(new Guid("B623B2EA-90AC-473A-84DF-633148672FAC"),
+                CreateTemplate("B623B2EA-90AC-473A-84DF-633148672FAC",
                     NotificationType.HearingConfirmationEJudJudge, MessageType.Email,
-                    "case name,case number,judge,day month year,time", DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,judge,day month year,time")
             },
             {
-                new Template(new Guid("8EFA06A3-3CB5-4982-B75B-6E5A2C586F48"),
+                CreateTemplate("8EFA06A3-3CB5-4982-B75B-6E5A2C586F48",
                     NotificationType.HearingConfirmationEJudJudgeMultiDay, MessageType.Email,
-                    "case name,case number,judge,Start Day Month Year,time,number of days", DateTime.UtcNow,
-                    DateTime.UtcNow)
+                    "case name,case number,judge,Start Day Month Year,time,number of days")
             },
             {
-                new Template(new Guid("D469C281-C7A7-47DD-A28C-B1BBD1260515"),
+                CreateTemplate("D469C281-C7A7-47DD-A28C-B1BBD1260515",
                     NotificationType.HearingAmendmentEJudJudge, MessageType.Email,
-                    "case name,case number,judge,New Day Month Year,Old Day Month Year,New time,Old time",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,judge,New Day Month Year,Old Day Month Year,New time,Old time")
             },
             {
-                new Template(new Guid("0DA28BBF-3A0B-47E7-B034-5A1753B21254"), NotificationType.HearingAmendmentEJudJoh,
-                    MessageType.Email, "case name,case number,judicial office holder,day month year,time",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("0DA28BBF-3A0B-47E7-B034-5A1753B21254", NotificationType.HearingAmendmentEJudJoh,
+                    MessageType.Email, "case name,case number,judicial office holder,day month year,time")
             },
             {
-                new Template(new Guid("67210F08-CB4D-428C-9308-48CB75CDA0C3"), NotificationType.HearingReminderEJudJoh,
-                    MessageType.Email, "case name,case number,judicial office holder,day month year,time",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("67210F08-CB4D-428C-9308-48CB75CDA0C3", NotificationType.HearingReminderEJudJoh,
+                    MessageType.Email, "case name,case number,judicial office holder,day month year,time")
             },
             {
-                new Template(new Guid("394D70EC-AFF4-40F4-A205-2A96FDEB0248"),
+                CreateTemplate("394D70EC-AFF4-40F4-A205-2A96FDEB0248",
                     NotificationType.HearingConfirmationEJudJoh, MessageType.Email,
-                    "case name,case number,judicial office holder,day month year,time", DateTime.UtcNow,
-                    DateTime.UtcNow)
+                    "case name,case number,judicial office holder,day month year,time")
             },
             {
-                new Template(new Guid("A2A87317-9B0E-4D65-9CA5-9A9189EB986C"),
+                CreateTemplate("A2A87317-9B0E-4D65-9CA5-9A9189EB986C",
                     NotificationType.HearingConfirmationEJudJohMultiDay, MessageType.Email,
-                    "case name,case number,judicial office holder,Start Day Month Year,time,number of days",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,judicial office holder,Start Day Month Year,time,number of days")
             },
             {
-                new Template(new Guid("7AC81033-D0F0-4165-9797-85FDD5A11FA0"), NotificationType.EJudJohDemoOrTest,
-                    MessageType.Email, "case number,test type,judicial office holder,username,date,time",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("7AC81033-D0F0-4165-9797-85FDD5A11FA0", NotificationType.EJudJohDemoOrTest,
+                    MessageType.Email, "case number,test type,judicial office holder,username,date,time")
             },
             {
-                new Template(new Guid("AD0E8AD1-C9C2-4E5B-83DA-4719DC6DE613"), NotificationType.ParticipantDemoOrTest,
-                    MessageType.Email, "test type,case number,date,name,username,time", DateTime.UtcNow,
-                    DateTime.UtcNow)
+                CreateTemplate("AD0E8AD1-C9C2-4E5B-83DA-4719DC6DE613", NotificationType.ParticipantDemoOrTest,
+                    MessageType.Email, "test type,case number,date,name,username,time")
             },
             {
-                new Template(new Guid("4E72CBE8-F54F-4039-834C-F325C4E946E9"), NotificationType.EJudJudgeDemoOrTest,
-                    MessageType.Email, "test type,date,time,case number,Judge", DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("4E72CBE8-F54F-4039-834C-F325C4E946E9", NotificationType.EJudJudgeDemoOrTest,
+                    MessageType.Email, "test type,date,time,case number,Judge")
             },
             {
-                new Template(new Guid("0D85126D-5A33-4E2A-8F34-C017EC48FC53"), NotificationType.JudgeDemoOrTest,
-                    MessageType.Email, "test type,date,time,case number,Judge,courtroom account username",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("0D85126D-5A33-4E2A-8F34-C017EC48FC53", NotificationType.JudgeDemoOrTest,
+                    MessageType.Email, "test type,date,time,case number,Judge,courtroom account username")
             },
             {
-                new Template(new Guid("DB6AA43E-9B68-4622-B636-3C89EBD693DC"),
+                CreateTemplate("DB6AA43E-9B68-4622-B636-3C89EBD693DC",
                     NotificationType.TelephoneHearingConfirmation, MessageType.Email,
-                    "case name,case number,name,day month year,time", DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,name,day month year,time")
             },
             {
-                new Template(new Guid("E3AFA6DB-AC02-4724-82B2-2F975CE381A3"),
+                CreateTemplate("E3AFA6DB-AC02-4724-82B2-2F975CE381A3",
                     NotificationType.TelephoneHearingConfirmationMultiDay, MessageType.Email,
-                    "case name,case number,name,day month year,time,number of days", DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,name,day month year,time,number of days")
             },
             {
-                new Template(new Guid("74DFCF02-7BBD-4E56-AC4D-805A503107F6"), NotificationType.CreateStaffMember,
-                    MessageType.Email, "Name,Username,Password", DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("74DFCF02-7BBD-4E56-AC4D-805A503107F6", NotificationType.CreateStaffMember,
+                    MessageType.Email, "Name,Username,Password")
             },
             {
-                new Template(new Guid("EA46CCD0-5EFF-4F99-AA1A-094A66B18ADE"),
+                CreateTemplate("EA46CCD0-5EFF-4F99-AA1A-094A66B18ADE",
                     NotificationType.HearingAmendmentStaffMember, MessageType.Email,
-                    "case name,case number,staff member,New Day Month Year,Old Day Month Year,New time,Old time",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,staff member,New Day Month Year,Old Day Month Year,New time,Old time")
             },
             {
-                new Template(new Guid("8EF4D46C-CDB6-4C09-88BA-F33E0C89478A"),
+                CreateTemplate("8EF4D46C-CDB6-4C09-88BA-F33E0C89478A",
                     NotificationType.HearingConfirmationStaffMember, MessageType.Email,
-                    "case name,case number,staff member,day month year,time,username", DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,staff member,day month year,time,username")
             },
             {
-                new Template(new Guid("B4C960C8-144C-49E2-B9E4-601F12ED6A79"),
+                CreateTemplate("B4C960C8-144C-49E2-B9E4-601F12ED6A79",
                     NotificationType.HearingConfirmationStaffMemberMultiDay, MessageType.Email,
-                    "case name,case number,staff member,Start Day Month Year,time,number of days,username",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,staff member,Start Day Month Year,time,number of days,username")
             },
             {
-                new Template(new Guid("F6023ACA-B9BE-4CF0-9D88-078A7BCC9B98"), NotificationType.StaffMemberDemoOrTest,
-                    MessageType.Email, "test type,date,time,case number,staff member", DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("F6023ACA-B9BE-4CF0-9D88-078A7BCC9B98", NotificationType.StaffMemberDemoOrTest,
+                    MessageType.Email, "test type,date,time,case number,staff member")
             },
             {
-                new Template(new Guid("468DA234-9602-4759-895B-248329EDE20E"), NotificationType.NewHearingReminderLIP,
-                    MessageType.Email, "case name, case number, name, day month year, time, username", DateTime.UtcNow,
-                    DateTime.UtcNow)
+                CreateTemplate("468DA234-9602-4759-895B-248329EDE20E", NotificationType.NewHearingReminderLIP,
+                    MessageType.Email, "case name, case number, name, day month year, time, username")
             },
             {
-                new Template(new Guid("D0145ADE-2EC7-4FDF-A5B8-4C85318BDF36"),
+                CreateTemplate("D0145ADE-2EC7-4FDF-A5B8-4C85318BDF36",
                     NotificationType.NewHearingReminderRepresentative, MessageType.Email,
-                    "case name, case number, client name, solicitor name, day month year, time, username",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name, case number, client name, solicitor name, day month year, time, username")
             },
             {
-                new Template(new Guid("33DB272D-D961-4596-AFC0-C19B109D390B"), NotificationType.NewHearingReminderJOH,
-                    MessageType.Email, "case name, case number, judicial office holder, day month year, time, username",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("33DB272D-D961-4596-AFC0-C19B109D390B", NotificationType.NewHearingReminderJOH,
+                    MessageType.Email, CASE_NAME__CASE_NUMBER__JUDICIAL_OFFICE_HOLDER__DAY_MONTH_YEAR__TIME__USERNAME)
             },
             {
-                new Template(new Guid("62d3105b-d746-4b06-9cf3-c43b507682f1"),NotificationType.NewHearingReminderEJUD,
-                MessageType.Email,"case name, case number, judicial office holder, day month year, time, username",
-                DateTime.UtcNow,DateTime.UtcNow )
+                CreateTemplate("62d3105b-d746-4b06-9cf3-c43b507682f1", NotificationType.NewHearingReminderEJUD,
+                    MessageType.Email, CASE_NAME__CASE_NUMBER__JUDICIAL_OFFICE_HOLDER__DAY_MONTH_YEAR__TIME__USERNAME)
             },
         };
 
         private readonly IList<Template> _sourceTemplatesDemo = new List<Template>()
         {
             {
-                new Template(new Guid("6CF6266A-385C-4DD7-9AAE-EF79B7E7E8A0"), NotificationType.CreateIndividual,
-                    MessageType.Email, "name,username,random password", DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("6CF6266A-385C-4DD7-9AAE-EF79B7E7E8A0", NotificationType.CreateIndividual,
+                    MessageType.Email, "name,username,random password")
             },
             {
-                new Template(new Guid("0A916EC6-B361-48B9-8244-BDCFBE6C85D2"), NotificationType.CreateRepresentative,
-                    MessageType.Email, "name,username,random password", DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("0A916EC6-B361-48B9-8244-BDCFBE6C85D2", NotificationType.CreateRepresentative,
+                    MessageType.Email, "name,username,random password")
             },
             {
-                new Template(new Guid("DCE5A91D-EB1A-4765-B42A-A6FCE5CDE264"), NotificationType.PasswordReset,
-                    MessageType.Email, "name,password", DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("DCE5A91D-EB1A-4765-B42A-A6FCE5CDE264", NotificationType.PasswordReset,
+                    MessageType.Email, "name,password")
             },
             {
-                new Template(new Guid("3B878842-3D0B-4535-B244-C7B8740752D2"),
+                CreateTemplate("3B878842-3D0B-4535-B244-C7B8740752D2",
                     NotificationType.HearingConfirmationJudge, MessageType.Email,
-                    "case name,case number,judge,day month year,time,courtroom account username,account password",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,judge,day month year,time,courtroom account username,account password")
             },
             {
-                new Template(new Guid("119227B1-5A8E-421B-942C-4CE259D0AA21"), NotificationType.HearingConfirmationJoh,
-                    MessageType.Email, "case name,case number,judicial office holder,Day Month Year,time",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("119227B1-5A8E-421B-942C-4CE259D0AA21", NotificationType.HearingConfirmationJoh,
+                    MessageType.Email, "case name,case number,judicial office holder,Day Month Year,time")
             },
             {
-                new Template(new Guid("1CFA6F87-4DD8-4BDD-AFBE-E6128163BA48"), NotificationType.HearingConfirmationLip,
-                    MessageType.Email, "case name,case number,name,Day Month Year,time", DateTime.UtcNow,
-                    DateTime.UtcNow)
+                CreateTemplate("1CFA6F87-4DD8-4BDD-AFBE-E6128163BA48", NotificationType.HearingConfirmationLip,
+                    MessageType.Email, "case name,case number,name,Day Month Year,time")
             },
             {
-                new Template(new Guid("2B235C52-A283-4255-89AF-48EB92BE392B"),
+                CreateTemplate("2B235C52-A283-4255-89AF-48EB92BE392B",
                     NotificationType.HearingConfirmationRepresentative, MessageType.Email,
-                    "case name,case number,client name,solicitor name,Day Month Year,time", DateTime.UtcNow,
-                    DateTime.UtcNow)
+                    "case name,case number,client name,solicitor name,Day Month Year,time")
             },
             {
-                new Template(new Guid("6ACEA005-8017-4613-A8AF-3DE07A795F95"), NotificationType.HearingReminderJoh,
-                    MessageType.Email, "case name,case number,judicial office holder,day month year,time,username",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("6ACEA005-8017-4613-A8AF-3DE07A795F95", NotificationType.HearingReminderJoh,
+                    MessageType.Email, "case name,case number,judicial office holder,day month year,time,username")
             },
             {
-                new Template(new Guid("E9DC6393-5F37-4029-B5A0-C8DC2B8BB592"), NotificationType.HearingReminderLip,
-                    MessageType.Email, "case name,case number,name,day month year,time,username", DateTime.UtcNow,
-                    DateTime.UtcNow)
+                CreateTemplate("E9DC6393-5F37-4029-B5A0-C8DC2B8BB592", NotificationType.HearingReminderLip,
+                    MessageType.Email, "case name,case number,name,day month year,time,username")
             },
             {
-                new Template(new Guid("7D38527C-626B-4567-8E8B-6D84217E9E35"),
+                CreateTemplate("7D38527C-626B-4567-8E8B-6D84217E9E35",
                     NotificationType.HearingReminderRepresentative, MessageType.Email,
-                    "case name,case number,client name,solicitor name,day month year,time,username", DateTime.UtcNow,
-                    DateTime.UtcNow)
+                    "case name,case number,client name,solicitor name,day month year,time,username")
             },
             {
-                new Template(new Guid("9244C5C8-0180-4682-BE7B-C651D8EEBD9C"), NotificationType.HearingAmendmentJudge,
+                CreateTemplate("9244C5C8-0180-4682-BE7B-C651D8EEBD9C", NotificationType.HearingAmendmentJudge,
                     MessageType.Email,
-                    "case name,case number,judge,New Day Month Year,Old Day Month Year,New time,Old time,courtroom account username,account password",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,judge,New Day Month Year,Old Day Month Year,New time,Old time,courtroom account username,account password")
             },
             {
-                new Template(new Guid("C46102FB-7B81-4FD1-90F5-CF3FAF07B7FC"), NotificationType.HearingAmendmentJoh,
+                CreateTemplate("C46102FB-7B81-4FD1-90F5-CF3FAF07B7FC", NotificationType.HearingAmendmentJoh,
                     MessageType.Email,
-                    "case name,case number,judicial office holder,New Day Month Year,Old Day Month Year,New time,Old time,courtroom account username,account password",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,judicial office holder,New Day Month Year,Old Day Month Year,New time,Old time,courtroom account username,account password")
             },
             {
-                new Template(new Guid("4C5A123F-98D3-46ED-9679-4F2149C213AC"), NotificationType.HearingAmendmentLip,
+                CreateTemplate("4C5A123F-98D3-46ED-9679-4F2149C213AC", NotificationType.HearingAmendmentLip,
                     MessageType.Email,
-                    "case name,case number,name,New Day Month Year,Old Day Month Year,New time,Old time,courtroom account username,account password",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,name,New Day Month Year,Old Day Month Year,New time,Old time,courtroom account username,account password")
             },
             {
-                new Template(new Guid("A0523641-83B5-490E-B3E5-C057DC8157E9"),
+                CreateTemplate("A0523641-83B5-490E-B3E5-C057DC8157E9",
                     NotificationType.HearingAmendmentRepresentative, MessageType.Email,
-                    "case name,case number,client name,solicitor name,New Day Month Year,Old Day Month Year,New time,Old time,courtroom account username,account password",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,client name,solicitor name,New Day Month Year,Old Day Month Year,New time,Old time,courtroom account username,account password")
             },
             {
-                new Template(new Guid("70233D81-374A-4979-9D20-979EA0FB16C7"),
+                CreateTemplate("70233D81-374A-4979-9D20-979EA0FB16C7",
                     NotificationType.HearingConfirmationJudgeMultiDay, MessageType.Email,
-                    "case name,case number,judge,Start Day Month Year,time,number of days,courtroom account username,account password",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,judge,Start Day Month Year,time,number of days,courtroom account username,account password")
             },
             {
-                new Template(new Guid("A86F4664-7522-4D69-8211-20160C7CAEFC"),
+                CreateTemplate("A86F4664-7522-4D69-8211-20160C7CAEFC",
                     NotificationType.HearingConfirmationJohMultiDay, MessageType.Email,
-                    "case name,case number,judicial office holder,Start Day Month Year,time,number of days,time",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,judicial office holder,Start Day Month Year,time,number of days,time")
             },
             {
-                new Template(new Guid("377D144E-71E2-454C-AFDB-DA7CF20D5EFA"),
+                CreateTemplate("377D144E-71E2-454C-AFDB-DA7CF20D5EFA",
                     NotificationType.HearingConfirmationLipMultiDay, MessageType.Email,
-                    "case name,case number,name,Start Day Month Year,time,number of days,time", DateTime.UtcNow,
-                    DateTime.UtcNow)
+                    "case name,case number,name,Start Day Month Year,time,number of days,time")
             },
             {
-                new Template(new Guid("466F5E42-FFDE-49D5-9560-0D4EE1A41CC5"),
+                CreateTemplate("466F5E42-FFDE-49D5-9560-0D4EE1A41CC5",
                     NotificationType.HearingConfirmationRepresentativeMultiDay, MessageType.Email,
-                    "case name,case number,client name,solicitor name,Start Day Month Year,time,number of days,time",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,client name,solicitor name,Start Day Month Year,time,number of days,time")
             },
             {
-                new Template(new Guid("736D0A34-2C73-4EF7-B81F-E5E54C1AD643"),
+                CreateTemplate("736D0A34-2C73-4EF7-B81F-E5E54C1AD643",
                     NotificationType.HearingConfirmationEJudJudge, MessageType.Email,
-                    "case name,case number,judge,day month year,time", DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,judge,day month year,time")
             },
             {
-                new Template(new Guid("281AE9B9-5AD9-41E4-9F65-13BCB1AD503C"),
+                CreateTemplate("281AE9B9-5AD9-41E4-9F65-13BCB1AD503C",
                     NotificationType.HearingConfirmationEJudJudgeMultiDay, MessageType.Email,
-                    "case name,case number,judge,Start Day Month Year,time,number of days", DateTime.UtcNow,
-                    DateTime.UtcNow)
+                    "case name,case number,judge,Start Day Month Year,time,number of days")
             },
             {
-                new Template(new Guid("46139247-0115-43FF-AB5C-80C9313185C2"),
+                CreateTemplate("46139247-0115-43FF-AB5C-80C9313185C2",
                     NotificationType.HearingAmendmentEJudJudge, MessageType.Email,
-                    "case name,case number,judge,New Day Month Year,Old Day Month Year,New time,Old time",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,judge,New Day Month Year,Old Day Month Year,New time,Old time")
             },
             {
-                new Template(new Guid("8EB038AB-8AAF-4283-88DE-763013D8DC27"), NotificationType.HearingAmendmentEJudJoh,
-                    MessageType.Email, "case name,case number,judicial office holder,day month year,time",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("8EB038AB-8AAF-4283-88DE-763013D8DC27", NotificationType.HearingAmendmentEJudJoh,
+                    MessageType.Email, "case name,case number,judicial office holder,day month year,time")
             },
             {
-                new Template(new Guid("A42091EC-8212-49E4-9F6E-FC3F30DF70AB"), NotificationType.HearingReminderEJudJoh,
-                    MessageType.Email, "case name,case number,judicial office holder,day month year,time",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("A42091EC-8212-49E4-9F6E-FC3F30DF70AB", NotificationType.HearingReminderEJudJoh,
+                    MessageType.Email, "case name,case number,judicial office holder,day month year,time")
             },
             {
-                new Template(new Guid("E9B4F5DE-9885-43F4-9634-08E547E07586"),
+                CreateTemplate("E9B4F5DE-9885-43F4-9634-08E547E07586",
                     NotificationType.HearingConfirmationEJudJoh, MessageType.Email,
-                    "case name,case number,judicial office holder,day month year,time", DateTime.UtcNow,
-                    DateTime.UtcNow)
+                    "case name,case number,judicial office holder,day month year,time")
             },
             {
-                new Template(new Guid("38BF640A-5C9A-4029-A0FC-3C249A305789"),
+                CreateTemplate("38BF640A-5C9A-4029-A0FC-3C249A305789",
                     NotificationType.HearingConfirmationEJudJohMultiDay, MessageType.Email,
-                    "case name,case number,judicial office holder,Start Day Month Year,time,number of days",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,judicial office holder,Start Day Month Year,time,number of days")
             },
             {
-                new Template(new Guid("5A363017-69CF-416E-AB52-4C54CB11E3FF"), NotificationType.EJudJohDemoOrTest,
-                    MessageType.Email, "case number,test type,judicial office holder,username,date,time",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("5A363017-69CF-416E-AB52-4C54CB11E3FF", NotificationType.EJudJohDemoOrTest,
+                    MessageType.Email, "case number,test type,judicial office holder,username,date,time")
             },
             {
-                new Template(new Guid("2BAD84BF-D3AB-4B89-A552-2D941E24FB77"), NotificationType.ParticipantDemoOrTest,
-                    MessageType.Email, "test type,case number,date,name,username,time", DateTime.UtcNow,
-                    DateTime.UtcNow)
+                CreateTemplate("2BAD84BF-D3AB-4B89-A552-2D941E24FB77", NotificationType.ParticipantDemoOrTest,
+                    MessageType.Email, "test type,case number,date,name,username,time")
             },
             {
-                new Template(new Guid("C079F4C6-C2BB-45E7-B085-A302194FDE02"), NotificationType.EJudJudgeDemoOrTest,
-                    MessageType.Email, "test type,date,time,case number,Judge", DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("C079F4C6-C2BB-45E7-B085-A302194FDE02", NotificationType.EJudJudgeDemoOrTest,
+                    MessageType.Email, "test type,date,time,case number,Judge")
             },
             {
-                new Template(new Guid("DBE13771-E98E-47B1-B579-85E7A111A249"), NotificationType.JudgeDemoOrTest,
-                    MessageType.Email, "test type,date,time,case number,Judge,courtroom account username",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("DBE13771-E98E-47B1-B579-85E7A111A249", NotificationType.JudgeDemoOrTest,
+                    MessageType.Email, "test type,date,time,case number,Judge,courtroom account username")
             },
             {
-                new Template(new Guid("680D7CE6-6B14-45E2-AA17-AD11F2701AC0"),
+                CreateTemplate("680D7CE6-6B14-45E2-AA17-AD11F2701AC0",
                     NotificationType.TelephoneHearingConfirmation, MessageType.Email,
-                    "case name,case number,name,day month year,time", DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,name,day month year,time")
             },
             {
-                new Template(new Guid("CAF7D73E-8AE3-4878-B65F-E13E5FDE13E3"),
+                CreateTemplate("CAF7D73E-8AE3-4878-B65F-E13E5FDE13E3",
                     NotificationType.TelephoneHearingConfirmationMultiDay, MessageType.Email,
-                    "case name,case number,name,day month year,time,number of days", DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,name,day month year,time,number of days")
             },
             {
-                new Template(new Guid("D668FF24-88CF-48F4-ABEF-EA088A52D7C2"), NotificationType.CreateStaffMember,
-                    MessageType.Email, "Name,Username,Password", DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("D668FF24-88CF-48F4-ABEF-EA088A52D7C2", NotificationType.CreateStaffMember,
+                    MessageType.Email, "Name,Username,Password")
             },
             {
-                new Template(new Guid("81120F81-5D83-4D75-B593-8ED0FFB22E96"),
+                CreateTemplate("81120F81-5D83-4D75-B593-8ED0FFB22E96",
                     NotificationType.HearingAmendmentStaffMember, MessageType.Email,
-                    "case name,case number,staff member,New Day Month Year,Old Day Month Year,New time,Old time",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,staff member,New Day Month Year,Old Day Month Year,New time,Old time")
             },
             {
-                new Template(new Guid("6FCB4FE4-6FBB-4EE4-ACE9-84BD0354AA8D"),
+                CreateTemplate("6FCB4FE4-6FBB-4EE4-ACE9-84BD0354AA8D",
                     NotificationType.HearingConfirmationStaffMember, MessageType.Email,
-                    "case name,case number,staff member,day month year,time,username", DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,staff member,day month year,time,username")
             },
             {
-                new Template(new Guid("FCAA9930-57F3-445A-AF8F-18588B58D901"),
+                CreateTemplate("FCAA9930-57F3-445A-AF8F-18588B58D901",
                     NotificationType.HearingConfirmationStaffMemberMultiDay, MessageType.Email,
-                    "case name,case number,staff member,Start Day Month Year,time,number of days,username",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,staff member,Start Day Month Year,time,number of days,username")
             },
             {
-                new Template(new Guid("8936925C-5BB6-4723-AC77-2F10DC2A3E1E"), NotificationType.StaffMemberDemoOrTest,
-                    MessageType.Email, "test type,date,time,case number,staff member", DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("8936925C-5BB6-4723-AC77-2F10DC2A3E1E", NotificationType.StaffMemberDemoOrTest,
+                    MessageType.Email, "test type,date,time,case number,staff member")
             },
             {
-                new Template(new Guid("a70bf7d6-d5b2-41bd-8bc0-a2193287887b"), NotificationType.NewHearingReminderLIP,
-                    MessageType.Email, "case name, case number, name, day month year, time, username", DateTime.UtcNow,
-                    DateTime.UtcNow)
+                CreateTemplate("a70bf7d6-d5b2-41bd-8bc0-a2193287887b", NotificationType.NewHearingReminderLIP,
+                    MessageType.Email, "case name, case number, name, day month year, time, username")
             },
             {
-                new Template(new Guid("972b8de5-455a-409c-a839-81dae8edf984"),
+                CreateTemplate("972b8de5-455a-409c-a839-81dae8edf984",
                     NotificationType.NewHearingReminderRepresentative, MessageType.Email,
-                    "case name, case number, client name, solicitor name, day month year, time, username",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name, case number, client name, solicitor name, day month year, time, username")
             },
             {
-                new Template(new Guid("3f8359da-d714-4bf3-ba16-4ecf09d11895"), NotificationType.NewHearingReminderJOH,
-                    MessageType.Email, "case name, case number, judicial office holder, day month year, time, username",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("3f8359da-d714-4bf3-ba16-4ecf09d11895", NotificationType.NewHearingReminderJOH,
+                    MessageType.Email, CASE_NAME__CASE_NUMBER__JUDICIAL_OFFICE_HOLDER__DAY_MONTH_YEAR__TIME__USERNAME)
             },
             {
-                new Template(new Guid("cd49e07f-419e-4d1f-9904-6f1f8e9f2ce5"),NotificationType.NewHearingReminderEJUD,
-                MessageType.Email,"case name, case number, judicial office holder, day month year, time, username",
-                DateTime.UtcNow,DateTime.UtcNow )
+                CreateTemplate("cd49e07f-419e-4d1f-9904-6f1f8e9f2ce5", NotificationType.NewHearingReminderEJUD,
+                    MessageType.Email, CASE_NAME__CASE_NUMBER__JUDICIAL_OFFICE_HOLDER__DAY_MONTH_YEAR__TIME__USERNAME)
             },
         };
 
         private readonly IList<Template> _sourceTemplatesPreProd = new List<Template>()
         {
             {
-                new Template(new Guid("2AF71CB4-C74D-4614-97E2-6ACC82AF4AD9"), NotificationType.CreateIndividual,
-                    MessageType.Email, "name,username,random password", DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("2AF71CB4-C74D-4614-97E2-6ACC82AF4AD9", NotificationType.CreateIndividual,
+                    MessageType.Email, "name,username,random password")
             },
             {
-                new Template(new Guid("0A88256A-78E8-45BA-BD9B-A3EA6096A189"), NotificationType.CreateRepresentative,
-                    MessageType.Email, "name,username,random password", DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("0A88256A-78E8-45BA-BD9B-A3EA6096A189", NotificationType.CreateRepresentative,
+                    MessageType.Email, "name,username,random password")
             },
             {
-                new Template(new Guid("9F1EE9C2-6FB5-4B0C-9067-6C4969EF49EC"), NotificationType.PasswordReset,
-                    MessageType.Email, "name,password", DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("9F1EE9C2-6FB5-4B0C-9067-6C4969EF49EC", NotificationType.PasswordReset,
+                    MessageType.Email, "name,password")
             },
             {
-                new Template(new Guid("390AD497-4737-48E4-A2BD-0370F9B0EE78"),
+                CreateTemplate("390AD497-4737-48E4-A2BD-0370F9B0EE78",
                     NotificationType.HearingConfirmationJudge, MessageType.Email,
-                    "case name,case number,judge,day month year,time,courtroom account username,account password",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,judge,day month year,time,courtroom account username,account password")
             },
             {
-                new Template(new Guid("7E5B7416-012B-4C26-B5FF-E218B29916B5"), NotificationType.HearingConfirmationJoh,
-                    MessageType.Email, "case name,case number,judicial office holder,Day Month Year,time",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("7E5B7416-012B-4C26-B5FF-E218B29916B5", NotificationType.HearingConfirmationJoh,
+                    MessageType.Email, "case name,case number,judicial office holder,Day Month Year,time")
             },
             {
-                new Template(new Guid("37E0BD31-CB80-421A-86BD-2DB2613D9D9B"), NotificationType.HearingConfirmationLip,
-                    MessageType.Email, "case name,case number,name,Day Month Year,time", DateTime.UtcNow,
-                    DateTime.UtcNow)
+                CreateTemplate("37E0BD31-CB80-421A-86BD-2DB2613D9D9B", NotificationType.HearingConfirmationLip,
+                    MessageType.Email, "case name,case number,name,Day Month Year,time")
             },
             {
-                new Template(new Guid("246098B2-D17D-44E9-84FC-C460ED68EC77"),
+                CreateTemplate("246098B2-D17D-44E9-84FC-C460ED68EC77",
                     NotificationType.HearingConfirmationRepresentative, MessageType.Email,
-                    "case name,case number,client name,solicitor name,Day Month Year,time", DateTime.UtcNow,
-                    DateTime.UtcNow)
+                    "case name,case number,client name,solicitor name,Day Month Year,time")
             },
             {
-                new Template(new Guid("171B21E6-792A-48BD-886E-6BF5E73967B3"), NotificationType.HearingReminderJoh,
-                    MessageType.Email, "case name,case number,judicial office holder,day month year,time,username",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("171B21E6-792A-48BD-886E-6BF5E73967B3", NotificationType.HearingReminderJoh,
+                    MessageType.Email, "case name,case number,judicial office holder,day month year,time,username")
             },
             {
-                new Template(new Guid("AD9FFDBE-C23A-4498-AD7F-ACD96098397F"), NotificationType.HearingReminderLip,
-                    MessageType.Email, "case name,case number,name,day month year,time,username", DateTime.UtcNow,
-                    DateTime.UtcNow)
+                CreateTemplate("AD9FFDBE-C23A-4498-AD7F-ACD96098397F", NotificationType.HearingReminderLip,
+                    MessageType.Email, "case name,case number,name,day month year,time,username")
             },
             {
-                new Template(new Guid("2F2D6F89-5BC2-42D7-BA9E-54CCF8FC3DAE"),
+                CreateTemplate("2F2D6F89-5BC2-42D7-BA9E-54CCF8FC3DAE",
                     NotificationType.HearingReminderRepresentative, MessageType.Email,
-                    "case name,case number,client name,solicitor name,day month year,time,username", DateTime.UtcNow,
-                    DateTime.UtcNow)
+                    "case name,case number,client name,solicitor name,day month year,time,username")
             },
             {
-                new Template(new Guid("280E7109-66B7-4F75-B270-47BB715737DF"), NotificationType.HearingAmendmentJudge,
+                CreateTemplate("280E7109-66B7-4F75-B270-47BB715737DF", NotificationType.HearingAmendmentJudge,
                     MessageType.Email,
-                    "case name,case number,judge,New Day Month Year,Old Day Month Year,New time,Old time,courtroom account username,account password",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,judge,New Day Month Year,Old Day Month Year,New time,Old time,courtroom account username,account password")
             },
             {
-                new Template(new Guid("A5404D6D-7535-4589-9670-57D789127B86"), NotificationType.HearingAmendmentJoh,
+                CreateTemplate("A5404D6D-7535-4589-9670-57D789127B86", NotificationType.HearingAmendmentJoh,
                     MessageType.Email,
-                    "case name,case number,judicial office holder,New Day Month Year,Old Day Month Year,New time,Old time,courtroom account username,account password",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,judicial office holder,New Day Month Year,Old Day Month Year,New time,Old time,courtroom account username,account password")
             },
             {
-                new Template(new Guid("65BF22BF-1B76-496F-8961-6E86C228FDF6"), NotificationType.HearingAmendmentLip,
+                CreateTemplate("65BF22BF-1B76-496F-8961-6E86C228FDF6", NotificationType.HearingAmendmentLip,
                     MessageType.Email,
-                    "case name,case number,name,New Day Month Year,Old Day Month Year,New time,Old time,courtroom account username,account password",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,name,New Day Month Year,Old Day Month Year,New time,Old time,courtroom account username,account password")
             },
             {
-                new Template(new Guid("1219A560-D3B0-4F7B-BF0B-E74DA0960CFB"),
+                CreateTemplate("1219A560-D3B0-4F7B-BF0B-E74DA0960CFB",
                     NotificationType.HearingAmendmentRepresentative, MessageType.Email,
-                    "case name,case number,client name,solicitor name,New Day Month Year,Old Day Month Year,New time,Old time,courtroom account username,account password",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,client name,solicitor name,New Day Month Year,Old Day Month Year,New time,Old time,courtroom account username,account password")
             },
             {
-                new Template(new Guid("0961EE8B-193F-4308-8431-64C84CA1AB7E"),
+                CreateTemplate("0961EE8B-193F-4308-8431-64C84CA1AB7E",
                     NotificationType.HearingConfirmationJudgeMultiDay, MessageType.Email,
-                    "case name,case number,judge,Start Day Month Year,time,number of days,courtroom account username,account password",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,judge,Start Day Month Year,time,number of days,courtroom account username,account password")
             },
             {
-                new Template(new Guid("CD0F5B6B-D01B-4E95-B9DF-4CE3E7A6999E"),
+                CreateTemplate("CD0F5B6B-D01B-4E95-B9DF-4CE3E7A6999E",
                     NotificationType.HearingConfirmationJohMultiDay, MessageType.Email,
-                    "case name,case number,judicial office holder,Start Day Month Year,time,number of days,time",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,judicial office holder,Start Day Month Year,time,number of days,time")
             },
             {
-                new Template(new Guid("EF40725E-2DB4-46EC-B943-5BA909899595"),
+                CreateTemplate("EF40725E-2DB4-46EC-B943-5BA909899595",
                     NotificationType.HearingConfirmationLipMultiDay, MessageType.Email,
-                    "case name,case number,name,Start Day Month Year,time,number of days,time", DateTime.UtcNow,
-                    DateTime.UtcNow)
+                    "case name,case number,name,Start Day Month Year,time,number of days,time")
             },
             {
-                new Template(new Guid("B5E43298-466C-4613-B0DA-25A8639F1FB7"),
+                CreateTemplate("B5E43298-466C-4613-B0DA-25A8639F1FB7",
                     NotificationType.HearingConfirmationRepresentativeMultiDay, MessageType.Email,
-                    "case name,case number,client name,solicitor name,Start Day Month Year,time,number of days,time",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,client name,solicitor name,Start Day Month Year,time,number of days,time")
             },
             {
-                new Template(new Guid("471DAA4A-6284-4AA3-903F-BCDE8FB470FA"),
+                CreateTemplate("471DAA4A-6284-4AA3-903F-BCDE8FB470FA",
                     NotificationType.HearingConfirmationEJudJudge, MessageType.Email,
-                    "case name,case number,judge,day month year,time", DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,judge,day month year,time")
             },
             {
-                new Template(new Guid("5F54F783-6409-4B55-AA5A-7E53AD8D9122"),
+                CreateTemplate("5F54F783-6409-4B55-AA5A-7E53AD8D9122",
                     NotificationType.HearingConfirmationEJudJudgeMultiDay, MessageType.Email,
-                    "case name,case number,judge,Start Day Month Year,time,number of days", DateTime.UtcNow,
-                    DateTime.UtcNow)
+                    "case name,case number,judge,Start Day Month Year,time,number of days")
             },
             {
-                new Template(new Guid("5D952C10-D0C9-47A2-BF60-B4E4205BA550"),
+                CreateTemplate("5D952C10-D0C9-47A2-BF60-B4E4205BA550",
                     NotificationType.HearingAmendmentEJudJudge, MessageType.Email,
-                    "case name,case number,judge,New Day Month Year,Old Day Month Year,New time,Old time",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,judge,New Day Month Year,Old Day Month Year,New time,Old time")
             },
             {
-                new Template(new Guid("3629DC8A-3CBB-441F-B8E3-27B07308437C"), NotificationType.HearingAmendmentEJudJoh,
-                    MessageType.Email, "case name,case number,judicial office holder,day month year,time",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("3629DC8A-3CBB-441F-B8E3-27B07308437C", NotificationType.HearingAmendmentEJudJoh,
+                    MessageType.Email, "case name,case number,judicial office holder,day month year,time")
             },
             {
-                new Template(new Guid("F3E4851D-CC60-4405-A8CC-233C069D1736"), NotificationType.HearingReminderEJudJoh,
-                    MessageType.Email, "case name,case number,judicial office holder,day month year,time",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("F3E4851D-CC60-4405-A8CC-233C069D1736", NotificationType.HearingReminderEJudJoh,
+                    MessageType.Email, "case name,case number,judicial office holder,day month year,time")
             },
             {
-                new Template(new Guid("A1BD3820-B93D-407E-BF75-12807EA44EF3"),
+                CreateTemplate("A1BD3820-B93D-407E-BF75-12807EA44EF3",
                     NotificationType.HearingConfirmationEJudJoh, MessageType.Email,
-                    "case name,case number,judicial office holder,day month year,time", DateTime.UtcNow,
-                    DateTime.UtcNow)
+                    "case name,case number,judicial office holder,day month year,time")
             },
             {
-                new Template(new Guid("1FC20D60-B140-44BC-B8BE-CAC8B155EAA9"),
+                CreateTemplate("1FC20D60-B140-44BC-B8BE-CAC8B155EAA9",
                     NotificationType.HearingConfirmationEJudJohMultiDay, MessageType.Email,
-                    "case name,case number,judicial office holder,Start Day Month Year,time,number of days",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,judicial office holder,Start Day Month Year,time,number of days")
             },
             {
-                new Template(new Guid("A050723D-B56D-417A-8B10-93E59776BA50"), NotificationType.EJudJohDemoOrTest,
-                    MessageType.Email, "case number,test type,judicial office holder,username,date,time",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("A050723D-B56D-417A-8B10-93E59776BA50", NotificationType.EJudJohDemoOrTest,
+                    MessageType.Email, "case number,test type,judicial office holder,username,date,time")
             },
             {
-                new Template(new Guid("0620B0DD-65B2-4A00-B0D7-5A4974AD5593"), NotificationType.ParticipantDemoOrTest,
-                    MessageType.Email, "test type,case number,date,name,username,time", DateTime.UtcNow,
-                    DateTime.UtcNow)
+                CreateTemplate("0620B0DD-65B2-4A00-B0D7-5A4974AD5593", NotificationType.ParticipantDemoOrTest,
+                    MessageType.Email, "test type,case number,date,name,username,time")
             },
             {
-                new Template(new Guid("E30863CB-CC71-47AC-8385-981E2C62AC20"), NotificationType.EJudJudgeDemoOrTest,
-                    MessageType.Email, "test type,date,time,case number,Judge", DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("E30863CB-CC71-47AC-8385-981E2C62AC20", NotificationType.EJudJudgeDemoOrTest,
+                    MessageType.Email, "test type,date,time,case number,Judge")
             },
             {
-                new Template(new Guid("4E7C403D-7704-4C88-BEB1-A7F59DCB0A84"), NotificationType.JudgeDemoOrTest,
-                    MessageType.Email, "test type,date,time,case number,Judge,courtroom account username",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("4E7C403D-7704-4C88-BEB1-A7F59DCB0A84", NotificationType.JudgeDemoOrTest,
+                    MessageType.Email, "test type,date,time,case number,Judge,courtroom account username")
             },
             {
-                new Template(new Guid("4F0D2D40-BF89-4F8A-BBBC-546981FFF3F0"),
+                CreateTemplate("4F0D2D40-BF89-4F8A-BBBC-546981FFF3F0",
                     NotificationType.TelephoneHearingConfirmation, MessageType.Email,
-                    "case name,case number,name,day month year,time", DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,name,day month year,time")
             },
             {
-                new Template(new Guid("A27A6B81-F84D-4316-B687-DCD70C6A4BF5"),
+                CreateTemplate("A27A6B81-F84D-4316-B687-DCD70C6A4BF5",
                     NotificationType.TelephoneHearingConfirmationMultiDay, MessageType.Email,
-                    "case name,case number,name,day month year,time,number of days", DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,name,day month year,time,number of days")
             },
             {
-                new Template(new Guid("4E892FD0-9FC7-49D4-A6B8-DE52D1534E17"), NotificationType.CreateStaffMember,
-                    MessageType.Email, "Name,Username,Password", DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("4E892FD0-9FC7-49D4-A6B8-DE52D1534E17", NotificationType.CreateStaffMember,
+                    MessageType.Email, "Name,Username,Password")
             },
             {
-                new Template(new Guid("18F5EC94-2604-45B4-88D7-490992928BF9"),
+                CreateTemplate("18F5EC94-2604-45B4-88D7-490992928BF9",
                     NotificationType.HearingAmendmentStaffMember, MessageType.Email,
-                    "case name,case number,staff member,New Day Month Year,Old Day Month Year,New time,Old time",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,staff member,New Day Month Year,Old Day Month Year,New time,Old time")
             },
             {
-                new Template(new Guid("8416FCBE-D54F-4DEA-AE26-47E1872083F8"),
+                CreateTemplate("8416FCBE-D54F-4DEA-AE26-47E1872083F8",
                     NotificationType.HearingConfirmationStaffMember, MessageType.Email,
-                    "case name,case number,staff member,day month year,time,username", DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,staff member,day month year,time,username")
             },
             {
-                new Template(new Guid("AB63D393-47F4-4088-A8D9-94EA749F7B71"),
+                CreateTemplate("AB63D393-47F4-4088-A8D9-94EA749F7B71",
                     NotificationType.HearingConfirmationStaffMemberMultiDay, MessageType.Email,
-                    "case name,case number,staff member,Start Day Month Year,time,number of days,username",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,staff member,Start Day Month Year,time,number of days,username")
             },
             {
-                new Template(new Guid("B4DE99E1-009C-4FF0-8704-491BC744EF43"), NotificationType.StaffMemberDemoOrTest,
-                    MessageType.Email, "test type,date,time,case number,staff member", DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("B4DE99E1-009C-4FF0-8704-491BC744EF43", NotificationType.StaffMemberDemoOrTest,
+                    MessageType.Email, "test type,date,time,case number,staff member")
             },
             {
-                new Template(new Guid("0ff35153-29d4-44bf-8774-5d977f07e056"), NotificationType.NewHearingReminderLIP,
-                    MessageType.Email, "case name, case number, name, day month year, time, username", DateTime.UtcNow,
-                    DateTime.UtcNow)
+                CreateTemplate("0ff35153-29d4-44bf-8774-5d977f07e056", NotificationType.NewHearingReminderLIP,
+                    MessageType.Email, "case name, case number, name, day month year, time, username")
             },
             {
-                new Template(new Guid("78cadd8f-81db-40b2-9096-836b92698fd7"),
+                CreateTemplate("78cadd8f-81db-40b2-9096-836b92698fd7",
                     NotificationType.NewHearingReminderRepresentative, MessageType.Email,
-                    "case name, case number, client name, solicitor name, day month year, time, username",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name, case number, client name, solicitor name, day month year, time, username")
             },
             {
-                new Template(new Guid("8e5e3059-b369-4049-bfa3-af94c4e24391"), NotificationType.NewHearingReminderJOH,
-                    MessageType.Email, "case name, case number, judicial office holder, day month year, time, username",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("8e5e3059-b369-4049-bfa3-af94c4e24391", NotificationType.NewHearingReminderJOH,
+                    MessageType.Email, CASE_NAME__CASE_NUMBER__JUDICIAL_OFFICE_HOLDER__DAY_MONTH_YEAR__TIME__USERNAME)
             },
             {
-                new Template(new Guid("df2324a3-26bd-4d16-8cb2-afd2a83e1c62"),NotificationType.NewHearingReminderEJUD,
-                MessageType.Email,"case name, case number, judicial office holder, day month year, time, username",
-                DateTime.UtcNow,DateTime.UtcNow )
+                CreateTemplate("df2324a3-26bd-4d16-8cb2-afd2a83e1c62", NotificationType.NewHearingReminderEJUD,
+                    MessageType.Email, CASE_NAME__CASE_NUMBER__JUDICIAL_OFFICE_HOLDER__DAY_MONTH_YEAR__TIME__USERNAME)
             },
         };
 
         private readonly IList<Template> _sourceTemplatesProd = new List<Template>()
         {
             {
-                new Template(new Guid("145DD703-6B4E-4570-BC48-DCE1F10E76C7"), NotificationType.CreateIndividual,
-                    MessageType.Email, "name,username,random password", DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("145DD703-6B4E-4570-BC48-DCE1F10E76C7", NotificationType.CreateIndividual,
+                    MessageType.Email, "name,username,random password")
             },
             {
-                new Template(new Guid("1DC8DEB5-19E3-4AC4-8F17-5930BFDBCEC1"), NotificationType.CreateRepresentative,
-                    MessageType.Email, "name,username,random password", DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("1DC8DEB5-19E3-4AC4-8F17-5930BFDBCEC1", NotificationType.CreateRepresentative,
+                    MessageType.Email, "name,username,random password")
             },
             {
-                new Template(new Guid("38C8EC36-88A0-40A2-8393-4B889D678EA8"), NotificationType.PasswordReset,
-                    MessageType.Email, "name,password", DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("38C8EC36-88A0-40A2-8393-4B889D678EA8", NotificationType.PasswordReset,
+                    MessageType.Email, "name,password")
             },
             {
-                new Template(new Guid("9041A2C4-563F-4B9E-9093-BAAB516856F8"),
+                CreateTemplate("9041A2C4-563F-4B9E-9093-BAAB516856F8",
                     NotificationType.HearingConfirmationJudge, MessageType.Email,
-                    "case name,case number,judge,day month year,time,courtroom account username,account password",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,judge,day month year,time,courtroom account username,account password")
             },
             {
-                new Template(new Guid("92C99AA1-A50E-4E54-910E-6CD0E1BFD090"), NotificationType.HearingConfirmationJoh,
-                    MessageType.Email, "case name,case number,judicial office holder,Day Month Year,time",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("92C99AA1-A50E-4E54-910E-6CD0E1BFD090", NotificationType.HearingConfirmationJoh,
+                    MessageType.Email, "case name,case number,judicial office holder,Day Month Year,time")
             },
             {
-                new Template(new Guid("513D2EC4-854A-4D7D-9784-2C01FBC4042B"), NotificationType.HearingConfirmationLip,
-                    MessageType.Email, "case name,case number,name,Day Month Year,time", DateTime.UtcNow,
-                    DateTime.UtcNow)
+                CreateTemplate("513D2EC4-854A-4D7D-9784-2C01FBC4042B", NotificationType.HearingConfirmationLip,
+                    MessageType.Email, "case name,case number,name,Day Month Year,time")
             },
             {
-                new Template(new Guid("FC3D1AD8-055C-4F93-8B75-F2BE78D72797"),
+                CreateTemplate("FC3D1AD8-055C-4F93-8B75-F2BE78D72797",
                     NotificationType.HearingConfirmationRepresentative, MessageType.Email,
-                    "case name,case number,client name,solicitor name,Day Month Year,time", DateTime.UtcNow,
-                    DateTime.UtcNow)
+                    "case name,case number,client name,solicitor name,Day Month Year,time")
             },
             {
-                new Template(new Guid("C9FCA388-1FD1-4042-8BD3-B1A4CA507E05"), NotificationType.HearingReminderJoh,
-                    MessageType.Email, "case name,case number,judicial office holder,day month year,time,username",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("C9FCA388-1FD1-4042-8BD3-B1A4CA507E05", NotificationType.HearingReminderJoh,
+                    MessageType.Email, "case name,case number,judicial office holder,day month year,time,username")
             },
             {
-                new Template(new Guid("35B079B6-0FB5-4D73-9A49-8FBABFEF59F6"), NotificationType.HearingReminderLip,
-                    MessageType.Email, "case name,case number,name,day month year,time,username", DateTime.UtcNow,
-                    DateTime.UtcNow)
+                CreateTemplate("35B079B6-0FB5-4D73-9A49-8FBABFEF59F6", NotificationType.HearingReminderLip,
+                    MessageType.Email, "case name,case number,name,day month year,time,username")
             },
             {
-                new Template(new Guid("80BE2D08-0FE6-4391-B60B-FD0CF770F9D5"),
+                CreateTemplate("80BE2D08-0FE6-4391-B60B-FD0CF770F9D5",
                     NotificationType.HearingReminderRepresentative, MessageType.Email,
-                    "case name,case number,client name,solicitor name,day month year,time,username", DateTime.UtcNow,
-                    DateTime.UtcNow)
+                    "case name,case number,client name,solicitor name,day month year,time,username")
             },
             {
-                new Template(new Guid("CA63D787-0378-4F8B-8994-0659D95FE273"), NotificationType.HearingAmendmentJudge,
+                CreateTemplate("CA63D787-0378-4F8B-8994-0659D95FE273", NotificationType.HearingAmendmentJudge,
                     MessageType.Email,
-                    "case name,case number,judge,New Day Month Year,Old Day Month Year,New time,Old time,courtroom account username,account password",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,judge,New Day Month Year,Old Day Month Year,New time,Old time,courtroom account username,account password")
             },
             {
-                new Template(new Guid("2D10D852-DB3D-4715-978E-23B2FD4145FE"), NotificationType.HearingAmendmentJoh,
+                CreateTemplate("2D10D852-DB3D-4715-978E-23B2FD4145FE", NotificationType.HearingAmendmentJoh,
                     MessageType.Email,
-                    "case name,case number,judicial office holder,New Day Month Year,Old Day Month Year,New time,Old time,courtroom account username,account password",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,judicial office holder,New Day Month Year,Old Day Month Year,New time,Old time,courtroom account username,account password")
             },
             {
-                new Template(new Guid("02817327-5533-4051-AE69-3609DDEBA8FB"), NotificationType.HearingAmendmentLip,
+                CreateTemplate("02817327-5533-4051-AE69-3609DDEBA8FB", NotificationType.HearingAmendmentLip,
                     MessageType.Email,
-                    "case name,case number,name,New Day Month Year,Old Day Month Year,New time,Old time,courtroom account username,account password",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,name,New Day Month Year,Old Day Month Year,New time,Old time,courtroom account username,account password")
             },
             {
-                new Template(new Guid("5299AC1F-BF42-4C68-82BD-E9C0F0EE51BA"),
+                CreateTemplate("5299AC1F-BF42-4C68-82BD-E9C0F0EE51BA",
                     NotificationType.HearingAmendmentRepresentative, MessageType.Email,
-                    "case name,case number,client name,solicitor name,New Day Month Year,Old Day Month Year,New time,Old time,courtroom account username,account password",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,client name,solicitor name,New Day Month Year,Old Day Month Year,New time,Old time,courtroom account username,account password")
             },
             {
-                new Template(new Guid("E07120B8-7FB8-43B6-88D4-909953453F05"),
+                CreateTemplate("E07120B8-7FB8-43B6-88D4-909953453F05",
                     NotificationType.HearingConfirmationJudgeMultiDay, MessageType.Email,
-                    "case name,case number,judge,Start Day Month Year,time,number of days,courtroom account username,account password",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,judge,Start Day Month Year,time,number of days,courtroom account username,account password")
             },
             {
-                new Template(new Guid("7926B67C-D9F7-4A42-A9AA-674B9EF8783B"),
+                CreateTemplate("7926B67C-D9F7-4A42-A9AA-674B9EF8783B",
                     NotificationType.HearingConfirmationJohMultiDay, MessageType.Email,
-                    "case name,case number,judicial office holder,Start Day Month Year,time,number of days,time",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,judicial office holder,Start Day Month Year,time,number of days,time")
             },
             {
-                new Template(new Guid("3DC60474-92EA-488F-A9EE-42A1D7C604A2"),
+                CreateTemplate("3DC60474-92EA-488F-A9EE-42A1D7C604A2",
                     NotificationType.HearingConfirmationLipMultiDay, MessageType.Email,
-                    "case name,case number,name,Start Day Month Year,time,number of days,time", DateTime.UtcNow,
-                    DateTime.UtcNow)
+                    "case name,case number,name,Start Day Month Year,time,number of days,time")
             },
             {
-                new Template(new Guid("39FB2E4B-6A1A-4BD2-8763-889966DD6BE0"),
+                CreateTemplate("39FB2E4B-6A1A-4BD2-8763-889966DD6BE0",
                     NotificationType.HearingConfirmationRepresentativeMultiDay, MessageType.Email,
-                    "case name,case number,client name,solicitor name,Start Day Month Year,time,number of days,time",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,client name,solicitor name,Start Day Month Year,time,number of days,time")
             },
             {
-                new Template(new Guid("D8396E28-1423-4672-B0EA-FFB6B40A1057"),
+                CreateTemplate("D8396E28-1423-4672-B0EA-FFB6B40A1057",
                     NotificationType.HearingConfirmationEJudJudge, MessageType.Email,
-                    "case name,case number,judge,day month year,time", DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,judge,day month year,time")
             },
             {
-                new Template(new Guid("47D34025-5421-41F6-A326-B11A87E93122"),
+                CreateTemplate("47D34025-5421-41F6-A326-B11A87E93122",
                     NotificationType.HearingConfirmationEJudJudgeMultiDay, MessageType.Email,
-                    "case name,case number,judge,Start Day Month Year,time,number of days", DateTime.UtcNow,
-                    DateTime.UtcNow)
+                    "case name,case number,judge,Start Day Month Year,time,number of days")
             },
             {
-                new Template(new Guid("867C4F32-E60E-4A39-94A2-AFB0B0E4CB53"),
+                CreateTemplate("867C4F32-E60E-4A39-94A2-AFB0B0E4CB53",
                     NotificationType.HearingAmendmentEJudJudge, MessageType.Email,
-                    "case name,case number,judge,New Day Month Year,Old Day Month Year,New time,Old time",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,judge,New Day Month Year,Old Day Month Year,New time,Old time")
             },
             {
-                new Template(new Guid("CB0021C4-0919-49D3-AA47-42C7E8094244"), NotificationType.HearingAmendmentEJudJoh,
-                    MessageType.Email, "case name,case number,judicial office holder,day month year,time",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("CB0021C4-0919-49D3-AA47-42C7E8094244", NotificationType.HearingAmendmentEJudJoh,
+                    MessageType.Email, "case name,case number,judicial office holder,day month year,time")
             },
             {
-                new Template(new Guid("22C8A32C-E30E-4337-A7A8-31D247B831B2"), NotificationType.HearingReminderEJudJoh,
-                    MessageType.Email, "case name,case number,judicial office holder,day month year,time",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("22C8A32C-E30E-4337-A7A8-31D247B831B2", NotificationType.HearingReminderEJudJoh,
+                    MessageType.Email, "case name,case number,judicial office holder,day month year,time")
             },
             {
-                new Template(new Guid("30BD2A94-81EA-4A6B-9AA8-1236898395DA"),
+                CreateTemplate("30BD2A94-81EA-4A6B-9AA8-1236898395DA",
                     NotificationType.HearingConfirmationEJudJoh, MessageType.Email,
-                    "case name,case number,judicial office holder,day month year,time", DateTime.UtcNow,
-                    DateTime.UtcNow)
+                    "case name,case number,judicial office holder,day month year,time")
             },
             {
-                new Template(new Guid("DECAA307-87B3-4522-A92B-B8C0718633CE"),
+                CreateTemplate("DECAA307-87B3-4522-A92B-B8C0718633CE",
                     NotificationType.HearingConfirmationEJudJohMultiDay, MessageType.Email,
-                    "case name,case number,judicial office holder,Start Day Month Year,time,number of days",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,judicial office holder,Start Day Month Year,time,number of days")
             },
             {
-                new Template(new Guid("926E2989-ABEF-4B73-BD21-05A8CD8A701C"), NotificationType.EJudJohDemoOrTest,
-                    MessageType.Email, "case number,test type,judicial office holder,username,date,time",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("926E2989-ABEF-4B73-BD21-05A8CD8A701C", NotificationType.EJudJohDemoOrTest,
+                    MessageType.Email, "case number,test type,judicial office holder,username,date,time")
             },
             {
-                new Template(new Guid("0198935B-C183-4688-8773-E6C9F3C2BB2D"), NotificationType.ParticipantDemoOrTest,
-                    MessageType.Email, "test type,case number,date,name,username,time", DateTime.UtcNow,
-                    DateTime.UtcNow)
+                CreateTemplate("0198935B-C183-4688-8773-E6C9F3C2BB2D", NotificationType.ParticipantDemoOrTest,
+                    MessageType.Email, "test type,case number,date,name,username,time")
             },
             {
-                new Template(new Guid("4746C5A6-9334-4076-B50F-2E7A17B1FE40"), NotificationType.EJudJudgeDemoOrTest,
-                    MessageType.Email, "test type,date,time,case number,Judge", DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("4746C5A6-9334-4076-B50F-2E7A17B1FE40", NotificationType.EJudJudgeDemoOrTest,
+                    MessageType.Email, "test type,date,time,case number,Judge")
             },
             {
-                new Template(new Guid("F2FD1181-E1F4-4B67-B581-502D2BB10D75"), NotificationType.JudgeDemoOrTest,
-                    MessageType.Email, "test type,date,time,case number,Judge,courtroom account username",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("F2FD1181-E1F4-4B67-B581-502D2BB10D75", NotificationType.JudgeDemoOrTest,
+                    MessageType.Email, "test type,date,time,case number,Judge,courtroom account username")
             },
             {
-                new Template(new Guid("9E0E6CE6-239B-4C52-BC43-586B1653E900"),
+                CreateTemplate("9E0E6CE6-239B-4C52-BC43-586B1653E900",
                     NotificationType.TelephoneHearingConfirmation, MessageType.Email,
-                    "case name,case number,name,day month year,time", DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,name,day month year,time")
             },
             {
-                new Template(new Guid("B8A9E86B-38BA-437F-9C6D-B6CD58914EEF"),
+                CreateTemplate("B8A9E86B-38BA-437F-9C6D-B6CD58914EEF",
                     NotificationType.TelephoneHearingConfirmationMultiDay, MessageType.Email,
-                    "case name,case number,name,day month year,time,number of days", DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,name,day month year,time,number of days")
             },
             {
-                new Template(new Guid("D42913FB-2E8D-4CC8-A411-80766D3F7ABE"), NotificationType.CreateStaffMember,
-                    MessageType.Email, "Name,Username,Password", DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("D42913FB-2E8D-4CC8-A411-80766D3F7ABE", NotificationType.CreateStaffMember,
+                    MessageType.Email, "Name,Username,Password")
             },
             {
-                new Template(new Guid("F81B074A-E30E-46BA-9AD3-C064585BE50E"),
+                CreateTemplate("F81B074A-E30E-46BA-9AD3-C064585BE50E",
                     NotificationType.HearingAmendmentStaffMember, MessageType.Email,
-                    "case name,case number,staff member,New Day Month Year,Old Day Month Year,New time,Old time",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,staff member,New Day Month Year,Old Day Month Year,New time,Old time")
             },
             {
-                new Template(new Guid("31A8DB4E-EA54-437F-A481-BE5409B76B1C"),
+                CreateTemplate("31A8DB4E-EA54-437F-A481-BE5409B76B1C",
                     NotificationType.HearingConfirmationStaffMember, MessageType.Email,
-                    "case name,case number,staff member,day month year,time,username", DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,staff member,day month year,time,username")
             },
             {
-                new Template(new Guid("CFC47A3D-C90B-4AE3-B469-06DD9F6167E4"),
+                CreateTemplate("CFC47A3D-C90B-4AE3-B469-06DD9F6167E4",
                     NotificationType.HearingConfirmationStaffMemberMultiDay, MessageType.Email,
-                    "case name,case number,staff member,Start Day Month Year,time,number of days,username",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,staff member,Start Day Month Year,time,number of days,username")
             },
             {
-                new Template(new Guid("90DE8F9C-444B-4C3C-AE87-D6A06CFF903B"), NotificationType.StaffMemberDemoOrTest,
-                    MessageType.Email, "test type,date,time,case number,staff member", DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("90DE8F9C-444B-4C3C-AE87-D6A06CFF903B", NotificationType.StaffMemberDemoOrTest,
+                    MessageType.Email, "test type,date,time,case number,staff member")
             },
             {
-                new Template(new Guid("c29e6297-0201-4efe-823e-128a6e6a2a55"), NotificationType.NewHearingReminderLIP,
-                    MessageType.Email, "case name, case number, name, day month year, time, username", DateTime.UtcNow,
-                    DateTime.UtcNow)
+                CreateTemplate("c29e6297-0201-4efe-823e-128a6e6a2a55", NotificationType.NewHearingReminderLIP,
+                    MessageType.Email, "case name, case number, name, day month year, time, username")
             },
             {
-                new Template(new Guid("a92de80a-6d96-413d-b515-904fdbbf2de8"),
+                CreateTemplate("a92de80a-6d96-413d-b515-904fdbbf2de8",
                     NotificationType.NewHearingReminderRepresentative, MessageType.Email,
-                    "case name, case number, client name, solicitor name, day month year, time, username",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name, case number, client name, solicitor name, day month year, time, username")
             },
             {
-                new Template(new Guid("1abe2b66-87de-44a9-8e2b-fb82ec9d361f"), NotificationType.NewHearingReminderJOH,
-                    MessageType.Email, "case name, case number, judicial office holder, day month year, time, username",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("1abe2b66-87de-44a9-8e2b-fb82ec9d361f", NotificationType.NewHearingReminderJOH,
+                    MessageType.Email, CASE_NAME__CASE_NUMBER__JUDICIAL_OFFICE_HOLDER__DAY_MONTH_YEAR__TIME__USERNAME)
             },
             {
-                new Template(new Guid("7718d416-d223-4f9c-a6c3-4f4e484e1ced"),NotificationType.NewHearingReminderEJUD,
-                MessageType.Email,"case name, case number, judicial office holder, day month year, time, username",
-                DateTime.UtcNow,DateTime.UtcNow )
+                CreateTemplate("7718d416-d223-4f9c-a6c3-4f4e484e1ced", NotificationType.NewHearingReminderEJUD,
+                    MessageType.Email, CASE_NAME__CASE_NUMBER__JUDICIAL_OFFICE_HOLDER__DAY_MONTH_YEAR__TIME__USERNAME)
             },
             {
-                new Template(new Guid("dd4d6c03-0dc5-474c-82ed-0382c9f725c1"),NotificationType.NewHearingReminderEJUD,
-                    MessageType.Email,"name, case name, case number", DateTime.UtcNow,DateTime.UtcNow )
-            }
+                CreateTemplate("dd4d6c03-0dc5-474c-82ed-0382c9f725c1", NotificationType.NewHearingReminderEJUD,
+                    MessageType.Email, "name, case name, case number")
+            },
+            {
+                CreateTemplate("dd4d6c03-0dc5-474c-82ed-0382c9f725c1", NotificationType.NewUserLipWelcome,
+                    MessageType.Email, CASE_NAME__CASE_NUMBER__JUDICIAL_OFFICE_HOLDER__DAY_MONTH_YEAR__TIME__USERNAME)
+            },
+            {
+                CreateTemplate("f3b2bde2-a207-42a1-ac31-42afc4c565c5", NotificationType.NewUserLipConfirmation,
+                    MessageType.Email, CASE_NAME__CASE_NUMBER__JUDICIAL_OFFICE_HOLDER__DAY_MONTH_YEAR__TIME__USERNAME)
+            },
+            {
+                CreateTemplate("1fec5768-db1e-469a-87f0-ca0171907fcf",
+                    NotificationType.NewUserLipConfirmationMultiDay,
+                    MessageType.Email, CASE_NAME__CASE_NUMBER__JUDICIAL_OFFICE_HOLDER__DAY_MONTH_YEAR__TIME__USERNAME)
+            },
+            {
+                CreateTemplate("d150f04b-bce7-4532-b7c3-2ad02550a0ca",
+                    NotificationType.ExistingUserLipConfirmation,
+                    MessageType.Email, CASE_NAME__CASE_NUMBER__JUDICIAL_OFFICE_HOLDER__DAY_MONTH_YEAR__TIME__USERNAME)
+            },
+            {
+                CreateTemplate("fb7a7bc9-b0f2-498b-b9b8-c9171238d5c2",
+                    NotificationType.ExistingUserLipConfirmationMultiDay,
+                    MessageType.Email, CASE_NAME__CASE_NUMBER__JUDICIAL_OFFICE_HOLDER__DAY_MONTH_YEAR__TIME__USERNAME)
+            },
         };
 
         private readonly IList<Template> _sourceTemplatesSandbox = new List<Template>()
         {
             {
-                new Template(new Guid("5DAFAA65-DD15-4FF1-9709-B4EC79E28109"), NotificationType.CreateIndividual,
-                    MessageType.Email, "name,username,random password", DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("5DAFAA65-DD15-4FF1-9709-B4EC79E28109", NotificationType.CreateIndividual,
+                    MessageType.Email, "name,username,random password")
             },
             {
-                new Template(new Guid("254C2827-B931-41D9-A134-87EECE8CEFC2"), NotificationType.CreateRepresentative,
-                    MessageType.Email, "name,username,random password", DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("254C2827-B931-41D9-A134-87EECE8CEFC2", NotificationType.CreateRepresentative,
+                    MessageType.Email, "name,username,random password")
             },
             {
-                new Template(new Guid("B960795B-AF58-483E-A25C-722155E3A1DE"), NotificationType.PasswordReset,
-                    MessageType.Email, "name,password", DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("B960795B-AF58-483E-A25C-722155E3A1DE", NotificationType.PasswordReset,
+                    MessageType.Email, "name,password")
             },
             {
-                new Template(new Guid("22EA73BB-31E1-46B5-B02C-C97D1C74608B"),
+                CreateTemplate("22EA73BB-31E1-46B5-B02C-C97D1C74608B",
                     NotificationType.HearingConfirmationJudge, MessageType.Email,
-                    "case name,case number,judge,day month year,time,courtroom account username,account password",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,judge,day month year,time,courtroom account username,account password")
             },
             {
-                new Template(new Guid("F3B0A36C-4D9E-4805-999E-BD8B2ACD6506"), NotificationType.HearingConfirmationJoh,
-                    MessageType.Email, "case name,case number,judicial office holder,Day Month Year,time",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("F3B0A36C-4D9E-4805-999E-BD8B2ACD6506", NotificationType.HearingConfirmationJoh,
+                    MessageType.Email, "case name,case number,judicial office holder,Day Month Year,time")
             },
             {
-                new Template(new Guid("79026354-7790-4BCA-B62C-F7171D3A6F38"), NotificationType.HearingConfirmationLip,
-                    MessageType.Email, "case name,case number,name,Day Month Year,time", DateTime.UtcNow,
-                    DateTime.UtcNow)
+                CreateTemplate("79026354-7790-4BCA-B62C-F7171D3A6F38", NotificationType.HearingConfirmationLip,
+                    MessageType.Email, "case name,case number,name,Day Month Year,time")
             },
             {
-                new Template(new Guid("F3A3116B-BEDD-49ED-9977-74A81EB2B05A"),
+                CreateTemplate("F3A3116B-BEDD-49ED-9977-74A81EB2B05A",
                     NotificationType.HearingConfirmationRepresentative, MessageType.Email,
-                    "case name,case number,client name,solicitor name,Day Month Year,time", DateTime.UtcNow,
-                    DateTime.UtcNow)
+                    "case name,case number,client name,solicitor name,Day Month Year,time")
             },
             {
-                new Template(new Guid("4BC7572D-60CC-4C7C-BDC2-73E94B6609A7"), NotificationType.HearingReminderJoh,
-                    MessageType.Email, "case name,case number,judicial office holder,day month year,time,username",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("4BC7572D-60CC-4C7C-BDC2-73E94B6609A7", NotificationType.HearingReminderJoh,
+                    MessageType.Email, "case name,case number,judicial office holder,day month year,time,username")
             },
             {
-                new Template(new Guid("414CCB68-0077-4409-B50D-DCD995BC9A64"), NotificationType.HearingReminderLip,
-                    MessageType.Email, "case name,case number,name,day month year,time,username", DateTime.UtcNow,
-                    DateTime.UtcNow)
+                CreateTemplate("414CCB68-0077-4409-B50D-DCD995BC9A64", NotificationType.HearingReminderLip,
+                    MessageType.Email, "case name,case number,name,day month year,time,username")
             },
             {
-                new Template(new Guid("E4E74D79-F6C1-4E91-8745-3831D69D3ECB"),
+                CreateTemplate("E4E74D79-F6C1-4E91-8745-3831D69D3ECB",
                     NotificationType.HearingReminderRepresentative, MessageType.Email,
-                    "case name,case number,client name,solicitor name,day month year,time,username", DateTime.UtcNow,
-                    DateTime.UtcNow)
+                    "case name,case number,client name,solicitor name,day month year,time,username")
             },
             {
-                new Template(new Guid("DE5CB558-9D62-4054-B73A-15BD52655B26"), NotificationType.HearingAmendmentJudge,
+                CreateTemplate("DE5CB558-9D62-4054-B73A-15BD52655B26", NotificationType.HearingAmendmentJudge,
                     MessageType.Email,
-                    "case name,case number,judge,New Day Month Year,Old Day Month Year,New time,Old time,courtroom account username,account password",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,judge,New Day Month Year,Old Day Month Year,New time,Old time,courtroom account username,account password")
             },
             {
-                new Template(new Guid("DF178486-7770-41A6-9B9E-4B1C0A1017E3"), NotificationType.HearingAmendmentJoh,
+                CreateTemplate("DF178486-7770-41A6-9B9E-4B1C0A1017E3", NotificationType.HearingAmendmentJoh,
                     MessageType.Email,
-                    "case name,case number,judicial office holder,New Day Month Year,Old Day Month Year,New time,Old time,courtroom account username,account password",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,judicial office holder,New Day Month Year,Old Day Month Year,New time,Old time,courtroom account username,account password")
             },
             {
-                new Template(new Guid("D6557723-A70E-40A0-A906-9181CDCB86BB"), NotificationType.HearingAmendmentLip,
+                CreateTemplate("D6557723-A70E-40A0-A906-9181CDCB86BB", NotificationType.HearingAmendmentLip,
                     MessageType.Email,
-                    "case name,case number,name,New Day Month Year,Old Day Month Year,New time,Old time,courtroom account username,account password",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,name,New Day Month Year,Old Day Month Year,New time,Old time,courtroom account username,account password")
             },
             {
-                new Template(new Guid("A80D6EE0-E9B4-415B-B187-194034A04065"),
+                CreateTemplate("A80D6EE0-E9B4-415B-B187-194034A04065",
                     NotificationType.HearingAmendmentRepresentative, MessageType.Email,
-                    "case name,case number,client name,solicitor name,New Day Month Year,Old Day Month Year,New time,Old time,courtroom account username,account password",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,client name,solicitor name,New Day Month Year,Old Day Month Year,New time,Old time,courtroom account username,account password")
             },
             {
-                new Template(new Guid("F66336E6-C371-47C0-A538-D3797DF575DE"),
+                CreateTemplate("F66336E6-C371-47C0-A538-D3797DF575DE",
                     NotificationType.HearingConfirmationJudgeMultiDay, MessageType.Email,
-                    "case name,case number,judge,Start Day Month Year,time,number of days,courtroom account username,account password",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,judge,Start Day Month Year,time,number of days,courtroom account username,account password")
             },
             {
-                new Template(new Guid("4EB2A8D5-9556-4306-8B82-6213809446BA"),
+                CreateTemplate("4EB2A8D5-9556-4306-8B82-6213809446BA",
                     NotificationType.HearingConfirmationJohMultiDay, MessageType.Email,
-                    "case name,case number,judicial office holder,Start Day Month Year,time,number of days,time",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,judicial office holder,Start Day Month Year,time,number of days,time")
             },
             {
-                new Template(new Guid("3BB37FA1-A882-4BD7-8427-FE3F4D00E0F5"),
+                CreateTemplate("3BB37FA1-A882-4BD7-8427-FE3F4D00E0F5",
                     NotificationType.HearingConfirmationLipMultiDay, MessageType.Email,
-                    "case name,case number,name,Start Day Month Year,time,number of days,time", DateTime.UtcNow,
-                    DateTime.UtcNow)
+                    "case name,case number,name,Start Day Month Year,time,number of days,time")
             },
             {
-                new Template(new Guid("9F3A1020-E5BC-466E-B31D-D95F6B554072"),
+                CreateTemplate("9F3A1020-E5BC-466E-B31D-D95F6B554072",
                     NotificationType.HearingConfirmationRepresentativeMultiDay, MessageType.Email,
-                    "case name,case number,client name,solicitor name,Start Day Month Year,time,number of days,time",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,client name,solicitor name,Start Day Month Year,time,number of days,time")
             },
             {
-                new Template(new Guid("5AEF0B6A-D746-4A99-B679-EA75EAFB1648"),
+                CreateTemplate("5AEF0B6A-D746-4A99-B679-EA75EAFB1648",
                     NotificationType.HearingConfirmationEJudJudge, MessageType.Email,
-                    "case name,case number,judge,day month year,time", DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,judge,day month year,time")
             },
             {
-                new Template(new Guid("80969A3C-4B60-46BA-9163-11F764A4BA4B"),
+                CreateTemplate("80969A3C-4B60-46BA-9163-11F764A4BA4B",
                     NotificationType.HearingConfirmationEJudJudgeMultiDay, MessageType.Email,
-                    "case name,case number,judge,Start Day Month Year,time,number of days", DateTime.UtcNow,
-                    DateTime.UtcNow)
+                    "case name,case number,judge,Start Day Month Year,time,number of days")
             },
             {
-                new Template(new Guid("A63D188E-F21C-4D71-B107-536632D83C1A"),
+                CreateTemplate("A63D188E-F21C-4D71-B107-536632D83C1A",
                     NotificationType.HearingAmendmentEJudJudge, MessageType.Email,
-                    "case name,case number,judge,New Day Month Year,Old Day Month Year,New time,Old time",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,judge,New Day Month Year,Old Day Month Year,New time,Old time")
             },
             {
-                new Template(new Guid("D205E122-7758-4EE6-8DDA-39DE202EA176"), NotificationType.HearingAmendmentEJudJoh,
-                    MessageType.Email, "case name,case number,judicial office holder,day month year,time",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("D205E122-7758-4EE6-8DDA-39DE202EA176", NotificationType.HearingAmendmentEJudJoh,
+                    MessageType.Email, "case name,case number,judicial office holder,day month year,time")
             },
             {
-                new Template(new Guid("67569EE5-8CDF-4A51-B7AF-9B1DCF7800F7"), NotificationType.HearingReminderEJudJoh,
-                    MessageType.Email, "case name,case number,judicial office holder,day month year,time",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("67569EE5-8CDF-4A51-B7AF-9B1DCF7800F7", NotificationType.HearingReminderEJudJoh,
+                    MessageType.Email, "case name,case number,judicial office holder,day month year,time")
             },
             {
-                new Template(new Guid("6992E482-8BB4-4D41-A511-CB39D1DE080B"),
+                CreateTemplate("6992E482-8BB4-4D41-A511-CB39D1DE080B",
                     NotificationType.HearingConfirmationEJudJoh, MessageType.Email,
-                    "case name,case number,judicial office holder,day month year,time", DateTime.UtcNow,
-                    DateTime.UtcNow)
+                    "case name,case number,judicial office holder,day month year,time")
             },
             {
-                new Template(new Guid("0DB88FE3-DD38-41A7-AA44-C2C6ADD31006"),
+                CreateTemplate("0DB88FE3-DD38-41A7-AA44-C2C6ADD31006",
                     NotificationType.HearingConfirmationEJudJohMultiDay, MessageType.Email,
-                    "case name,case number,judicial office holder,Start Day Month Year,time,number of days",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,judicial office holder,Start Day Month Year,time,number of days")
             },
             {
-                new Template(new Guid("F6D035BF-FD2F-44D2-902E-FA698E8F396F"), NotificationType.EJudJohDemoOrTest,
-                    MessageType.Email, "case number,test type,judicial office holder,username,date,time",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("F6D035BF-FD2F-44D2-902E-FA698E8F396F", NotificationType.EJudJohDemoOrTest,
+                    MessageType.Email, "case number,test type,judicial office holder,username,date,time")
             },
             {
-                new Template(new Guid("E5879631-1CFD-4439-8A02-95B612B1E719"), NotificationType.ParticipantDemoOrTest,
-                    MessageType.Email, "test type,case number,date,name,username,time", DateTime.UtcNow,
-                    DateTime.UtcNow)
+                CreateTemplate("E5879631-1CFD-4439-8A02-95B612B1E719", NotificationType.ParticipantDemoOrTest,
+                    MessageType.Email, "test type,case number,date,name,username,time")
             },
             {
-                new Template(new Guid("F17C499F-8183-4F2B-920C-3473CCE51D45"), NotificationType.EJudJudgeDemoOrTest,
-                    MessageType.Email, "test type,date,time,case number,Judge", DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("F17C499F-8183-4F2B-920C-3473CCE51D45", NotificationType.EJudJudgeDemoOrTest,
+                    MessageType.Email, "test type,date,time,case number,Judge")
             },
             {
-                new Template(new Guid("080ADD48-4F87-4FD7-B878-05EEBCC469C4"), NotificationType.JudgeDemoOrTest,
-                    MessageType.Email, "test type,date,time,case number,Judge,courtroom account username",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("080ADD48-4F87-4FD7-B878-05EEBCC469C4", NotificationType.JudgeDemoOrTest,
+                    MessageType.Email, "test type,date,time,case number,Judge,courtroom account username")
             },
             {
-                new Template(new Guid("1BDFD439-5923-4E00-9001-602A5FFDA801"),
+                CreateTemplate("1BDFD439-5923-4E00-9001-602A5FFDA801",
                     NotificationType.TelephoneHearingConfirmation, MessageType.Email,
-                    "case name,case number,name,day month year,time", DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,name,day month year,time")
             },
             {
-                new Template(new Guid("EE4A9A9A-EA1E-4C07-B488-D94CFA2ACD07"),
+                CreateTemplate("EE4A9A9A-EA1E-4C07-B488-D94CFA2ACD07",
                     NotificationType.TelephoneHearingConfirmationMultiDay, MessageType.Email,
-                    "case name,case number,name,day month year,time,number of days", DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,name,day month year,time,number of days")
             },
             {
-                new Template(new Guid("C8F47717-3001-408C-B1F3-91002F5F5A89"), NotificationType.CreateStaffMember,
-                    MessageType.Email, "Name,Username,Password", DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("C8F47717-3001-408C-B1F3-91002F5F5A89", NotificationType.CreateStaffMember,
+                    MessageType.Email, "Name,Username,Password")
             },
             {
-                new Template(new Guid("4719EC05-E46C-413F-86C0-EF7DC3AE2340"),
+                CreateTemplate("4719EC05-E46C-413F-86C0-EF7DC3AE2340",
                     NotificationType.HearingAmendmentStaffMember, MessageType.Email,
-                    "case name,case number,staff member,New Day Month Year,Old Day Month Year,New time,Old time",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,staff member,New Day Month Year,Old Day Month Year,New time,Old time")
             },
             {
-                new Template(new Guid("7D79D219-A0B9-44E4-91B0-F2C9FCF9ACEC"),
+                CreateTemplate("7D79D219-A0B9-44E4-91B0-F2C9FCF9ACEC",
                     NotificationType.HearingConfirmationStaffMember, MessageType.Email,
-                    "case name,case number,staff member,day month year,time,username", DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,staff member,day month year,time,username")
             },
             {
-                new Template(new Guid("D2CA16E9-58CD-4A07-8E7C-B440D42FBFA9"),
+                CreateTemplate("D2CA16E9-58CD-4A07-8E7C-B440D42FBFA9",
                     NotificationType.HearingConfirmationStaffMemberMultiDay, MessageType.Email,
-                    "case name,case number,staff member,Start Day Month Year,time,number of days,username",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name,case number,staff member,Start Day Month Year,time,number of days,username")
             },
             {
-                new Template(new Guid("82AD1652-1E23-425F-A06B-668125C98634"), NotificationType.StaffMemberDemoOrTest,
-                    MessageType.Email, "test type,date,time,case number,staff member", DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("82AD1652-1E23-425F-A06B-668125C98634", NotificationType.StaffMemberDemoOrTest,
+                    MessageType.Email, "test type,date,time,case number,staff member")
             },
             {
-                new Template(new Guid("8AD8FEC0-C692-41FC-9B8E-36F0CE3FF84C"), NotificationType.NewHearingReminderLIP,
-                    MessageType.Email, "case name, case number, name, day month year, time, username", DateTime.UtcNow,
-                    DateTime.UtcNow)
+                CreateTemplate("8AD8FEC0-C692-41FC-9B8E-36F0CE3FF84C", NotificationType.NewHearingReminderLIP,
+                    MessageType.Email, "case name, case number, name, day month year, time, username")
             },
             {
-                new Template(new Guid("1E7BFC5C-12E7-45FF-93FE-972820161D52"),
+                CreateTemplate("1E7BFC5C-12E7-45FF-93FE-972820161D52",
                     NotificationType.NewHearingReminderRepresentative, MessageType.Email,
-                    "case name, case number, client name, solicitor name, day month year, time, username",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                    "case name, case number, client name, solicitor name, day month year, time, username")
             },
             {
-                new Template(new Guid("954E98DD-354A-4580-9855-C23FE16BA312"), NotificationType.NewHearingReminderJOH,
-                    MessageType.Email, "case name, case number, judicial office holder, day month year, time, username",
-                    DateTime.UtcNow, DateTime.UtcNow)
+                CreateTemplate("954E98DD-354A-4580-9855-C23FE16BA312", NotificationType.NewHearingReminderJOH,
+                    MessageType.Email, CASE_NAME__CASE_NUMBER__JUDICIAL_OFFICE_HOLDER__DAY_MONTH_YEAR__TIME__USERNAME)
             },
         };
 
@@ -1761,15 +1575,16 @@ public IList<Template> Get(string environment)
                 //SDS Environments
                 case "stg":
                 case "ithc":
-                case "test": 
-                case "demo":     
+                case "test":
+                case "demo":
                 case "dev":
                 case "lower":
                     return _sourceTemplatesDev;
                 case "prod":
                     return _sourceTemplatesProd;
                 default:
-                    throw new ArgumentException($"Environment variable {environment} is not set - unable to find the list of templates");
+                    throw new ArgumentException(
+                        $"Environment variable {environment} is not set - unable to find the list of templates");
             }
         }
     }
diff --git a/NotificationApi/NotificationApi.Domain/Enums/NotificationType.cs b/NotificationApi/NotificationApi.Domain/Enums/NotificationType.cs
index c17e8b5f..478a91fa 100644
--- a/NotificationApi/NotificationApi.Domain/Enums/NotificationType.cs
+++ b/NotificationApi/NotificationApi.Domain/Enums/NotificationType.cs
@@ -43,6 +43,10 @@ public enum NotificationType
         NewHearingReminderRepresentative = 38,
         NewHearingReminderJOH = 39,
         NewHearingReminderEJUD = 40,
-        NewUserLipWelcome = 41
+        NewUserLipWelcome = 41,
+        NewUserLipConfirmation = 42,
+        NewUserLipConfirmationMultiDay = 43,
+        ExistingUserLipConfirmation = 44,
+        ExistingUserLipConfirmationMultiDay = 45
     }
 }
diff --git a/azure-pipelines.sds.pr-release.yml b/azure-pipelines.sds.pr-release.yml
index efe2065d..14b39829 100644
--- a/azure-pipelines.sds.pr-release.yml
+++ b/azure-pipelines.sds.pr-release.yml
@@ -46,7 +46,7 @@ stages:
               dockerComposeTestFile: docker-compose.tests.yml
               sonarExtraProperties: |
                 sonar.cs.opencover.reportsPaths=$(System.DefaultWorkingDirectory)/coverage.opencover.xml
-                sonar.cpd.exclusions=**/NotificationType.cs
+                sonar.cpd.exclusions=**/NotificationType.cs, **/TemplateDataForEnvironments.cs
                 sonar.exclusions=**/Program.cs, **/Startup.cs, **/Testing.Common/**/*, **/NotificationApi/Swagger/**/*, NotificationApi/NotificationApi.DAL/Migrations/*, NotificationApi/NotificationApi.DAL/TemplateDataForEnvironments.cs
                 sonar.coverage.exclusions=**/NotificationApi/Swagger/**/*, **/Program.cs, **/Startup.cs, **/Testing.Common/**/*, **/NotificationApi.Common/**/*, **/NotificationApi.IntegrationTests/**/*, **/NotificationApi.UnitTests/**/*, **/NotificationApi/Extensions/*, **/NotificationApi.DAL/Migrations/**/*
 

From 8b9e4f4e154a2baa7726ce96266b6161ce3734fe Mon Sep 17 00:00:00 2001
From: shaed-parkar <41630528+shaed-parkar@users.noreply.github.com>
Date: Fri, 15 Sep 2023 11:31:39 +0100
Subject: [PATCH 2/4] VIH-10187 Add RequestBodyLogging Middleware.cs (#141)

---
 .../Logging/RequestBodyLoggingMiddleware.cs   | 48 +++++++++++++++++++
 NotificationApi/NotificationApi/Startup.cs    |  1 +
 2 files changed, 49 insertions(+)
 create mode 100644 NotificationApi/NotificationApi/Middleware/Logging/RequestBodyLoggingMiddleware.cs

diff --git a/NotificationApi/NotificationApi/Middleware/Logging/RequestBodyLoggingMiddleware.cs b/NotificationApi/NotificationApi/Middleware/Logging/RequestBodyLoggingMiddleware.cs
new file mode 100644
index 00000000..a396c0d6
--- /dev/null
+++ b/NotificationApi/NotificationApi/Middleware/Logging/RequestBodyLoggingMiddleware.cs
@@ -0,0 +1,48 @@
+using System.IO;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.ApplicationInsights.DataContracts;
+using Microsoft.AspNetCore.Http;
+
+namespace NotificationApi.Middleware.Logging;
+
+public class RequestBodyLoggingMiddleware
+{
+    private readonly RequestDelegate _next;
+
+    public RequestBodyLoggingMiddleware(RequestDelegate next)
+    {
+        _next = next;
+    }
+
+    public async Task InvokeAsync(HttpContext context)
+    {
+        var method = context.Request.Method;
+
+        // Ensure the request body can be read multiple times
+        context.Request.EnableBuffering();
+
+        // Only if we are dealing with POST or PUT, GET and others shouldn't have a body
+        if (context.Request.Body.CanRead && (method == HttpMethods.Post || method == HttpMethods.Put || method == HttpMethods.Patch))
+        {
+            // Leave stream open so next middleware can read it
+            using var reader = new StreamReader(
+                context.Request.Body,
+                Encoding.UTF8,
+                detectEncodingFromByteOrderMarks: false,
+                bufferSize: 512, leaveOpen: true);
+
+            var requestBody = await reader.ReadToEndAsync();
+
+            // Reset stream position, so next middleware can read it
+            context.Request.Body.Position = 0;
+
+            // Write request body to App Insights
+            var requestTelemetry = context.Features.Get<RequestTelemetry>();                              
+            requestTelemetry?.Properties.Add("RequestBody", requestBody);
+        }
+
+        // Call next middleware in the pipeline
+        await _next(context);
+    }
+}
diff --git a/NotificationApi/NotificationApi/Startup.cs b/NotificationApi/NotificationApi/Startup.cs
index 4e397653..a7d5cf75 100644
--- a/NotificationApi/NotificationApi/Startup.cs
+++ b/NotificationApi/NotificationApi/Startup.cs
@@ -143,6 +143,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
             app.UseAuthentication();
             app.UseCors("CorsPolicy");
 
+            app.UseMiddleware<RequestBodyLoggingMiddleware>();
             app.UseMiddleware<ExceptionMiddleware>();
 
             app.UseEndpoints(endpoints => { endpoints.MapDefaultControllerRoute(); });

From 1cc56fdd87ece6e6b570b7f41a69c133022914f1 Mon Sep 17 00:00:00 2001
From: shaed-parkar <41630528+shaed-parkar@users.noreply.github.com>
Date: Tue, 19 Sep 2023 10:03:17 +0100
Subject: [PATCH 3/4] VIH-10168 replace healthcheck implementation (#140)

---
 .../packages.lock.json                        |  42 +++-
 .../NotificationApiClient.cs                  | 210 ------------------
 .../Responses/HealthResponse.cs               |  14 --
 .../packages.lock.json                        |  31 ++-
 .../Controller/HealthCheck/HealthTests.cs     |  82 -------
 .../packages.lock.json                        |  42 +++-
 .../Controllers/HealthCheckController.cs      |  70 ------
 .../Extensions/ConfigureServicesExtensions.cs |   3 +-
 .../Health/HealthCheckExtensions.cs           |  66 ++++++
 .../NotificationApi/NotificationApi.csproj    |   1 +
 NotificationApi/NotificationApi/Startup.cs    |  14 +-
 .../NotificationApi/packages.lock.json        |  42 +++-
 charts/vh-notification-api/Chart.yaml         |   2 +-
 charts/vh-notification-api/values.yaml        |  13 +-
 14 files changed, 218 insertions(+), 414 deletions(-)
 delete mode 100644 NotificationApi/NotificationApi.Contract/Responses/HealthResponse.cs
 delete mode 100644 NotificationApi/NotificationApi.UnitTests/Controller/HealthCheck/HealthTests.cs
 delete mode 100644 NotificationApi/NotificationApi/Controllers/HealthCheckController.cs
 create mode 100644 NotificationApi/NotificationApi/Health/HealthCheckExtensions.cs

diff --git a/NotificationApi/NotificationApi.AcceptanceTests/packages.lock.json b/NotificationApi/NotificationApi.AcceptanceTests/packages.lock.json
index d8e9bed7..23ac673a 100644
--- a/NotificationApi/NotificationApi.AcceptanceTests/packages.lock.json
+++ b/NotificationApi/NotificationApi.AcceptanceTests/packages.lock.json
@@ -811,6 +811,32 @@
           "System.Reflection.Emit.Lightweight": "4.3.0"
         }
       },
+      "Microsoft.Extensions.Diagnostics.HealthChecks": {
+        "type": "Transitive",
+        "resolved": "6.0.8",
+        "contentHash": "xRbKuDnoKClu/lC3fCqF5f0UqEqVI8iYJ0RN4XpUHajvcfCWYcFC46NEzaUg2Fub7hznTG9m6XNScrVHl1iaSA==",
+        "dependencies": {
+          "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.8",
+          "Microsoft.Extensions.Hosting.Abstractions": "6.0.0",
+          "Microsoft.Extensions.Logging.Abstractions": "6.0.1",
+          "Microsoft.Extensions.Options": "6.0.0"
+        }
+      },
+      "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": {
+        "type": "Transitive",
+        "resolved": "6.0.8",
+        "contentHash": "8mNPugigemlybm8f+KcwB5FOEyJ8mZ72stKvOJJqpUFYjfTjFDKFKYB2L98gru1SaxVD9akjw8OyvtbWkAEimQ=="
+      },
+      "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore": {
+        "type": "Transitive",
+        "resolved": "6.0.8",
+        "contentHash": "NfcEjGvaRyc7OjTeoCSVLlQKzSZeMb96XCuthX/Z9HbPEjXViSewyvOQPIjd6e3pQumIJgltlBRo9o6b3JQsPg==",
+        "dependencies": {
+          "Microsoft.EntityFrameworkCore.Relational": "6.0.8",
+          "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.8",
+          "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.8"
+        }
+      },
       "Microsoft.Extensions.FileProviders.Abstractions": {
         "type": "Transitive",
         "resolved": "6.0.0",
@@ -844,13 +870,12 @@
       },
       "Microsoft.Extensions.Hosting.Abstractions": {
         "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "+k4AEn68HOJat5gj1TWa6X28WlirNQO9sPIIeQbia+91n03esEtMSSoekSTpMjUzjqtJWQN3McVx0GvSPFHF/Q==",
+        "resolved": "6.0.0",
+        "contentHash": "GcT5l2CYXL6Sa27KCSh0TixsRfADUgth+ojQSD5EkzisZxmGFh7CwzkcYuGwvmXLjr27uWRNrJ2vuuEjMhU05Q==",
         "dependencies": {
-          "Microsoft.Extensions.Configuration.Abstractions": "2.2.0",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.FileProviders.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging.Abstractions": "2.2.0"
+          "Microsoft.Extensions.Configuration.Abstractions": "6.0.0",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0",
+          "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0"
         }
       },
       "Microsoft.Extensions.Logging": {
@@ -867,8 +892,8 @@
       },
       "Microsoft.Extensions.Logging.Abstractions": {
         "type": "Transitive",
-        "resolved": "6.0.0",
-        "contentHash": "/HggWBbTwy8TgebGSX5DBZ24ndhzi93sHUBDvP1IxbZD7FDokYzdAr6+vbWGjw2XAfR2EJ1sfKUotpjHnFWPxA=="
+        "resolved": "6.0.1",
+        "contentHash": "dzB2Cgg+JmrouhjkcQGzSFjjvpwlq353i8oBQO2GWNjCXSzhbtBRUf28HSauWe7eib3wYOdb3tItdjRwAdwCSg=="
       },
       "Microsoft.Extensions.Logging.ApplicationInsights": {
         "type": "Transitive",
@@ -2345,6 +2370,7 @@
           "Microsoft.AspNetCore.JsonPatch": "[6.0.8, )",
           "Microsoft.AspNetCore.Mvc.NewtonsoftJson": "[3.1.6, )",
           "Microsoft.Extensions.DependencyModel": "[3.1.6, )",
+          "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore": "[6.0.8, )",
           "Microsoft.Extensions.Logging.ApplicationInsights": "[2.15.0, )",
           "Microsoft.VisualStudio.Azure.Containers.Tools.Targets": "[1.9.10, )",
           "Microsoft.VisualStudio.Web.CodeGeneration.Design": "[3.1.0, )",
diff --git a/NotificationApi/NotificationApi.Client/NotificationApiClient.cs b/NotificationApi/NotificationApi.Client/NotificationApiClient.cs
index b76341df..4b5e7e33 100644
--- a/NotificationApi/NotificationApi.Client/NotificationApiClient.cs
+++ b/NotificationApi/NotificationApi.Client/NotificationApiClient.cs
@@ -25,36 +25,6 @@ namespace NotificationApi.Client
     [System.CodeDom.Compiler.GeneratedCode("NSwag", "13.18.2.0 (NJsonSchema v10.8.0.0 (Newtonsoft.Json v13.0.0.0))")]
     public partial interface INotificationApiClient
     {
-        /// <summary>
-        /// Check Service Health
-        /// </summary>
-        /// <returns>Error if fails, otherwise OK status</returns>
-        /// <exception cref="NotificationApiException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<HealthResponse> CheckServiceHealthAuthAsync();
-
-        /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
-        /// <summary>
-        /// Check Service Health
-        /// </summary>
-        /// <returns>Error if fails, otherwise OK status</returns>
-        /// <exception cref="NotificationApiException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<HealthResponse> CheckServiceHealthAuthAsync(System.Threading.CancellationToken cancellationToken);
-
-        /// <summary>
-        /// Check Service Health
-        /// </summary>
-        /// <returns>Error if fails, otherwise OK status</returns>
-        /// <exception cref="NotificationApiException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<HealthResponse> CheckServiceHealthAuth2Async();
-
-        /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
-        /// <summary>
-        /// Check Service Health
-        /// </summary>
-        /// <returns>Error if fails, otherwise OK status</returns>
-        /// <exception cref="NotificationApiException">A server side error occurred.</exception>
-        System.Threading.Tasks.Task<HealthResponse> CheckServiceHealthAuth2Async(System.Threading.CancellationToken cancellationToken);
-
         /// <exception cref="NotificationApiException">A server side error occurred.</exception>
         System.Threading.Tasks.Task<NotificationTemplateResponse> GetTemplateByNotificationTypeAsync(NotificationType notificationType);
 
@@ -118,186 +88,6 @@ public string BaseUrl
         partial void PrepareRequest(System.Net.Http.HttpClient client, System.Net.Http.HttpRequestMessage request, System.Text.StringBuilder urlBuilder);
         partial void ProcessResponse(System.Net.Http.HttpClient client, System.Net.Http.HttpResponseMessage response);
 
-        /// <summary>
-        /// Check Service Health
-        /// </summary>
-        /// <returns>Error if fails, otherwise OK status</returns>
-        /// <exception cref="NotificationApiException">A server side error occurred.</exception>
-        public virtual System.Threading.Tasks.Task<HealthResponse> CheckServiceHealthAuthAsync()
-        {
-            return CheckServiceHealthAuthAsync(System.Threading.CancellationToken.None);
-        }
-
-        /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
-        /// <summary>
-        /// Check Service Health
-        /// </summary>
-        /// <returns>Error if fails, otherwise OK status</returns>
-        /// <exception cref="NotificationApiException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<HealthResponse> CheckServiceHealthAuthAsync(System.Threading.CancellationToken cancellationToken)
-        {
-            var urlBuilder_ = new System.Text.StringBuilder();
-            urlBuilder_.Append(BaseUrl != null ? BaseUrl.TrimEnd('/') : "").Append("/HealthCheck/health");
-
-            var client_ = _httpClient;
-            var disposeClient_ = false;
-            try
-            {
-                using (var request_ = new System.Net.Http.HttpRequestMessage())
-                {
-                    request_.Method = new System.Net.Http.HttpMethod("GET");
-                    request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
-
-                    PrepareRequest(client_, request_, urlBuilder_);
-
-                    var url_ = urlBuilder_.ToString();
-                    request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute);
-
-                    PrepareRequest(client_, request_, url_);
-
-                    var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false);
-                    var disposeResponse_ = true;
-                    try
-                    {
-                        var headers_ = System.Linq.Enumerable.ToDictionary(response_.Headers, h_ => h_.Key, h_ => h_.Value);
-                        if (response_.Content != null && response_.Content.Headers != null)
-                        {
-                            foreach (var item_ in response_.Content.Headers)
-                                headers_[item_.Key] = item_.Value;
-                        }
-
-                        ProcessResponse(client_, response_);
-
-                        var status_ = (int)response_.StatusCode;
-                        if (status_ == 500)
-                        {
-                            var objectResponse_ = await ReadObjectResponseAsync<HealthResponse>(response_, headers_, cancellationToken).ConfigureAwait(false);
-                            if (objectResponse_.Object == null)
-                            {
-                                throw new NotificationApiException("Response was null which was not expected.", status_, objectResponse_.Text, headers_, null);
-                            }
-                            throw new NotificationApiException<HealthResponse>("A server side error occurred.", status_, objectResponse_.Text, headers_, objectResponse_.Object, null);
-                        }
-                        else
-                        if (status_ == 200)
-                        {
-                            var objectResponse_ = await ReadObjectResponseAsync<HealthResponse>(response_, headers_, cancellationToken).ConfigureAwait(false);
-                            if (objectResponse_.Object == null)
-                            {
-                                throw new NotificationApiException("Response was null which was not expected.", status_, objectResponse_.Text, headers_, null);
-                            }
-                            return objectResponse_.Object;
-                        }
-                        else
-                        {
-                            var responseData_ = response_.Content == null ? null : await response_.Content.ReadAsStringAsync().ConfigureAwait(false);
-                            throw new NotificationApiException("The HTTP status code of the response was not expected (" + status_ + ").", status_, responseData_, headers_, null);
-                        }
-                    }
-                    finally
-                    {
-                        if (disposeResponse_)
-                            response_.Dispose();
-                    }
-                }
-            }
-            finally
-            {
-                if (disposeClient_)
-                    client_.Dispose();
-            }
-        }
-
-        /// <summary>
-        /// Check Service Health
-        /// </summary>
-        /// <returns>Error if fails, otherwise OK status</returns>
-        /// <exception cref="NotificationApiException">A server side error occurred.</exception>
-        public virtual System.Threading.Tasks.Task<HealthResponse> CheckServiceHealthAuth2Async()
-        {
-            return CheckServiceHealthAuth2Async(System.Threading.CancellationToken.None);
-        }
-
-        /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
-        /// <summary>
-        /// Check Service Health
-        /// </summary>
-        /// <returns>Error if fails, otherwise OK status</returns>
-        /// <exception cref="NotificationApiException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<HealthResponse> CheckServiceHealthAuth2Async(System.Threading.CancellationToken cancellationToken)
-        {
-            var urlBuilder_ = new System.Text.StringBuilder();
-            urlBuilder_.Append(BaseUrl != null ? BaseUrl.TrimEnd('/') : "").Append("/health/liveness");
-
-            var client_ = _httpClient;
-            var disposeClient_ = false;
-            try
-            {
-                using (var request_ = new System.Net.Http.HttpRequestMessage())
-                {
-                    request_.Method = new System.Net.Http.HttpMethod("GET");
-                    request_.Headers.Accept.Add(System.Net.Http.Headers.MediaTypeWithQualityHeaderValue.Parse("application/json"));
-
-                    PrepareRequest(client_, request_, urlBuilder_);
-
-                    var url_ = urlBuilder_.ToString();
-                    request_.RequestUri = new System.Uri(url_, System.UriKind.RelativeOrAbsolute);
-
-                    PrepareRequest(client_, request_, url_);
-
-                    var response_ = await client_.SendAsync(request_, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false);
-                    var disposeResponse_ = true;
-                    try
-                    {
-                        var headers_ = System.Linq.Enumerable.ToDictionary(response_.Headers, h_ => h_.Key, h_ => h_.Value);
-                        if (response_.Content != null && response_.Content.Headers != null)
-                        {
-                            foreach (var item_ in response_.Content.Headers)
-                                headers_[item_.Key] = item_.Value;
-                        }
-
-                        ProcessResponse(client_, response_);
-
-                        var status_ = (int)response_.StatusCode;
-                        if (status_ == 500)
-                        {
-                            var objectResponse_ = await ReadObjectResponseAsync<HealthResponse>(response_, headers_, cancellationToken).ConfigureAwait(false);
-                            if (objectResponse_.Object == null)
-                            {
-                                throw new NotificationApiException("Response was null which was not expected.", status_, objectResponse_.Text, headers_, null);
-                            }
-                            throw new NotificationApiException<HealthResponse>("A server side error occurred.", status_, objectResponse_.Text, headers_, objectResponse_.Object, null);
-                        }
-                        else
-                        if (status_ == 200)
-                        {
-                            var objectResponse_ = await ReadObjectResponseAsync<HealthResponse>(response_, headers_, cancellationToken).ConfigureAwait(false);
-                            if (objectResponse_.Object == null)
-                            {
-                                throw new NotificationApiException("Response was null which was not expected.", status_, objectResponse_.Text, headers_, null);
-                            }
-                            return objectResponse_.Object;
-                        }
-                        else
-                        {
-                            var responseData_ = response_.Content == null ? null : await response_.Content.ReadAsStringAsync().ConfigureAwait(false);
-                            throw new NotificationApiException("The HTTP status code of the response was not expected (" + status_ + ").", status_, responseData_, headers_, null);
-                        }
-                    }
-                    finally
-                    {
-                        if (disposeResponse_)
-                            response_.Dispose();
-                    }
-                }
-            }
-            finally
-            {
-                if (disposeClient_)
-                    client_.Dispose();
-            }
-        }
-
         /// <exception cref="NotificationApiException">A server side error occurred.</exception>
         public virtual System.Threading.Tasks.Task<NotificationTemplateResponse> GetTemplateByNotificationTypeAsync(NotificationType notificationType)
         {
diff --git a/NotificationApi/NotificationApi.Contract/Responses/HealthResponse.cs b/NotificationApi/NotificationApi.Contract/Responses/HealthResponse.cs
deleted file mode 100644
index 9159bdfc..00000000
--- a/NotificationApi/NotificationApi.Contract/Responses/HealthResponse.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-namespace NotificationApi.Contract.Responses
-{
-    public class HealthResponse
-    {
-        public HealthCheck DatabaseHealth { get; set; }
-        public AppVersionResponse AppVersion { get; set; }
-
-        public HealthResponse()
-        {
-            DatabaseHealth = new HealthCheck();
-            AppVersion = new AppVersionResponse();
-        }
-    }
-}
diff --git a/NotificationApi/NotificationApi.IntegrationTests/packages.lock.json b/NotificationApi/NotificationApi.IntegrationTests/packages.lock.json
index b38c2e9f..1d323bb6 100644
--- a/NotificationApi/NotificationApi.IntegrationTests/packages.lock.json
+++ b/NotificationApi/NotificationApi.IntegrationTests/packages.lock.json
@@ -935,6 +935,32 @@
           "System.Reflection.Emit.Lightweight": "4.3.0"
         }
       },
+      "Microsoft.Extensions.Diagnostics.HealthChecks": {
+        "type": "Transitive",
+        "resolved": "6.0.8",
+        "contentHash": "xRbKuDnoKClu/lC3fCqF5f0UqEqVI8iYJ0RN4XpUHajvcfCWYcFC46NEzaUg2Fub7hznTG9m6XNScrVHl1iaSA==",
+        "dependencies": {
+          "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.8",
+          "Microsoft.Extensions.Hosting.Abstractions": "6.0.0",
+          "Microsoft.Extensions.Logging.Abstractions": "6.0.1",
+          "Microsoft.Extensions.Options": "6.0.0"
+        }
+      },
+      "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": {
+        "type": "Transitive",
+        "resolved": "6.0.8",
+        "contentHash": "8mNPugigemlybm8f+KcwB5FOEyJ8mZ72stKvOJJqpUFYjfTjFDKFKYB2L98gru1SaxVD9akjw8OyvtbWkAEimQ=="
+      },
+      "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore": {
+        "type": "Transitive",
+        "resolved": "6.0.8",
+        "contentHash": "NfcEjGvaRyc7OjTeoCSVLlQKzSZeMb96XCuthX/Z9HbPEjXViSewyvOQPIjd6e3pQumIJgltlBRo9o6b3JQsPg==",
+        "dependencies": {
+          "Microsoft.EntityFrameworkCore.Relational": "6.0.8",
+          "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.8",
+          "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.8"
+        }
+      },
       "Microsoft.Extensions.FileProviders.Abstractions": {
         "type": "Transitive",
         "resolved": "6.0.0",
@@ -1018,8 +1044,8 @@
       },
       "Microsoft.Extensions.Logging.Abstractions": {
         "type": "Transitive",
-        "resolved": "6.0.0",
-        "contentHash": "/HggWBbTwy8TgebGSX5DBZ24ndhzi93sHUBDvP1IxbZD7FDokYzdAr6+vbWGjw2XAfR2EJ1sfKUotpjHnFWPxA=="
+        "resolved": "6.0.1",
+        "contentHash": "dzB2Cgg+JmrouhjkcQGzSFjjvpwlq353i8oBQO2GWNjCXSzhbtBRUf28HSauWe7eib3wYOdb3tItdjRwAdwCSg=="
       },
       "Microsoft.Extensions.Logging.ApplicationInsights": {
         "type": "Transitive",
@@ -2611,6 +2637,7 @@
           "Microsoft.AspNetCore.JsonPatch": "[6.0.8, )",
           "Microsoft.AspNetCore.Mvc.NewtonsoftJson": "[3.1.6, )",
           "Microsoft.Extensions.DependencyModel": "[3.1.6, )",
+          "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore": "[6.0.8, )",
           "Microsoft.Extensions.Logging.ApplicationInsights": "[2.15.0, )",
           "Microsoft.VisualStudio.Azure.Containers.Tools.Targets": "[1.9.10, )",
           "Microsoft.VisualStudio.Web.CodeGeneration.Design": "[3.1.0, )",
diff --git a/NotificationApi/NotificationApi.UnitTests/Controller/HealthCheck/HealthTests.cs b/NotificationApi/NotificationApi.UnitTests/Controller/HealthCheck/HealthTests.cs
deleted file mode 100644
index 6a267bdf..00000000
--- a/NotificationApi/NotificationApi.UnitTests/Controller/HealthCheck/HealthTests.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using Autofac.Extras.Moq;
-using FluentAssertions;
-using Microsoft.AspNetCore.Mvc;
-using Moq;
-using NotificationApi.Contract.Responses;
-using NotificationApi.Controllers;
-using NotificationApi.DAL.Models;
-using NotificationApi.DAL.Queries;
-using NotificationApi.DAL.Queries.Core;
-using NUnit.Framework;
-
-namespace NotificationApi.UnitTests.Controller.HealthCheck
-{
-    public class HealthTests
-    {
-        private AutoMock _mocker;
-        private Mock<IQueryHandler> _queryHandlerMock;
-        private HealthCheckController _controller;
-        
-        [SetUp]
-        public void Setup()
-        {
-            _mocker = AutoMock.GetLoose();
-            _queryHandlerMock = _mocker.Mock<IQueryHandler>();
-            _controller = _mocker.Create<HealthCheckController>();
-        }
-        
-        [Test]
-        public async Task Should_return_the_user_api_health()
-        {
-            var connectResult = new DbHealthCheckResult {CanConnect = true};
-            _queryHandlerMock
-                .Setup(x => x.Handle<DbHealthCheckQuery, DbHealthCheckResult>(It.IsAny<DbHealthCheckQuery>()))
-                .ReturnsAsync(connectResult);
-            
-            var result = await _controller.HealthAsync();
-            result.Should().BeOfType<OkObjectResult>();
-            var typedResult = (OkObjectResult) result;
-            var response = (HealthResponse) typedResult.Value;
-            response.AppVersion.FileVersion.Should().NotBeNullOrWhiteSpace();
-            response.AppVersion.InformationVersion.Should().NotBeNullOrWhiteSpace();
-            response.DatabaseHealth.Successful.Should().BeTrue();
-        }
-
-        [Test]
-        public async Task should_return_error_status_code_if_db_connection_fails()
-        {
-            var connectResult = new DbHealthCheckResult {CanConnect = false};
-            _queryHandlerMock
-                .Setup(x => x.Handle<DbHealthCheckQuery, DbHealthCheckResult>(It.IsAny<DbHealthCheckQuery>()))
-                .ReturnsAsync(connectResult);
-            
-            var result = await _controller.HealthAsync();
-            result.Should().BeOfType<ObjectResult>();
-            var typedResult = (ObjectResult) result;
-            var response = (HealthResponse) typedResult.Value;
-            response.AppVersion.FileVersion.Should().NotBeNullOrWhiteSpace();
-            response.AppVersion.InformationVersion.Should().NotBeNullOrWhiteSpace();
-            response.DatabaseHealth.Successful.Should().BeFalse();
-        }
-        
-        [Test]
-        public async Task should_return_error_status_code_if_db_connection_throws_exception()
-        {
-            var exception = new AggregateException("database connection failed");
-            _queryHandlerMock
-                .Setup(x => x.Handle<DbHealthCheckQuery, DbHealthCheckResult>(It.IsAny<DbHealthCheckQuery>()))
-                .ThrowsAsync(exception);
-            
-            var result = await _controller.HealthAsync();
-            result.Should().BeOfType<ObjectResult>();
-            var typedResult = (ObjectResult) result;
-            var response = (HealthResponse) typedResult.Value;
-            response.AppVersion.FileVersion.Should().NotBeNullOrWhiteSpace();
-            response.AppVersion.InformationVersion.Should().NotBeNullOrWhiteSpace();
-            response.DatabaseHealth.Successful.Should().BeFalse();
-            response.DatabaseHealth.ErrorMessage.Should().NotBeNullOrWhiteSpace();
-        }
-    }
-}
diff --git a/NotificationApi/NotificationApi.UnitTests/packages.lock.json b/NotificationApi/NotificationApi.UnitTests/packages.lock.json
index 86fa64c8..c3604aa7 100644
--- a/NotificationApi/NotificationApi.UnitTests/packages.lock.json
+++ b/NotificationApi/NotificationApi.UnitTests/packages.lock.json
@@ -858,6 +858,32 @@
           "System.Reflection.Emit.Lightweight": "4.3.0"
         }
       },
+      "Microsoft.Extensions.Diagnostics.HealthChecks": {
+        "type": "Transitive",
+        "resolved": "6.0.8",
+        "contentHash": "xRbKuDnoKClu/lC3fCqF5f0UqEqVI8iYJ0RN4XpUHajvcfCWYcFC46NEzaUg2Fub7hznTG9m6XNScrVHl1iaSA==",
+        "dependencies": {
+          "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.8",
+          "Microsoft.Extensions.Hosting.Abstractions": "6.0.0",
+          "Microsoft.Extensions.Logging.Abstractions": "6.0.1",
+          "Microsoft.Extensions.Options": "6.0.0"
+        }
+      },
+      "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": {
+        "type": "Transitive",
+        "resolved": "6.0.8",
+        "contentHash": "8mNPugigemlybm8f+KcwB5FOEyJ8mZ72stKvOJJqpUFYjfTjFDKFKYB2L98gru1SaxVD9akjw8OyvtbWkAEimQ=="
+      },
+      "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore": {
+        "type": "Transitive",
+        "resolved": "6.0.8",
+        "contentHash": "NfcEjGvaRyc7OjTeoCSVLlQKzSZeMb96XCuthX/Z9HbPEjXViSewyvOQPIjd6e3pQumIJgltlBRo9o6b3JQsPg==",
+        "dependencies": {
+          "Microsoft.EntityFrameworkCore.Relational": "6.0.8",
+          "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.8",
+          "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.8"
+        }
+      },
       "Microsoft.Extensions.FileProviders.Abstractions": {
         "type": "Transitive",
         "resolved": "6.0.0",
@@ -891,13 +917,12 @@
       },
       "Microsoft.Extensions.Hosting.Abstractions": {
         "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "+k4AEn68HOJat5gj1TWa6X28WlirNQO9sPIIeQbia+91n03esEtMSSoekSTpMjUzjqtJWQN3McVx0GvSPFHF/Q==",
+        "resolved": "6.0.0",
+        "contentHash": "GcT5l2CYXL6Sa27KCSh0TixsRfADUgth+ojQSD5EkzisZxmGFh7CwzkcYuGwvmXLjr27uWRNrJ2vuuEjMhU05Q==",
         "dependencies": {
-          "Microsoft.Extensions.Configuration.Abstractions": "2.2.0",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.FileProviders.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging.Abstractions": "2.2.0"
+          "Microsoft.Extensions.Configuration.Abstractions": "6.0.0",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0",
+          "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0"
         }
       },
       "Microsoft.Extensions.Logging": {
@@ -914,8 +939,8 @@
       },
       "Microsoft.Extensions.Logging.Abstractions": {
         "type": "Transitive",
-        "resolved": "6.0.0",
-        "contentHash": "/HggWBbTwy8TgebGSX5DBZ24ndhzi93sHUBDvP1IxbZD7FDokYzdAr6+vbWGjw2XAfR2EJ1sfKUotpjHnFWPxA=="
+        "resolved": "6.0.1",
+        "contentHash": "dzB2Cgg+JmrouhjkcQGzSFjjvpwlq353i8oBQO2GWNjCXSzhbtBRUf28HSauWe7eib3wYOdb3tItdjRwAdwCSg=="
       },
       "Microsoft.Extensions.Logging.ApplicationInsights": {
         "type": "Transitive",
@@ -2383,6 +2408,7 @@
           "Microsoft.AspNetCore.JsonPatch": "[6.0.8, )",
           "Microsoft.AspNetCore.Mvc.NewtonsoftJson": "[3.1.6, )",
           "Microsoft.Extensions.DependencyModel": "[3.1.6, )",
+          "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore": "[6.0.8, )",
           "Microsoft.Extensions.Logging.ApplicationInsights": "[2.15.0, )",
           "Microsoft.VisualStudio.Azure.Containers.Tools.Targets": "[1.9.10, )",
           "Microsoft.VisualStudio.Web.CodeGeneration.Design": "[3.1.0, )",
diff --git a/NotificationApi/NotificationApi/Controllers/HealthCheckController.cs b/NotificationApi/NotificationApi/Controllers/HealthCheckController.cs
deleted file mode 100644
index 0b69f934..00000000
--- a/NotificationApi/NotificationApi/Controllers/HealthCheckController.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-using System;
-using System.Net;
-using System.Reflection;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using NotificationApi.Contract.Responses;
-using NotificationApi.DAL.Models;
-using NotificationApi.DAL.Queries;
-using NotificationApi.DAL.Queries.Core;
-using NSwag.Annotations;
-
-namespace NotificationApi.Controllers
-{
-    [Produces("application/json")]
-    [AllowAnonymous]
-    [ApiController]
-    public class HealthCheckController : ControllerBase
-    {
-        private readonly IQueryHandler _queryHandler;
-        public HealthCheckController(IQueryHandler queryHandler)
-        {
-            _queryHandler = queryHandler;
-        }
-        /// <summary>
-        ///     Check Service Health
-        /// </summary>
-        /// <returns>Error if fails, otherwise OK status</returns>
-        [HttpGet("HealthCheck/health")]
-        [HttpGet("health/liveness")]
-        [OpenApiOperation("CheckServiceHealthAuth")]
-        [ProducesResponseType(typeof(HealthResponse), (int) HttpStatusCode.OK)]
-        [ProducesResponseType(typeof(HealthResponse), (int) HttpStatusCode.InternalServerError)]
-        public async Task<IActionResult> HealthAsync()
-        {
-            var response = new HealthResponse {AppVersion = GetApplicationVersion()};
-            try
-            {
-                var result = await _queryHandler.Handle<DbHealthCheckQuery, DbHealthCheckResult>(new DbHealthCheckQuery());
-                response.DatabaseHealth.Successful = result.CanConnect;
-            }
-            catch (Exception ex)
-            {
-                response.DatabaseHealth.Successful = false;
-                response.DatabaseHealth.ErrorMessage = ex.Message;
-                response.DatabaseHealth.Data = ex.Data;
-            }
-            
-            return !response.DatabaseHealth.Successful ? StatusCode((int)HttpStatusCode.InternalServerError, response) : Ok(response);
-        }
-
-        private static AppVersionResponse GetApplicationVersion()
-        {
-            var applicationVersion = new AppVersionResponse()
-            {
-                FileVersion = GetExecutingAssemblyAttribute<AssemblyFileVersionAttribute>(a => a.Version),
-                InformationVersion =
-                    GetExecutingAssemblyAttribute<AssemblyInformationalVersionAttribute>(a => a.InformationalVersion)
-            };
-            
-            return applicationVersion;
-        }
-
-        private static string GetExecutingAssemblyAttribute<T>(Func<T, string> value) where T : Attribute
-        {
-            var attribute = (T) Attribute.GetCustomAttribute(Assembly.GetExecutingAssembly(), typeof(T));
-            return value.Invoke(attribute);
-        }
-    }
-}
diff --git a/NotificationApi/NotificationApi/Extensions/ConfigureServicesExtensions.cs b/NotificationApi/NotificationApi/Extensions/ConfigureServicesExtensions.cs
index cdd0a851..7d398243 100644
--- a/NotificationApi/NotificationApi/Extensions/ConfigureServicesExtensions.cs
+++ b/NotificationApi/NotificationApi/Extensions/ConfigureServicesExtensions.cs
@@ -9,6 +9,7 @@
 using NotificationApi.Common.Configuration;
 using NotificationApi.Common.Helpers;
 using NotificationApi.Common.Security;
+using NotificationApi.DAL;
 using NotificationApi.DAL.Commands.Core;
 using NotificationApi.DAL.Queries.Core;
 using NotificationApi.Middleware.Logging;
@@ -24,7 +25,7 @@ namespace NotificationApi.Extensions
 {
     public static class ConfigureServicesExtensions
     {
-        public static IServiceCollection AddSwagger(this IServiceCollection services)
+        public static IServiceCollection AddVhSwagger(this IServiceCollection services)
         {
             services.AddSingleton<FluentValidationSchemaProcessor>();
             services.AddOpenApiDocument((document, serviceProvider) =>
diff --git a/NotificationApi/NotificationApi/Health/HealthCheckExtensions.cs b/NotificationApi/NotificationApi/Health/HealthCheckExtensions.cs
new file mode 100644
index 00000000..1aeb960b
--- /dev/null
+++ b/NotificationApi/NotificationApi/Health/HealthCheckExtensions.cs
@@ -0,0 +1,66 @@
+using System;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Diagnostics.HealthChecks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Diagnostics.HealthChecks;
+using Newtonsoft.Json;
+using NotificationApi.DAL;
+
+namespace NotificationApi.Health
+{
+    [ExcludeFromCodeCoverage]
+    public static class HealthCheckExtensions
+    {
+        public static IServiceCollection AddVhHealthChecks(this IServiceCollection services)
+        {
+            services.AddHealthChecks()
+                .AddCheck("self", () => HealthCheckResult.Healthy())
+                .AddDbContextCheck<NotificationsApiDbContext>("Database VhNotificationsApi", tags: new[] {"startup", "readiness"});
+            
+            return services;
+        }
+    
+        public static IEndpointRouteBuilder AddVhHealthCheckRouteMaps(this IEndpointRouteBuilder endpoints)
+        {
+            endpoints.MapHealthChecks("/healthcheck/liveness", new HealthCheckOptions()
+            {
+                Predicate = check => check.Tags.Contains("self"),
+                ResponseWriter = HealthCheckResponseWriter
+            });
+
+            endpoints.MapHealthChecks("/healthcheck/startup", new HealthCheckOptions()
+            {
+                Predicate = check => check.Tags.Contains("startup"),
+                ResponseWriter = HealthCheckResponseWriter
+            });
+                
+            endpoints.MapHealthChecks("/healthcheck/readiness", new HealthCheckOptions()
+            {
+                Predicate = check => check.Tags.Contains("readiness"),
+                ResponseWriter = HealthCheckResponseWriter
+            });
+
+            return endpoints;
+        }
+
+        private static async Task HealthCheckResponseWriter(HttpContext context, HealthReport report)
+        {
+            var result = JsonConvert.SerializeObject(new
+            {
+                status = report.Status.ToString(),
+                details = report.Entries.Select(e => new
+                {
+                    key = e.Key, value = Enum.GetName(typeof(HealthStatus), e.Value.Status),
+                    error = e.Value.Exception?.Message
+                })
+            });
+            context.Response.ContentType = "application/json";
+            await context.Response.WriteAsync(result);
+        }
+    }
+}
diff --git a/NotificationApi/NotificationApi/NotificationApi.csproj b/NotificationApi/NotificationApi/NotificationApi.csproj
index 1a9c55fc..4bdf08f9 100644
--- a/NotificationApi/NotificationApi/NotificationApi.csproj
+++ b/NotificationApi/NotificationApi/NotificationApi.csproj
@@ -37,6 +37,7 @@
         </PackageReference>
         <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="3.1.6" />
         <PackageReference Include="Microsoft.Extensions.Logging.ApplicationInsights" Version="2.15.0" />
+        <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="6.0.8" />
         <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.9.10" />
         <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.1.0" />
         <PackageReference Include="NSwag.AspNetCore" Version="13.18.2" />
diff --git a/NotificationApi/NotificationApi/Startup.cs b/NotificationApi/NotificationApi/Startup.cs
index a7d5cf75..9297ab8e 100644
--- a/NotificationApi/NotificationApi/Startup.cs
+++ b/NotificationApi/NotificationApi/Startup.cs
@@ -15,6 +15,7 @@
 using NotificationApi.Common.Util;
 using NotificationApi.DAL;
 using NotificationApi.Extensions;
+using NotificationApi.Health;
 using NotificationApi.Middleware.Logging;
 using NotificationApi.Middleware.Validation;
 
@@ -35,7 +36,7 @@ public void ConfigureServices(IServiceCollection services)
         {
             services.AddControllers()
                 .AddNewtonsoftJson();
-            services.AddSwagger();
+            services.AddVhSwagger();
             services.AddCors(options => options.AddPolicy("CorsPolicy",
                 builder =>
                 {
@@ -62,6 +63,8 @@ public void ConfigureServices(IServiceCollection services)
                 opt.Filters.Add(new ProducesResponseTypeAttribute(typeof(string), 500));
             });
             
+            services.AddVhHealthChecks();
+            
             services.AddValidatorsFromAssemblyContaining<IRequestModelValidatorService>();
             services.AddDbContextPool<NotificationsApiDbContext>(options =>
                 options.UseSqlServer(Configuration.GetConnectionString("VhNotificationsApi"),
@@ -146,9 +149,14 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
             app.UseMiddleware<RequestBodyLoggingMiddleware>();
             app.UseMiddleware<ExceptionMiddleware>();
 
-            app.UseEndpoints(endpoints => { endpoints.MapDefaultControllerRoute(); });
-        }
+            app.UseEndpoints(endpoints =>
+            {
+                endpoints.MapDefaultControllerRoute();
 
+                endpoints.AddVhHealthCheckRouteMaps();
+            });
+        }
+        
         private static void AddPolicies(AuthorizationOptions options)
         {
             options.DefaultPolicy = new AuthorizationPolicyBuilder()
diff --git a/NotificationApi/NotificationApi/packages.lock.json b/NotificationApi/NotificationApi/packages.lock.json
index e6df04a5..6c83ebf7 100644
--- a/NotificationApi/NotificationApi/packages.lock.json
+++ b/NotificationApi/NotificationApi/packages.lock.json
@@ -109,6 +109,17 @@
           "System.Text.Json": "4.7.2"
         }
       },
+      "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore": {
+        "type": "Direct",
+        "requested": "[6.0.8, )",
+        "resolved": "6.0.8",
+        "contentHash": "NfcEjGvaRyc7OjTeoCSVLlQKzSZeMb96XCuthX/Z9HbPEjXViSewyvOQPIjd6e3pQumIJgltlBRo9o6b3JQsPg==",
+        "dependencies": {
+          "Microsoft.EntityFrameworkCore.Relational": "6.0.8",
+          "Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.8",
+          "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.8"
+        }
+      },
       "Microsoft.Extensions.Logging.ApplicationInsights": {
         "type": "Direct",
         "requested": "[2.15.0, )",
@@ -871,6 +882,22 @@
           "System.Reflection.Emit.Lightweight": "4.3.0"
         }
       },
+      "Microsoft.Extensions.Diagnostics.HealthChecks": {
+        "type": "Transitive",
+        "resolved": "6.0.8",
+        "contentHash": "xRbKuDnoKClu/lC3fCqF5f0UqEqVI8iYJ0RN4XpUHajvcfCWYcFC46NEzaUg2Fub7hznTG9m6XNScrVHl1iaSA==",
+        "dependencies": {
+          "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.8",
+          "Microsoft.Extensions.Hosting.Abstractions": "6.0.0",
+          "Microsoft.Extensions.Logging.Abstractions": "6.0.1",
+          "Microsoft.Extensions.Options": "6.0.0"
+        }
+      },
+      "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": {
+        "type": "Transitive",
+        "resolved": "6.0.8",
+        "contentHash": "8mNPugigemlybm8f+KcwB5FOEyJ8mZ72stKvOJJqpUFYjfTjFDKFKYB2L98gru1SaxVD9akjw8OyvtbWkAEimQ=="
+      },
       "Microsoft.Extensions.FileProviders.Abstractions": {
         "type": "Transitive",
         "resolved": "6.0.0",
@@ -904,13 +931,12 @@
       },
       "Microsoft.Extensions.Hosting.Abstractions": {
         "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "+k4AEn68HOJat5gj1TWa6X28WlirNQO9sPIIeQbia+91n03esEtMSSoekSTpMjUzjqtJWQN3McVx0GvSPFHF/Q==",
+        "resolved": "6.0.0",
+        "contentHash": "GcT5l2CYXL6Sa27KCSh0TixsRfADUgth+ojQSD5EkzisZxmGFh7CwzkcYuGwvmXLjr27uWRNrJ2vuuEjMhU05Q==",
         "dependencies": {
-          "Microsoft.Extensions.Configuration.Abstractions": "2.2.0",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.FileProviders.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging.Abstractions": "2.2.0"
+          "Microsoft.Extensions.Configuration.Abstractions": "6.0.0",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0",
+          "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0"
         }
       },
       "Microsoft.Extensions.Logging": {
@@ -927,8 +953,8 @@
       },
       "Microsoft.Extensions.Logging.Abstractions": {
         "type": "Transitive",
-        "resolved": "6.0.0",
-        "contentHash": "/HggWBbTwy8TgebGSX5DBZ24ndhzi93sHUBDvP1IxbZD7FDokYzdAr6+vbWGjw2XAfR2EJ1sfKUotpjHnFWPxA=="
+        "resolved": "6.0.1",
+        "contentHash": "dzB2Cgg+JmrouhjkcQGzSFjjvpwlq353i8oBQO2GWNjCXSzhbtBRUf28HSauWe7eib3wYOdb3tItdjRwAdwCSg=="
       },
       "Microsoft.Extensions.ObjectPool": {
         "type": "Transitive",
diff --git a/charts/vh-notification-api/Chart.yaml b/charts/vh-notification-api/Chart.yaml
index c866331b..7a595c2a 100644
--- a/charts/vh-notification-api/Chart.yaml
+++ b/charts/vh-notification-api/Chart.yaml
@@ -2,7 +2,7 @@
 apiVersion: v2
 name: vh-notification-api
 home: https://github.com/hmcts/vh-notification-api
-version: 0.0.13
+version: 0.0.14
 description: Helm Chart for VH Notification API
 maintainers:
   - name: VH Devops
diff --git a/charts/vh-notification-api/values.yaml b/charts/vh-notification-api/values.yaml
index 726a5a4d..b565d9b5 100644
--- a/charts/vh-notification-api/values.yaml
+++ b/charts/vh-notification-api/values.yaml
@@ -4,10 +4,9 @@ java:
   applicationPort: 8080
   image: "sdshmctspublic.azurecr.io/vh/notification-api:latest"
   ingressHost: vh-notification-api.{{ .Values.global.environment }}.platform.hmcts.net
-  livenessDelay: 360
-  livenessPath: /healthcheck/health
-  livenessPeriod: 120
-  readinessPath: /healthcheck/health
+  livenessPath: /healthcheck/liveness
+  readinessPath: /healthcheck/readiness
+  startupPath: /healthcheck/startup
   releaseNameOverride: vh-notification-api
   replicas: 2
   keyVaults:
@@ -38,7 +37,7 @@ java:
   environment:
     ASPNETCORE_URLS: http://+:8080
     DISABLEHTTPSREDIRECTION: true
-    Logging__LogLevel__Default: debug
-    Logging__LogLevel__Microsoft: debug
-    Logging__LogLevel__System: debug
+    Logging__LogLevel__Default: warning
+    Logging__LogLevel__Microsoft: warning
+    Logging__LogLevel__System: warning
     NotifyConfiguration__Environment: "{{ lower .Values.global.environment }}"

From 26406c2b219c1cb80ffc041692b065c197e42f71 Mon Sep 17 00:00:00 2001
From: shaed-parkar <41630528+shaed-parkar@users.noreply.github.com>
Date: Tue, 19 Sep 2023 12:41:33 +0100
Subject: [PATCH 4/4] VIH-10172 add old health check route for backwards
 compatibility (#142)

---
 .../NotificationApi/Health/HealthCheckExtensions.cs         | 6 +++---
 charts/vh-notification-api/Chart.yaml                       | 2 +-
 charts/vh-notification-api/values.yaml                      | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/NotificationApi/NotificationApi/Health/HealthCheckExtensions.cs b/NotificationApi/NotificationApi/Health/HealthCheckExtensions.cs
index 1aeb960b..9d903401 100644
--- a/NotificationApi/NotificationApi/Health/HealthCheckExtensions.cs
+++ b/NotificationApi/NotificationApi/Health/HealthCheckExtensions.cs
@@ -27,19 +27,19 @@ public static IServiceCollection AddVhHealthChecks(this IServiceCollection servi
     
         public static IEndpointRouteBuilder AddVhHealthCheckRouteMaps(this IEndpointRouteBuilder endpoints)
         {
-            endpoints.MapHealthChecks("/healthcheck/liveness", new HealthCheckOptions()
+            endpoints.MapHealthChecks("/health/liveness", new HealthCheckOptions()
             {
                 Predicate = check => check.Tags.Contains("self"),
                 ResponseWriter = HealthCheckResponseWriter
             });
 
-            endpoints.MapHealthChecks("/healthcheck/startup", new HealthCheckOptions()
+            endpoints.MapHealthChecks("/health/startup", new HealthCheckOptions()
             {
                 Predicate = check => check.Tags.Contains("startup"),
                 ResponseWriter = HealthCheckResponseWriter
             });
                 
-            endpoints.MapHealthChecks("/healthcheck/readiness", new HealthCheckOptions()
+            endpoints.MapHealthChecks("/health/readiness", new HealthCheckOptions()
             {
                 Predicate = check => check.Tags.Contains("readiness"),
                 ResponseWriter = HealthCheckResponseWriter
diff --git a/charts/vh-notification-api/Chart.yaml b/charts/vh-notification-api/Chart.yaml
index 7a595c2a..f58705b2 100644
--- a/charts/vh-notification-api/Chart.yaml
+++ b/charts/vh-notification-api/Chart.yaml
@@ -2,7 +2,7 @@
 apiVersion: v2
 name: vh-notification-api
 home: https://github.com/hmcts/vh-notification-api
-version: 0.0.14
+version: 0.0.15
 description: Helm Chart for VH Notification API
 maintainers:
   - name: VH Devops
diff --git a/charts/vh-notification-api/values.yaml b/charts/vh-notification-api/values.yaml
index b565d9b5..35aace4e 100644
--- a/charts/vh-notification-api/values.yaml
+++ b/charts/vh-notification-api/values.yaml
@@ -4,9 +4,9 @@ java:
   applicationPort: 8080
   image: "sdshmctspublic.azurecr.io/vh/notification-api:latest"
   ingressHost: vh-notification-api.{{ .Values.global.environment }}.platform.hmcts.net
-  livenessPath: /healthcheck/liveness
-  readinessPath: /healthcheck/readiness
-  startupPath: /healthcheck/startup
+  livenessPath: /health/liveness
+  readinessPath: /health/readiness
+  startupPath: /health/startup
   releaseNameOverride: vh-notification-api
   replicas: 2
   keyVaults: