Kwality changes

PathfinderHonorManager.Tests/Validator/PathfinderValidatorTests.cs

@@ -271,6 +271,90 @@ public async Task Validate_AllRulesApplied_ValidationError()
             validationResult.ShouldHaveValidationErrorFor(p => p.ClubID);
         }
 
+        [Test]
+        public async Task Validate_InvalidClubId_ValidationError()
+        {
+            using (var context = new PathfinderContext(ContextOptions))
+            {
+                var newPathfinder = new Incoming.PathfinderDtoInternal
+                {
+                    FirstName = "Test",
+                    LastName = "User",
+                    Email = "test@example.com",
+                    ClubID = Guid.NewGuid()
+                };
+
+                var validationResult = await _pathfinderValidator
+                    .TestValidateAsync(newPathfinder, options => options.IncludeRuleSets("update"));
+
+                validationResult.ShouldHaveValidationErrorFor(p => p.ClubID)
+                    .WithErrorMessage("New club ID must be valid if provided");
+            }
+        }
+
+        [Test]
+        public async Task Validate_ValidClubIdInUpdate_ShouldPass()
+        {
+            using (var context = new PathfinderContext(ContextOptions))
+            {
+                var club = new Club
+                {
+                    ClubID = Guid.NewGuid(),
+                    Name = "Test Club",
+                    ClubCode = "TEST"
+                };
+                await context.Clubs.AddAsync(club);
+                await context.SaveChangesAsync();
+
+                var newPathfinder = new Incoming.PathfinderDtoInternal
+                {
+                    FirstName = "Test",
+                    LastName = "User",
+                    Email = "test@example.com",
+                    ClubID = club.ClubID
+                };
+
+                var validationResult = await _pathfinderValidator
+                    .TestValidateAsync(newPathfinder, options => options.IncludeRuleSets("update"));
+
+                validationResult.ShouldNotHaveValidationErrorFor(p => p.ClubID);
+            }
+        }
+
+        [Test]
+        public async Task Validate_NullClubId_ShouldPass()
+        {
+            var newPathfinder = new Incoming.PathfinderDtoInternal
+            {
+                FirstName = "Test",
+                LastName = "User",
+                Email = "test@example.com",
+                ClubID = null
+            };
+
+            var validationResult = await _pathfinderValidator
+                .TestValidateAsync(newPathfinder, options => options.IncludeRuleSets("update"));
+
+            validationResult.ShouldNotHaveValidationErrorFor(p => p.ClubID);
+        }
+
+        [Test]
+        public async Task Validate_EmptyGuidClubId_ShouldPass()
+        {
+            var newPathfinder = new Incoming.PathfinderDtoInternal
+            {
+                FirstName = "Test",
+                LastName = "User",
+                Email = "test@example.com",
+                ClubID = Guid.Empty
+            };
+
+            var validationResult = await _pathfinderValidator
+                .TestValidateAsync(newPathfinder, options => options.IncludeRuleSets("update"));
+
+            validationResult.ShouldNotHaveValidationErrorFor(p => p.ClubID);
+        }
+
         public static void SeedDatabase(PathfinderContext context)
         {
             context.Database.EnsureDeleted();

PathfinderHonorManager/Controllers/ClubController.cs

@@ -26,16 +26,13 @@ public class ClubsController : CustomApiController
     {
         private readonly IClubService _clubService;
         private readonly ILogger<ClubsController> _logger;
-        private readonly IValidator<ClubDto> _validator;
 
         public ClubsController(
             IClubService clubService, 
-            ILogger<ClubsController> logger,
-            IValidator<ClubDto> validator)
+            ILogger<ClubsController> logger)
         {
             _clubService = clubService;
             _logger = logger;
-            _validator = validator;
         }
 
         // GET Clubs

PathfinderHonorManager/Service/PathfinderService.cs

@@ -136,7 +136,7 @@ await _validator.ValidateAsync(
             catch (Exception ex)
             {
                 _logger.LogError(ex, "Error adding pathfinder for club {ClubCode}", clubCode);
-                throw;
+                throw new InvalidOperationException($"Failed to add pathfinder for club {clubCode}", ex);
             }
         }
 
@@ -205,7 +205,7 @@ await _validator.ValidateAsync(
             catch (Exception ex)
             {
                 _logger.LogError(ex, "Error updating pathfinder with ID {PathfinderId} for club {ClubCode}", pathfinderId, clubCode);
-                throw;
+                throw new InvalidOperationException($"Failed to update pathfinder {pathfinderId} for club {clubCode}", ex);
             }
         }
 
@@ -253,7 +253,7 @@ await _validator.ValidateAsync(
                     catch (Exception ex)
                     {
                         _logger.LogError(ex, "Error updating pathfinder with ID {PathfinderId} during bulk update for club {ClubCode}", item.PathfinderId, clubCode);
-                        throw;
+                        throw new InvalidOperationException($"Failed to update pathfinder {item.PathfinderId} during bulk update for club {clubCode}", ex);
                     }
                 }
             }