Merge pull request #94 from Brixel/email-phone-validation

fix: Change validation to require either email or phone number, not both
Brixel · Sep 13, 2022 · 9a602c3 · 9a602c3
2 parents f3c6ef3 + 16716fb
commit 9a602c3
Show file tree

Hide file tree

Showing 10 changed files with 458 additions and 48 deletions.
diff --git a/Commands/Handlers/Member/AddMember/AddMemberCommand.cs b/Commands/Handlers/Member/AddMember/AddMemberCommand.cs
@@ -27,12 +27,12 @@ public AddMemberCommandValidator()
            .MaximumLength(50);
 
         RuleFor(x => x.Email)
-           .NotEmpty()
+           .NotEmpty().When(x => string.IsNullOrWhiteSpace(x.PhoneNumber))
            .MaximumLength(100)
            .EmailAddress();
 
         RuleFor(x => x.PhoneNumber)
-           .NotEmpty()
+           .NotEmpty().When(x => string.IsNullOrWhiteSpace(x.Email))
            .MaximumLength(50);
 
         RuleFor(x => x.Address)

diff --git a/Commands/Handlers/Member/EditMember/EditMemberCommand.cs b/Commands/Handlers/Member/EditMember/EditMemberCommand.cs
@@ -28,11 +28,12 @@ public EditMemberCommandValidator()
            .MaximumLength(50);
 
         RuleFor(x => x.Email)
-           .NotEmpty()
-           .MaximumLength(100);
+           .NotEmpty().When(x => string.IsNullOrWhiteSpace(x.PhoneNumber))
+           .MaximumLength(100)
+           .EmailAddress();
 
         RuleFor(x => x.PhoneNumber)
-           .NotEmpty()
+           .NotEmpty().When(x => string.IsNullOrWhiteSpace(x.Email))
            .MaximumLength(50);
 
         RuleFor(x => x.Address)

diff --git a/Domain/Member.cs b/Domain/Member.cs
@@ -60,8 +60,8 @@ private Member() { } // Make EFCore happy
     public Guid Id { get; private set; }
     public string FirstName { get; private set; }
     public string LastName { get; private set; }
-    public string Email { get; private set; }
-    public string PhoneNumber { get; private set; }
+    public string? Email { get; private set; }
+    public string? PhoneNumber { get; private set; }
     public Address Address { get; private set; }
     public DateTimeOffset? MembershipExpiryDate { get; private set; }
     public double MembershipFee { get; private set; }

diff --git a/Persistence/Migrations/20220909211334_MakeMemberEmailAndPhoneNullable.Designer.cs b/Persistence/Migrations/20220909211334_MakeMemberEmailAndPhoneNullable.Designer.cs