TD-4624 error message to describe exactly what’s allowed

Author: sherif-olaboye

DigitalLearningSolutions.Web.Tests/Controllers/TrackingSystem/Delegates/EditDelegateControllerTests.cs

@@ -175,9 +175,11 @@ public void Index_post_returns_view_with_model_error_with_invalid_prn()
                 result.As<ViewResult>().Model.Should().BeOfType<EditDelegateViewModel>();
                 AssertModelStateErrorIsExpected(
                     result,
-                    "Invalid professional registration number format. Accepted formats are: 1–2 letters followed by 6 digits (e.g., AB123456)" +
-                    " 4–8 digits only " + "Optional ‘P’ followed by 5–6 digits ‘C’ or ‘P’ followed by 6 digits " +
-                    "Optional letter followed by 5–6 digits ‘L’ followed by 4–6 digits 2 digits, hyphen, then 4–5 alphanumeric characters"
+                    "Invalid professional registration number format. " +
+        "Valid formats include: 7 digits (e.g., 1234567), 1–2 letters followed by 6 digits (e.g., AB123456), " +
+        "4–8 digits, an optional 'P' plus 5–6 digits, 'C' or 'P' plus 6 digits, " +
+        "an optional letter plus 5–6 digits, 'L' plus 4–6 digits, " +
+        "or 2 digits followed by a hyphen and 4–5 alphanumeric characters (e.g., 12-AB123)."
 
                 );
                 A.CallTo(() => userService.GetDelegateById(A<int>._)).MustNotHaveHappened();

DigitalLearningSolutions.Web.Tests/Helpers/ProfessionalRegistrationNumberHelperTests.cs

@@ -110,23 +110,29 @@ public void ValidateProfessionalRegistrationNumber_sets_error_when_hasPrn_is_not
         [TestCase("1234", "Professional registration number must be between 5 and 20 characters")]
         [TestCase(
             "01234_",
-          "Invalid professional registration number format. Accepted formats are: 1–2 letters followed by 6 digits (e.g., AB123456)" +
-                    " 4–8 digits only " + "Optional ‘P’ followed by 5–6 digits ‘C’ or ‘P’ followed by 6 digits " +
-                    "Optional letter followed by 5–6 digits ‘L’ followed by 4–6 digits 2 digits, hyphen, then 4–5 alphanumeric characters"
+         "Invalid professional registration number format. " +
+        "Valid formats include: 7 digits (e.g., 1234567), 1–2 letters followed by 6 digits (e.g., AB123456), " +
+        "4–8 digits, an optional 'P' plus 5–6 digits, 'C' or 'P' plus 6 digits, " +
+        "an optional letter plus 5–6 digits, 'L' plus 4–6 digits, " +
+        "or 2 digits followed by a hyphen and 4–5 alphanumeric characters (e.g., 12-AB123)."
 
         )]
         [TestCase(
             "01234 ",
-           "Invalid professional registration number format. Accepted formats are: 1–2 letters followed by 6 digits (e.g., AB123456)" +
-                    " 4–8 digits only " + "Optional ‘P’ followed by 5–6 digits ‘C’ or ‘P’ followed by 6 digits " +
-                    "Optional letter followed by 5–6 digits ‘L’ followed by 4–6 digits 2 digits, hyphen, then 4–5 alphanumeric characters"
+          "Invalid professional registration number format. " +
+        "Valid formats include: 7 digits (e.g., 1234567), 1–2 letters followed by 6 digits (e.g., AB123456), " +
+        "4–8 digits, an optional 'P' plus 5–6 digits, 'C' or 'P' plus 6 digits, " +
+        "an optional letter plus 5–6 digits, 'L' plus 4–6 digits, " +
+        "or 2 digits followed by a hyphen and 4–5 alphanumeric characters (e.g., 12-AB123)."
 
         )]
         [TestCase(
             "01234$",
-           "Invalid professional registration number format. Accepted formats are: 1–2 letters followed by 6 digits (e.g., AB123456)" +
-                    " 4–8 digits only " + "Optional ‘P’ followed by 5–6 digits ‘C’ or ‘P’ followed by 6 digits " +
-                    "Optional letter followed by 5–6 digits ‘L’ followed by 4–6 digits 2 digits, hyphen, then 4–5 alphanumeric characters"
+          "Invalid professional registration number format. " +
+        "Valid formats include: 7 digits (e.g., 1234567), 1–2 letters followed by 6 digits (e.g., AB123456), " +
+        "4–8 digits, an optional 'P' plus 5–6 digits, 'C' or 'P' plus 6 digits, " +
+        "an optional letter plus 5–6 digits, 'L' plus 4–6 digits, " +
+        "or 2 digits followed by a hyphen and 4–5 alphanumeric characters (e.g., 12-AB123)."
 
         )]
         public void ValidateProfessionalRegistrationNumber_sets_error_when_prn_is_invalid(

DigitalLearningSolutions.Web/Helpers/ProfessionalRegistrationNumberHelper.cs

@@ -58,9 +58,11 @@ public static void ValidateProfessionalRegistrationNumber(
             {
                 modelState.AddModelError(
                     "ProfessionalRegistrationNumber",
-                    "Invalid professional registration number format. Accepted formats are: 1–2 letters followed by 6 digits (e.g., AB123456)"+
-                    " 4–8 digits only "+"Optional ‘P’ followed by 5–6 digits ‘C’ or ‘P’ followed by 6 digits "+
-                    "Optional letter followed by 5–6 digits ‘L’ followed by 4–6 digits 2 digits, hyphen, then 4–5 alphanumeric characters"
+                   "Invalid professional registration number format. " +
+        "Valid formats include: 7 digits (e.g., 1234567), 1–2 letters followed by 6 digits (e.g., AB123456), " +
+        "4–8 digits, an optional 'P' plus 5–6 digits, 'C' or 'P' plus 6 digits, " +
+        "an optional letter plus 5–6 digits, 'L' plus 4–6 digits, " +
+        "or 2 digits followed by a hyphen and 4–5 alphanumeric characters (e.g., 12-AB123)."
                 );
             }
         }