Merge pull request #691 from PathfinderHonorManager/develop

Make email field nullable on Pathfinder model

Author: brian-cummings

PathfinderHonorManager.Tests/Service/PathfinderServiceTests.cs

@@ -138,7 +138,12 @@ public async Task GetByIdAsync_ReturnsPathfinderById(string clubCode)
         public async Task AddAsync_AddsNewPathfinderAndReturnsDto(string clubCode)
         {
             // Arrange
-            var newPathfinderDto = new Incoming.PathfinderDto { /* Populate required properties */ };
+            var newPathfinderDto = new Incoming.PathfinderDto 
+            { 
+                FirstName = "Test",
+                LastName = "Pathfinder",
+                Email = "test.pathfinder@example.com"
+            };
             var cancellationToken = new CancellationToken();
 
             // Act

PathfinderHonorManager.Tests/Validator/PathfinderValidatorTests.cs

@@ -6,6 +6,7 @@
 using NUnit.Framework;
 using PathfinderHonorManager.DataAccess;
 using PathfinderHonorManager.Model;
+using PathfinderHonorManager.Tests.Helpers;
 using PathfinderHonorManager.Validators;
 using Incoming = PathfinderHonorManager.Dto.Incoming;
 
@@ -27,17 +28,18 @@ public PathfinderValidatorTests()
         protected DbContextOptions<PathfinderContext> ContextOptions { get; }
 
         [SetUp]
-        public void SetUp()
+        public async Task SetUp()
         {
             var context = new PathfinderContext(ContextOptions);
+            await DatabaseCleaner.CleanDatabase(context);
             _pathfinderValidator = new PathfinderValidator(context);
-            SeedDatabase(context);
+            await DatabaseSeeder.SeedDatabase(ContextOptions);
         }
 
-        // Email tests
-        [TestCase("")]
-        [TestCase(null)]
+        // Email tests - invalid format should fail
         [TestCase("nonemailstring")]
+        [TestCase("invalid@")]
+        [TestCase("@invalid.com")]
         public async Task Validate_InvalidEmail_ValidationError(string email)
         {
             var newPathfinder = new Incoming.PathfinderDtoInternal
@@ -58,12 +60,32 @@ public async Task Validate_InvalidEmail_ValidationError(string email)
 
         }
 
+        // Email tests - empty/null emails should be allowed
+        [TestCase("")]
+        [TestCase(null)]
+        public async Task Validate_EmptyOrNullEmail_ShouldPass(string email)
+        {
+            var newPathfinder = new Incoming.PathfinderDtoInternal
+            {
+                FirstName = "test",
+                LastName = "user",
+                Email = email
+            };
+
+            var validationResult = await _pathfinderValidator
+                .TestValidateAsync(newPathfinder, options =>
+                {
+                    options.IncludeAllRuleSets();
+                });
+
+            validationResult.ShouldNotHaveValidationErrorFor(p => p.Email);
+        }
+
         // FirstName tests
         [TestCase("")]
         [TestCase(null)]
         public async Task Validate_FirstName_ValidationError(string firstName)
         {
-            var randEmail = RandomString(10);
             var newPathfinder = new Incoming.PathfinderDtoInternal
             {
                 FirstName = firstName,
@@ -271,6 +293,23 @@ public async Task Validate_AllRulesApplied_ValidationError()
             validationResult.ShouldHaveValidationErrorFor(p => p.ClubID);
         }
 
+        [Test]
+        public async Task Validate_ValidEmail_ShouldPass()
+        {
+            var newPathfinder = new Incoming.PathfinderDtoInternal
+            {
+                FirstName = "Test",
+                LastName = "User",
+                Email = "valid@example.com",
+                ClubID = Guid.NewGuid()
+            };
+
+            var validationResult = await _pathfinderValidator
+                .TestValidateAsync(newPathfinder, options => options.IncludeRuleSets("post"));
+
+            validationResult.ShouldNotHaveValidationErrorFor(p => p.Email);
+        }
+
         [Test]
         public async Task Validate_InvalidClubId_ValidationError()
         {
@@ -355,58 +394,15 @@ public async Task Validate_EmptyGuidClubId_ShouldPass()
             validationResult.ShouldNotHaveValidationErrorFor(p => p.ClubID);
         }
 
-        public static void SeedDatabase(PathfinderContext context)
-        {
-            context.Database.EnsureDeleted();
-            context.Database.EnsureCreated();
-
-            context.Pathfinders.AddRange(
-                new Pathfinder[]
-                {
-
-                    new Pathfinder
-                        {
-                            FirstName = "test1",
-                            LastName = "pathfinder",
-                            Email = "test1@validemail.com",
-                            Created = System.DateTime.Now,
-                            Updated = System.DateTime.Now
-                        },
-                    new Pathfinder
-                        {
-                            FirstName = "test2",
-                            LastName = "pathfinder",
-                            Email = "test2@validemail.com",
-                            Created = System.DateTime.Now,
-                            Updated = System.DateTime.Now
-                        },
-                    new Pathfinder
-                        {
-                            FirstName = "test3",
-                            LastName = "pathfinder",
-                            Email = "test3@validemail.com",
-                            Created = System.DateTime.Now,
-                            Updated = System.DateTime.Now
-                        }
-                }); ;
-
-            context.SaveChangesAsync();
-        }
-        public static string RandomString(int length)
+        [TearDown]
+        public async Task TearDown()
         {
-            var chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
-            var stringChars = new char[length];
-            var random = new Random();
-
-            for (int i = 0; i < stringChars.Length; i++)
+            using (var context = new PathfinderContext(ContextOptions))
             {
-                stringChars[i] = chars[random.Next(chars.Length)];
+                await DatabaseCleaner.CleanDatabase(context);
             }
-
-            var finalString = new String(stringChars);
-
-            return finalString;
         }
+
     }
 }
 

PathfinderHonorManager/DataAccess/PathfinderDBContext.cs

@@ -35,6 +35,18 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
                 .HasForeignKey(p => p.ClubID)
                 .OnDelete(DeleteBehavior.Restrict);
 
+            modelBuilder.Entity<Pathfinder>()
+                .Property(p => p.FirstName)
+                .IsRequired();
+
+            modelBuilder.Entity<Pathfinder>()
+                .Property(p => p.LastName)
+                .IsRequired();
+
+            modelBuilder.Entity<Pathfinder>()
+                .Property(p => p.Email)
+                .IsRequired(false);
+
             // Pathfinder -> PathfinderClass: Restrict (nullable relationship already)
             modelBuilder.Entity<Pathfinder>()
                 .HasOne(p => p.PathfinderClass)

PathfinderHonorManager/Dto/Incoming/PathfinderDto.cs

@@ -1,4 +1,5 @@
-using System;
+#nullable enable
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Diagnostics.CodeAnalysis;
@@ -9,13 +10,12 @@ namespace PathfinderHonorManager.Dto.Incoming
     public class PathfinderDto
     {
         [Required]
-        public string FirstName { get; set; }
+        public string FirstName { get; set; } = null!;
 
         [Required]
-        public string LastName { get; set; }
+        public string LastName { get; set; } = null!;
 
-        [Required]
-        public string Email { get; set; }
+        public string? Email { get; set; }
 
         public int? Grade { get; set; }
 
@@ -43,7 +43,7 @@ public class PutPathfinderDto
     public class BulkPutPathfinderDto
     {
         [Required]
-        public IEnumerable<BulkPutPathfinderItemDto> Items { get; set; }
+        public IEnumerable<BulkPutPathfinderItemDto> Items { get; set; } = null!;
     }
 
     [ExcludeFromCodeCoverage]

PathfinderHonorManager/Dto/Outgoing/PathfinderDto.cs

@@ -14,7 +14,7 @@ public class PathfinderDto
 
         public string LastName { get; set; } = null!;
 
-        public string Email { get; set; } = null!;
+        public string? Email { get; set; }
 
         public int? Grade { get; set; }
 
@@ -36,7 +36,7 @@ public class PathfinderDependantDto
 
         public string LastName { get; set; } = null!;
 
-        public string Email { get; set; } = null!;
+        public string? Email { get; set; }
 
         public int? Grade { get; set; }