Merge pull request #658 from PathfinderHonorManager/develop

Even better validation

Author: brian-cummings

PathfinderHonorManager/Service/ClubService.cs

@@ -12,18 +12,16 @@
 using System.Collections.Generic;
 using System.Linq;
 using FluentValidation;
+using PathfinderHonorManager.Validators;
 
 namespace PathfinderHonorManager.Service
 {
     public class ClubService : IClubService
     {
         private readonly PathfinderContext _dbContext;
-
         private readonly IMapper _mapper;
-
         private readonly ILogger _logger;
-
-        private readonly IValidator<Incoming.ClubDto> _validator;
+        private readonly ClubValidator _validator;
 
         public ClubService(
             PathfinderContext context,
@@ -34,7 +32,7 @@ public ClubService(
             _dbContext = context;
             _mapper = mapper;
             _logger = logger;
-            _validator = validator;
+            _validator = (ClubValidator)validator;
         }
 
         public async Task<ICollection<Outgoing.ClubDto>> GetAllAsync(CancellationToken token)
@@ -92,6 +90,7 @@ public ClubService(
 
             try
             {
+                _validator.SetExcludeClubId(null);
                 await _validator.ValidateAsync(club, options => options.ThrowOnFailures().IncludeRuleSets("post"), token);
 
                 var entity = _mapper.Map<Club>(club);
@@ -125,6 +124,7 @@ public ClubService(
 
                 if (entity.ClubCode != club.ClubCode)
                 {
+                    _validator.SetExcludeClubId(id);
                     await _validator.ValidateAsync(club, options => options.ThrowOnFailures().IncludeRuleSets("post"), token);
                 }
 

PathfinderHonorManager/Validators/ClubValidator.cs

@@ -3,20 +3,27 @@
 using PathfinderHonorManager.DataAccess;
 using PathfinderHonorManager.Dto.Incoming;
 using System;
+using System.Linq;
 using System.Text.RegularExpressions;
 
 namespace PathfinderHonorManager.Validators
 {
     public class ClubValidator : AbstractValidator<ClubDto>
     {
         private readonly PathfinderContext _dbContext;
+        private Guid? _excludeClubId;
 
         public ClubValidator(PathfinderContext dbContext)
         {
             _dbContext = dbContext;
             SetUpValidation();
         }
 
+        public void SetExcludeClubId(Guid? clubId)
+        {
+            _excludeClubId = clubId;
+        }
+
         private void SetUpValidation()
         {
             RuleFor(c => c.Name)
@@ -36,7 +43,14 @@ private void SetUpValidation()
                 {
                     RuleFor(c => c.ClubCode)
                         .MustAsync(async (code, token) =>
-                            !await _dbContext.Clubs.AnyAsync(c => c.ClubCode == code, token))
+                        {
+                            var query = _dbContext.Clubs.Where(c => c.ClubCode == code);
+                            if (_excludeClubId.HasValue)
+                            {
+                                query = query.Where(c => c.ClubID != _excludeClubId.Value);
+                            }
+                            return !await query.AnyAsync(token);
+                        })
                         .WithMessage(c => $"Club code {c.ClubCode} is already in use.");
                 });
         }