v3.11.0-beta0

.vscode/tasks.json

@@ -11,7 +11,7 @@
             "type": "process",
             "args": [
                 "build",
-                "${workspaceFolder}/src/Gameboard.Api/Gameboard.Api.csproj",
+                "${workspaceFolder}/src",
                 "/property:GenerateFullPaths=true",
                 "/consoleloggerparameters:NoSummary"
             ],
@@ -165,6 +165,7 @@
                 "ef",
                 "database",
                 "update",
+                "--verbose",
                 "--project",
                 "${workspaceFolder}/src/Gameboard.Api",
                 "--context",

src/Gameboard.Api.Tests.Integration/Fixtures/Auth/TestAuthenticationHandler.cs

@@ -1,6 +1,5 @@
 using System.Security.Claims;
 using System.Text.Encodings.Web;
-using Gameboard.Api;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
@@ -31,11 +30,12 @@ protected override Task<AuthenticateResult> HandleAuthenticateAsync()
     {
         var claims = new List<Claim>
         {
-            new Claim(ClaimTypes.Name, _actingUser.Name),
-            new Claim(ClaimTypes.NameIdentifier, _actingUser.Id),
-            new Claim(AppConstants.SubjectClaimName, _actingUser.Id),
-            new Claim(AppConstants.ApprovedNameClaimName, _actingUser.Name),
-            new Claim(AppConstants.RoleListClaimName, _actingUser.Role.ToString())
+            new(ClaimTypes.Name, _actingUser.Name),
+            new(ClaimTypes.NameIdentifier, _actingUser.Id),
+            new(AppConstants.SubjectClaimName, _actingUser.Id),
+            new(AppConstants.ApprovedNameClaimName, _actingUser.Name),
+            new(AppConstants.RoleListClaimName, _actingUser.Role.ToString()),
+            new(AppConstants.SponsorClaimName, _actingUser.SponsorId)
         };
 
         var identity = new ClaimsIdentity(claims, AuthScheme.Name);

src/Gameboard.Api.Tests.Integration/Fixtures/Auth/TestAuthenticationUser.cs

@@ -9,4 +9,5 @@ internal class TestAuthenticationUser
     public string Id { get; set; } = DEFAULT_USERID;
     public string Name { get; set; } = "";
     public UserRole Role { get; set; } = UserRole.Member;
+    public string SponsorId { get; set; } = string.Empty;
 }

src/Gameboard.Api.Tests.Integration/Fixtures/Builders/DataStateBuilder.cs

@@ -1,29 +1,42 @@
 using Gameboard.Api.Data;
+using Gameboard.Api.Tests.Shared;
 
 namespace Gameboard.Api.Tests.Integration.Fixtures;
 
+public interface IDataStateBuilder
+{
+    IDataStateBuilder Add<TEntity>(IFixture fixture) where TEntity : class, IEntity;
+    IDataStateBuilder Add<TEntity>(IFixture fixture, Action<TEntity> entityBuilder) where TEntity : class, IEntity;
+    IDataStateBuilder Add<TEntity>(TEntity entity, Action<TEntity>? entityBuilder = null) where TEntity : class, IEntity;
+    IDataStateBuilder AddRange<TEntity>(ICollection<TEntity> entities) where TEntity : class, IEntity;
+}
+
 internal class DataStateBuilder : IDataStateBuilder
 {
     private readonly GameboardDbContext _DbContext;
 
     public DataStateBuilder(GameboardDbContext dbContext) => _DbContext = dbContext;
 
-    public IDataStateBuilder Add<TEntity>(TEntity entity, Action<TEntity>? entityBuilder = null) where TEntity : class, IEntity
+    public IDataStateBuilder Add<TEntity>(IFixture fixture) where TEntity : class, IEntity
+        => Add<TEntity>(fixture, null);
+
+    public IDataStateBuilder Add<TEntity>(IFixture fixture, Action<TEntity>? entityBuilder) where TEntity : class, IEntity
     {
+        var entity = fixture.Create<TEntity>() ?? throw new GbAutomatedTestSetupException($"The test fixture can't create entity of type {typeof(TEntity)}");
         entityBuilder?.Invoke(entity);
+        _DbContext.Add(entity);
 
-        try
-        {
-            _DbContext.Add(entity);
-        }
-        catch (Exception ex)
-        {
-            System.Diagnostics.Debug.WriteLine($"ex:{ex.Message}");
-        }
         return this;
     }
 
-    public IDataStateBuilder AddRange<TEntity>(IEnumerable<TEntity> entities) where TEntity : class, IEntity
+    public IDataStateBuilder Add<TEntity>(TEntity entity, Action<TEntity>? entityBuilder = null) where TEntity : class, IEntity
+    {
+        entityBuilder?.Invoke(entity);
+        _DbContext.Add(entity);
+        return this;
+    }
+
+    public IDataStateBuilder AddRange<TEntity>(ICollection<TEntity> entities) where TEntity : class, IEntity
     {
         foreach (var entity in entities)
             Add(entity);

src/Gameboard.Api.Tests.Integration/Fixtures/Builders/TeamBuilderOptions.cs

@@ -1,4 +1,4 @@
-using Gameboard.Api.Tests.Shared;
+using Gameboard.Api.Common;
 
 namespace Gameboard.Api.Tests.Integration.Fixtures;
 

src/Gameboard.Api.Tests.Integration/Fixtures/Builders/TeamBuilderResult.cs

@@ -1,12 +1,8 @@
-using Gameboard.Api;
-
 namespace Gameboard.Api.Tests.Integration.Fixtures;
 
 public class TeamBuilderResult
 {
     public required string TeamId { get; set; }
-    public required Api.Data.Challenge? Challenge { get; set; }
-    public required Api.Data.Game Game { get; set; }
-    public required Api.Data.Player Manager { get; set; }
-    public required IEnumerable<Api.Data.Player> Players { get; set; }
+    public required Data.Game Game { get; set; }
+    public required Data.Player Manager { get; set; }
 }

src/Gameboard.Api.Tests.Integration/Fixtures/Extensions/DefaultEntityExtensions.cs

@@ -1,4 +1,5 @@
-using Gameboard.Api.Tests.Shared;
+using Gameboard.Api.Common;
+using Gameboard.Api.Data;
 
 namespace Gameboard.Api.Tests.Integration.Fixtures;
 
@@ -13,203 +14,23 @@ private static T BuildEntity<T>(T entity, Action<T>? builder = null) where T : c
     // eventually will replace these with registrations in the customization (like the integration test project does)
     private static string GenerateTestGuid() => Guid.NewGuid().ToString("n");
 
-    public static void AddChallengeSpec(this IDataStateBuilder dataStateBuilder, Action<Data.ChallengeSpec>? specBuilder = null)
-        => dataStateBuilder.Add(BuildChallengeSpec(dataStateBuilder, specBuilder));
+    public static TEntity Build<TEntity>(this IDataStateBuilder dataStateBuilder, IFixture fixture) where TEntity : class, IEntity
+        => Build<TEntity>(dataStateBuilder, fixture, null);
 
-    public static Data.ChallengeSpec BuildChallengeSpec(this IDataStateBuilder dataStateBuilder, Action<Data.ChallengeSpec>? specBuilder = null)
-        => BuildEntity
-        (
-            new Data.ChallengeSpec
-            {
-                Id = GenerateTestGuid(),
-                Game = BuildGame(dataStateBuilder),
-                Name = "Integration Test Challenge Spec",
-                AverageDeploySeconds = 1,
-                Points = 50,
-                X = 0,
-                Y = 0,
-                R = 1
-            },
-            specBuilder
-        );
+    public static TEntity Build<TEntity>(this IDataStateBuilder dataStateBuilder, IFixture fixture, Action<TEntity>? entityBuilder) where TEntity : class, IEntity
+    {
+        var entity = fixture.Create<TEntity>();
+        entityBuilder?.Invoke(entity);
+        return entity;
+    }
 
     public static void AddChallenge(this IDataStateBuilder dataStateBuilder, Action<Data.Challenge>? challengeBuilder = null)
         => dataStateBuilder.Add(BuildChallenge(dataStateBuilder, challengeBuilder));
 
     public static Data.Challenge BuildChallenge(this IDataStateBuilder dataStateBuilder, Action<Data.Challenge>? challengeBuilder = null)
         => BuildEntity
         (
-            new Data.Challenge
-            {
-                Name = "Integration Test Challenge",
-            },
+            new Data.Challenge { Name = "Integration Test Challenge" },
             challengeBuilder
         );
-
-    public static void AddGame(this IDataStateBuilder dataStateBuilder, Action<Data.Game>? gameBuilder = null)
-        => dataStateBuilder.Add(BuildGame(dataStateBuilder, gameBuilder));
-
-    public static Data.Game BuildGame(this IDataStateBuilder dataStateBuilder, Action<Data.Game>? gameBuilder = null)
-        => BuildEntity
-        (
-            new Data.Game
-            {
-                Id = GenerateTestGuid(),
-                Name = "Test game",
-                Competition = "Test competition",
-                Season = "1",
-                Track = "Individual",
-                Sponsor = "Test Sponsor",
-                GameStart = DateTimeOffset.UtcNow,
-                GameEnd = DateTime.UtcNow + TimeSpan.FromDays(30),
-                RegistrationOpen = DateTimeOffset.UtcNow,
-                RegistrationClose = DateTime.UtcNow + TimeSpan.FromDays(30),
-                RegistrationType = Gameboard.Api.GameRegistrationType.Open,
-            },
-            gameBuilder
-        );
-
-    public static void AddPlayer(this IDataStateBuilder dataStateBuilder, Action<Data.Player>? playerBuilder = null)
-        => dataStateBuilder.Add(BuildPlayer(dataStateBuilder, playerBuilder));
-
-    public static Data.Player BuildPlayer(this IDataStateBuilder dataStateBuilder, Action<Data.Player>? playerBuilder = null)
-    {
-        // TODO: this is potentially urky if the testing dev sets userid but not user's id
-        var userId = GenerateTestGuid();
-
-        return BuildEntity
-        (
-            new Data.Player
-            {
-                Id = GenerateTestGuid(),
-                TeamId = GenerateTestGuid(),
-                ApprovedName = "Integration Test Player",
-                Sponsor = "Integration Test Sponsor",
-                Role = Gameboard.Api.PlayerRole.Manager,
-                User = new Data.User { Id = userId },
-                UserId = userId
-            },
-            playerBuilder
-        );
-    }
-
-    /// <summary>
-    /// Creates a team with a challenge, and players dictated by the options parameter.
-    /// </summary>
-    /// <param name="dataStateBuilder"></param>
-    /// <param name="fixture"></param>
-    /// <param name="optsBuilder"></param>
-    /// <returns></returns>
-    public static TeamBuilderResult AddTeam(this IDataStateBuilder dataStateBuilder, IFixture fixture, Action<TeamBuilderOptions> optsBuilder)
-    {
-        var options = new TeamBuilderOptions
-        {
-            Challenge = new SimpleEntity { Id = fixture.Create<string>(), Name = fixture.Create<string>() },
-            Name = fixture.Create<string>(),
-            NumPlayers = 5,
-            GameBuilder = g => { },
-            TeamId = fixture.Create<string>()
-        };
-
-        optsBuilder.Invoke(options);
-
-        // fill out properties
-        var teamName = string.IsNullOrWhiteSpace(options.Name) ? fixture.Create<string>() : options.Name;
-
-        var game = new Api.Data.Game
-        {
-            Id = fixture.Create<string>(),
-            // just to avoid obnoxious overconfig on the other end
-            RegistrationClose = DateTimeOffset.UtcNow.AddYears(1),
-            RegistrationOpen = DateTimeOffset.UtcNow.AddYears(-1),
-            RegistrationType = Api.GameRegistrationType.Open
-        };
-
-        options.GameBuilder?.Invoke(game);
-
-        Data.Challenge? challenge = null;
-        if (options.Challenge != null)
-        {
-            var specId = fixture.Create<string>();
-            challenge = new Api.Data.Challenge
-            {
-                Id = options.Challenge.Id,
-                Name = options.Challenge.Name,
-                Game = game,
-                SpecId = specId,
-                TeamId = options.TeamId
-            };
-
-            dataStateBuilder.AddChallengeSpec(spec =>
-            {
-                spec.Id = specId;
-                spec.Name = fixture.Create<string>();
-            });
-        }
-
-        // create players
-        var players = new List<Data.Player>();
-
-        for (var i = 0; i < options.NumPlayers; i++)
-        {
-            var createManager = i == 0;
-            var player = new Data.Player
-            {
-                Id = fixture.Create<string>(),
-                ApprovedName = teamName,
-                Name = teamName,
-                Role = createManager ? Api.PlayerRole.Manager : Api.PlayerRole.Member,
-                TeamId = options.TeamId,
-                User = new Data.User { Id = fixture.Create<string>() },
-                Challenges = challenge != null ? new List<Api.Data.Challenge> { challenge } : new Api.Data.Challenge[] { },
-                Game = game
-            };
-
-            players.Add(player);
-        }
-        dataStateBuilder.AddRange(players);
-
-        return new TeamBuilderResult
-        {
-            Challenge = challenge,
-            Game = game,
-            TeamId = options.TeamId,
-            Manager = players.Single(p => p.Role == Api.PlayerRole.Manager),
-            Players = players,
-        };
-    }
-
-    public static IDataStateBuilder AddUser(this IDataStateBuilder dataStateBuilder, Action<Data.User>? userBuilder = null)
-        => dataStateBuilder.Add(BuildUser(dataStateBuilder, userBuilder));
-
-    public static Data.User BuildUser(this IDataStateBuilder dataStateBuilder, Action<Data.User>? userBuilder = null)
-        => BuildEntity
-        (
-            new Data.User
-            {
-                Id = GenerateTestGuid(),
-                Username = "integrationtester",
-                Email = "integration@test.com",
-                Name = "integrationtester",
-                ApprovedName = "integrationtester",
-                Sponsor = "SEI",
-                Role = Api.UserRole.Member
-            },
-            userBuilder
-        );
-
-    public static IEnumerable<Data.Player> BuildTeam(this IDataStateBuilder builder, int teamSize = 5, Action<Data.Player>? playerBuilder = null)
-    {
-        var team = new List<Data.Player>();
-        var teamId = GenerateTestGuid();
-
-        for (var i = 0; i < teamSize; i++)
-        {
-            var player = BuildPlayer(builder, p => p.TeamId = teamId);
-            playerBuilder?.Invoke(player);
-            team.Add(player);
-        }
-
-        return team;
-    }
 }

src/Gameboard.Api.Tests.Integration/Fixtures/Extensions/GameboardTestContextExtensions.cs

@@ -1,5 +1,4 @@
 using System.Net.Http.Headers;
-using Gameboard.Api.Data;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc.Testing;
 using Microsoft.AspNetCore.TestHost;

src/Gameboard.Api.Tests.Integration/Fixtures/Services/TestGameEngineService.cs

@@ -121,7 +121,7 @@ public Task<GameEngineGameState> RegradeChallenge(Api.Data.Challenge entity)
         return Task.FromResult(new GameEngineGameState());
     }
 
-    public Task<GameEngineGameState> StartGamespace(Api.Data.Challenge entity)
+    public Task<GameEngineGameState> StartGamespace(GameEngineGamespaceStartRequest request)
     {
         return Task.FromResult(new GameEngineGameState());
     }

src/Gameboard.Api.Tests.Integration/Tests/Features/ChallengeBonuses/ChallengeBonusControllerManualTests.cs

@@ -15,21 +15,27 @@ public ChallengeBonusControllerManualTests(GameboardTestContext testContext)
     }
 
     [Theory, GbIntegrationAutoData]
-    public async Task AddManual_WithValidData_Succeeds(string challengeId, string userId, string description, double pointsValue)
+    public async Task AddManual_WithValidData_Succeeds(string challengeId, string userId, string description, double pointsValue, IFixture fixture)
     {
         // given
         await _testContext.WithDataState(state =>
         {
-            state.AddUser(u =>
+            state.Add<Data.User>(fixture, u =>
             {
                 u.Id = userId;
                 u.Role = UserRole.Support;
             });
 
-            state.AddChallenge(c =>
-            {
-                c.Id = challengeId;
-            });
+            state.Add<Data.Challenge>(fixture, c => c.Id = challengeId);
+            // state.AddUser(u =>
+            // {
+
+            // });
+
+            // state.AddChallenge(c =>
+            // {
+            //     c.Id = challengeId;
+            // });
         });
 
         var bonus = new CreateManualChallengeBonus