Skip to content

Commit 1c6e9df

Browse files
fix(*): phone numbers regex fix
1 parent 41a6579 commit 1c6e9df

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

NorthwindCRUD/Models/Dtos/AddressDto.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public class AddressDto : IAddress
2121
[StringLength(50, ErrorMessage = "Country cannot exceed 50 characters.")]
2222
public string Country { get; set; }
2323

24-
[RegularExpression(@"^\+?[1-9]\d{1,14}$", ErrorMessage = "Phone number is not valid.")]
24+
[RegularExpression(@"^\+?\(?\d{1,5}\)?[-.\s]?\(?\d{1,5}\)?[-.\s]?\d{1,4}[-.\s]?\d{1,4}[-.\s]?\d{1,10}$", ErrorMessage = "Phone number is not valid.")]
2525
public string? Phone { get; set; }
2626
}
2727
}

NorthwindCRUD/Models/Dtos/ShipperDto.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public class ShipperDto : IShipper
1111
[StringLength(100, ErrorMessage = "Company Name cannot exceed 100 characters.")]
1212
public string CompanyName { get; set; }
1313

14-
[RegularExpression(@"^\+?[1-9]\d{1,14}$", ErrorMessage = "Phone number is not valid.")]
14+
[RegularExpression(@"^\+?\(?\d{1,5}\)?[-.\s]?\(?\d{1,5}\)?[-.\s]?\d{1,4}[-.\s]?\d{1,4}[-.\s]?\d{1,10}$", ErrorMessage = "Phone number is not valid.")]
1515
public string Phone { get; set; }
1616
}
1717
}

NorthwindCRUD/Models/Dtos/SupplierDto.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ public class SupplierDto : ISupplier
3232
[StringLength(50, ErrorMessage = "Country cannot exceed 50 characters.")]
3333
public string? Country { get; set; }
3434

35-
[RegularExpression(@"^\+?[1-9]\d{1,14}$", ErrorMessage = "Phone number is not valid.")]
35+
[RegularExpression(@"^\+?\(?\d{1,5}\)?[-.\s]?\(?\d{1,5}\)?[-.\s]?\d{1,4}[-.\s]?\d{1,4}[-.\s]?\d{1,10}$", ErrorMessage = "Phone number is not valid.")]
3636
public string? Phone { get; set; }
3737

38-
[RegularExpression(@"^\+?[1-9]\d{1,14}$", ErrorMessage = "Fax number is not valid.")]
38+
[RegularExpression(@"^\+?\(?\d{1,5}\)?[-.\s]?\(?\d{1,5}\)?[-.\s]?\d{1,4}[-.\s]?\d{1,4}[-.\s]?\d{1,10}$", ErrorMessage = "Fax number is not valid.")]
3939
public string? Fax { get; set; }
4040

4141
[RegularExpression(@"^https?:\/\/[^\s$.?#].[^\s]*$", ErrorMessage = "Home Page URL is not valid.")]

0 commit comments

Comments
 (0)