feat: Added additional identifier validation on negative numbers of the correct length for each type

Author: WolfyUK

web/src/Web.App/Validators/OrganisationIdentifierValidator.cs

@@ -23,21 +23,24 @@ public OrganisationIdentifierValidator()
 
         RuleFor(p => p.Value)
             .Length(6)
+            .Must(p => p.All(char.IsDigit))
             .When(p => p.Type == OrganisationTypes.School)
             .When(p => p.ValueAsInt != null)
-            .WithMessage("School URN must be 6 characters");
+            .Configure(rule => rule.MessageBuilder = _ => "School URN must be 6 digits");
 
         RuleFor(p => p.Value)
             .Length(8)
+            .Must(p => p.All(char.IsDigit))
             .When(p => p.Type == OrganisationTypes.Trust)
             .When(p => p.ValueAsInt != null)
-            .WithMessage("Trust company number must be 8 characters");
+            .Configure(rule => rule.MessageBuilder = _ => "Trust company number must be 8 digits");
 
         RuleFor(p => p.Value)
             .Length(3)
+            .Must(p => p.All(char.IsDigit))
             .When(p => p.Type == OrganisationTypes.LocalAuthority)
             .When(p => p.ValueAsInt != null)
-            .WithMessage("Local authority code must be 3 characters");
+            .Configure(rule => rule.MessageBuilder = _ => "Local authority code must be 3 digits");
 
         RuleFor(p => p.ValueAsInt)
             .NotEmpty()

web/tests/Web.Tests/Validators/GivenAnOrganisationIdentifierValidator.cs

@@ -72,6 +72,7 @@ public void ShouldFailValidationIfIdentifierInvalid(string type)
 
     [Theory]
     [InlineData("1234")]
+    [InlineData("-12345")]
     public void ShouldFailValidationIfUrnInvalid(string urn)
     {
         var identifier = new OrganisationIdentifier
@@ -82,7 +83,7 @@ public void ShouldFailValidationIfUrnInvalid(string urn)
 
         string[] expected =
         [
-            "School URN must be 6 characters"
+            "School URN must be 6 digits"
         ];
 
         var results = _validator.Validate(identifier);
@@ -94,6 +95,7 @@ public void ShouldFailValidationIfUrnInvalid(string urn)
 
     [Theory]
     [InlineData("1234")]
+    [InlineData("-1234567")]
     public void ShouldFailValidationIfCompanyNumberInvalid(string companyNumber)
     {
         var identifier = new OrganisationIdentifier
@@ -104,7 +106,7 @@ public void ShouldFailValidationIfCompanyNumberInvalid(string companyNumber)
 
         string[] expected =
         [
-            "Trust company number must be 8 characters"
+            "Trust company number must be 8 digits"
         ];
 
         var results = _validator.Validate(identifier);
@@ -116,6 +118,7 @@ public void ShouldFailValidationIfCompanyNumberInvalid(string companyNumber)
 
     [Theory]
     [InlineData("1234")]
+    [InlineData("-12")]
     public void ShouldFailValidationIfLaCodeInvalid(string code)
     {
         var identifier = new OrganisationIdentifier
@@ -126,7 +129,7 @@ public void ShouldFailValidationIfLaCodeInvalid(string code)
 
         string[] expected =
         [
-            "Local authority code must be 3 characters"
+            "Local authority code must be 3 digits"
         ];
 
         var results = _validator.Validate(identifier);