feat: Add LastModifiedByUserId and related properties to MapRotations for better tracking of changes

frasermolyneux · frasermolyneux · commit b2ca8339ef9f · 2026-04-11T10:59:22.000+01:00
diff --git a/src/XtremeIdiots.Portal.Repository.Abstractions.V1/Constants/V1/MapRotationsOrder.cs b/src/XtremeIdiots.Portal.Repository.Abstractions.V1/Constants/V1/MapRotationsOrder.cs
@@ -13,5 +13,7 @@ public enum MapRotationsOrder
     CreatedAtAsc,
     CreatedAtDesc,
     UpdatedAtAsc,
-    UpdatedAtDesc
+    UpdatedAtDesc,
+    CreatedByAsc,
+    CreatedByDesc
 }
diff --git a/src/XtremeIdiots.Portal.Repository.Abstractions.V1/Interfaces/V1/IMapRotationsApi.cs b/src/XtremeIdiots.Portal.Repository.Abstractions.V1/Interfaces/V1/IMapRotationsApi.cs
@@ -10,6 +10,7 @@ public interface IMapRotationsApi
     Task<ApiResult<MapRotationDto>> GetMapRotation(Guid mapRotationId, CancellationToken cancellationToken = default);
     Task<ApiResult<CollectionModel<MapRotationDto>>> GetMapRotations(GameType[]? gameTypes, string? gameMode, MapRotationsFilter? filter, int skipEntries, int takeEntries, MapRotationsOrder? order, CancellationToken cancellationToken = default);
     Task<ApiResult<CollectionModel<MapRotationDto>>> GetMapRotations(GameType[]? gameTypes, string? gameMode, MapRotationStatus? status, string? filterString, MapRotationsFilter? filter, int skipEntries, int takeEntries, MapRotationsOrder? order, CancellationToken cancellationToken = default);
+    Task<ApiResult<CollectionModel<MapRotationDto>>> GetMapRotations(GameType[]? gameTypes, string? gameMode, MapRotationStatus? status, string? filterString, Guid? createdByUserId, MapRotationsFilter? filter, int skipEntries, int takeEntries, MapRotationsOrder? order, CancellationToken cancellationToken = default);
     Task<ApiResult<MapRotationDto>> CreateMapRotation(CreateMapRotationDto createMapRotationDto, CancellationToken cancellationToken = default);
     Task<ApiResult> UpdateMapRotation(UpdateMapRotationDto updateMapRotationDto, CancellationToken cancellationToken = default);
     Task<ApiResult> DeleteMapRotation(Guid mapRotationId, CancellationToken cancellationToken = default);
diff --git a/src/XtremeIdiots.Portal.Repository.Abstractions.V1/Models/V1/MapRotations/MapRotationDto.cs b/src/XtremeIdiots.Portal.Repository.Abstractions.V1/Models/V1/MapRotations/MapRotationDto.cs
@@ -57,6 +57,12 @@ public MapRotationDto(Guid mapRotationId, GameType gameType, string title, strin
     [JsonProperty]
     public string? CreatedByDisplayName { get; set; }
 
+    [JsonProperty]
+    public Guid? LastModifiedByUserId { get; set; }
+
+    [JsonProperty]
+    public string? LastModifiedByDisplayName { get; set; }
+
     [JsonProperty]
     public DateTime CreatedAt { get; set; }
 
diff --git a/src/XtremeIdiots.Portal.Repository.Abstractions.V1/Models/V1/MapRotations/UpdateMapRotationDto.cs b/src/XtremeIdiots.Portal.Repository.Abstractions.V1/Models/V1/MapRotations/UpdateMapRotationDto.cs
@@ -35,6 +35,9 @@ public UpdateMapRotationDto(Guid mapRotationId)
     [JsonProperty]
     public List<Guid>? MapIds { get; set; }
 
+    [JsonProperty]
+    public Guid? LastModifiedByUserId { get; set; }
+
     [JsonIgnore]
     public Dictionary<string, string> TelemetryProperties => [];
 }
diff --git a/src/XtremeIdiots.Portal.Repository.Api.Client.Testing/Fakes/FakeMapRotationsApi.cs b/src/XtremeIdiots.Portal.Repository.Api.Client.Testing/Fakes/FakeMapRotationsApi.cs
@@ -55,6 +55,19 @@ public Task<ApiResult<CollectionModel<MapRotationDto>>> GetMapRotations(GameType
         return Task.FromResult(new ApiResult<CollectionModel<MapRotationDto>>(HttpStatusCode.OK, new ApiResponse<CollectionModel<MapRotationDto>>(collection)));
     }
 
+    public Task<ApiResult<CollectionModel<MapRotationDto>>> GetMapRotations(GameType[]? gameTypes, string? gameMode, MapRotationStatus? status, string? filterString, Guid? createdByUserId, MapRotationsFilter? filter, int skipEntries, int takeEntries, MapRotationsOrder? order, CancellationToken cancellationToken = default)
+    {
+        var items = _mapRotations.Values.AsEnumerable();
+        if (gameTypes != null) items = items.Where(mr => gameTypes.Contains(mr.GameType));
+        if (gameMode != null) items = items.Where(mr => mr.GameMode == gameMode);
+        if (status.HasValue) items = items.Where(mr => mr.Status == status.Value);
+        if (!string.IsNullOrWhiteSpace(filterString)) items = items.Where(mr => mr.Title.Contains(filterString, StringComparison.OrdinalIgnoreCase));
+        if (createdByUserId.HasValue) items = items.Where(mr => mr.CreatedByUserId == createdByUserId.Value);
+        var list = items.Skip(skipEntries).Take(takeEntries).ToList();
+        var collection = new CollectionModel<MapRotationDto> { Items = list };
+        return Task.FromResult(new ApiResult<CollectionModel<MapRotationDto>>(HttpStatusCode.OK, new ApiResponse<CollectionModel<MapRotationDto>>(collection)));
+    }
+
     public Task<ApiResult<MapRotationDto>> CreateMapRotation(CreateMapRotationDto createMapRotationDto, CancellationToken cancellationToken = default)
     {
         var dto = new MapRotationDto(Guid.NewGuid(), createMapRotationDto.GameType, createMapRotationDto.Title, createMapRotationDto.Description, createMapRotationDto.GameMode, 1, null, DateTime.UtcNow, DateTime.UtcNow, [], []);
diff --git a/src/XtremeIdiots.Portal.Repository.Api.Client.V1/Api/V1/MapRotationsApi.cs b/src/XtremeIdiots.Portal.Repository.Api.Client.V1/Api/V1/MapRotationsApi.cs
@@ -80,6 +80,39 @@ public async Task<ApiResult<CollectionModel<MapRotationDto>>> GetMapRotations(Ga
             return response.ToApiResult<CollectionModel<MapRotationDto>>();
         }
 
+        public async Task<ApiResult<CollectionModel<MapRotationDto>>> GetMapRotations(GameType[]? gameTypes, string? gameMode, MapRotationStatus? status, string? filterString, Guid? createdByUserId, MapRotationsFilter? filter, int skipEntries, int takeEntries, MapRotationsOrder? order, CancellationToken cancellationToken = default)
+        {
+            var request = await CreateRequestAsync("v1/map-rotations", Method.Get).ConfigureAwait(false);
+
+            if (gameTypes != null)
+                request.AddQueryParameter("gameTypes", string.Join(",", gameTypes));
+
+            if (gameMode != null)
+                request.AddQueryParameter("gameMode", gameMode);
+
+            if (status.HasValue)
+                request.AddQueryParameter("status", status.ToString());
+
+            if (!string.IsNullOrWhiteSpace(filterString))
+                request.AddQueryParameter("filterString", filterString);
+
+            if (createdByUserId.HasValue)
+                request.AddQueryParameter("createdByUserId", createdByUserId.ToString());
+
+            if (filter.HasValue)
+                request.AddQueryParameter("filter", filter.ToString());
+
+            request.AddQueryParameter("skipEntries", skipEntries.ToString());
+            request.AddQueryParameter("takeEntries", takeEntries.ToString());
+
+            if (order.HasValue)
+                request.AddQueryParameter("order", order.ToString());
+
+            var response = await ExecuteAsync(request, cancellationToken).ConfigureAwait(false);
+
+            return response.ToApiResult<CollectionModel<MapRotationDto>>();
+        }
+
         public async Task<ApiResult<MapRotationDto>> CreateMapRotation(CreateMapRotationDto createMapRotationDto, CancellationToken cancellationToken = default)
         {
             var request = await CreateRequestAsync("v1/map-rotations", Method.Post).ConfigureAwait(false);
diff --git a/src/XtremeIdiots.Portal.Repository.Api.V1/Controllers/V1/MapRotationsController.cs b/src/XtremeIdiots.Portal.Repository.Api.V1/Controllers/V1/MapRotationsController.cs
@@ -85,6 +85,7 @@ public async Task<IActionResult> GetMapRotations(
             [FromQuery] string? gameMode = null,
             [FromQuery] MapRotationStatus? status = null,
             [FromQuery] string? filterString = null,
+            [FromQuery] Guid? createdByUserId = null,
             [FromQuery] MapRotationsFilter? filter = null,
             [FromQuery] int skipEntries = 0,
             [FromQuery] int takeEntries = 20,
@@ -107,7 +108,7 @@ public async Task<IActionResult> GetMapRotations(
                 gameTypesFilter = parsed.ToArray();
             }
 
-            var response = await ((IMapRotationsApi)this).GetMapRotations(gameTypesFilter, gameMode, status, filterString, filter, skipEntries, takeEntries, order, cancellationToken).ConfigureAwait(false);
+            var response = await ((IMapRotationsApi)this).GetMapRotations(gameTypesFilter, gameMode, status, filterString, createdByUserId, filter, skipEntries, takeEntries, order, cancellationToken).ConfigureAwait(false);
             return response.ToHttpResult();
         }
 
@@ -131,7 +132,7 @@ async Task<ApiResult<CollectionModel<MapRotationDto>>> IMapRotationsApi.GetMapRo
             MapRotationsOrder? order,
             CancellationToken cancellationToken)
         {
-            return await ((IMapRotationsApi)this).GetMapRotations(gameTypes, gameMode, null, null, filter, skipEntries, takeEntries, order, cancellationToken).ConfigureAwait(false);
+            return await ((IMapRotationsApi)this).GetMapRotations(gameTypes, gameMode, null, null, null, filter, skipEntries, takeEntries, order, cancellationToken).ConfigureAwait(false);
         }
 
         async Task<ApiResult<CollectionModel<MapRotationDto>>> IMapRotationsApi.GetMapRotations(
@@ -144,19 +145,35 @@ async Task<ApiResult<CollectionModel<MapRotationDto>>> IMapRotationsApi.GetMapRo
             int takeEntries,
             MapRotationsOrder? order,
             CancellationToken cancellationToken)
+        {
+            return await ((IMapRotationsApi)this).GetMapRotations(gameTypes, gameMode, status, filterString, null, filter, skipEntries, takeEntries, order, cancellationToken).ConfigureAwait(false);
+        }
+
+        async Task<ApiResult<CollectionModel<MapRotationDto>>> IMapRotationsApi.GetMapRotations(
+            GameType[]? gameTypes,
+            string? gameMode,
+            MapRotationStatus? status,
+            string? filterString,
+            Guid? createdByUserId,
+            MapRotationsFilter? filter,
+            int skipEntries,
+            int takeEntries,
+            MapRotationsOrder? order,
+            CancellationToken cancellationToken)
         {
             var baseQuery = context.MapRotations.AsNoTracking();
 
             var totalCount = await baseQuery.CountAsync(cancellationToken).ConfigureAwait(false);
 
-            var filteredQuery = ApplyFilters(baseQuery, gameTypes, gameMode, status, filterString, filter);
+            var filteredQuery = ApplyFilters(baseQuery, gameTypes, gameMode, status, filterString, createdByUserId, filter);
             var filteredCount = await filteredQuery.CountAsync(cancellationToken).ConfigureAwait(false);
 
             var orderedQuery = ApplyOrderingAndPagination(filteredQuery, skipEntries, takeEntries, order);
             var results = await orderedQuery
                 .Include(mr => mr.MapRotationMaps)
                 .Include(mr => mr.MapRotationServerAssignments)
                 .Include(mr => mr.CreatedByUser)
+                .Include(mr => mr.LastModifiedByUser)
                 .AsSplitQuery()
                 .ToListAsync(cancellationToken).ConfigureAwait(false);
 
@@ -773,7 +790,7 @@ async Task<ApiResult> IMapRotationsApi.UpdateAssignmentOperation(Guid operationI
 
         // ───────────────────────── Private Helpers ─────────────────────────
 
-        private static IQueryable<MapRotation> ApplyFilters(IQueryable<MapRotation> query, GameType[]? gameTypes, string? gameMode, MapRotationStatus? status, string? filterString, MapRotationsFilter? filter)
+        private static IQueryable<MapRotation> ApplyFilters(IQueryable<MapRotation> query, GameType[]? gameTypes, string? gameMode, MapRotationStatus? status, string? filterString, Guid? createdByUserId, MapRotationsFilter? filter)
         {
             if (gameTypes?.Length > 0)
             {
@@ -797,6 +814,11 @@ private static IQueryable<MapRotation> ApplyFilters(IQueryable<MapRotation> quer
                 query = query.Where(mr => mr.Title.Contains(filterString) || (mr.Description != null && mr.Description.Contains(filterString)));
             }
 
+            if (createdByUserId.HasValue)
+            {
+                query = query.Where(mr => mr.CreatedByUserId == createdByUserId.Value);
+            }
+
             return filter switch
             {
                 MapRotationsFilter.HasActiveAssignments => query.Where(mr => mr.MapRotationServerAssignments.Any(a => a.DeploymentState != (int)DeploymentState.Removed)),
@@ -822,6 +844,8 @@ private static IQueryable<MapRotation> ApplyOrderingAndPagination(IQueryable<Map
                 MapRotationsOrder.CreatedAtDesc => query.OrderByDescending(mr => mr.CreatedAt),
                 MapRotationsOrder.UpdatedAtAsc => query.OrderBy(mr => mr.UpdatedAt),
                 MapRotationsOrder.UpdatedAtDesc => query.OrderByDescending(mr => mr.UpdatedAt),
+                MapRotationsOrder.CreatedByAsc => query.OrderBy(mr => mr.CreatedByUser != null ? mr.CreatedByUser.DisplayName : ""),
+                MapRotationsOrder.CreatedByDesc => query.OrderByDescending(mr => mr.CreatedByUser != null ? mr.CreatedByUser.DisplayName : ""),
                 _ => query.OrderBy(mr => mr.Title)
             };
 
diff --git a/src/XtremeIdiots.Portal.Repository.Api.V1/Mapping/MapRotationsMappingExtensions.cs b/src/XtremeIdiots.Portal.Repository.Api.V1/Mapping/MapRotationsMappingExtensions.cs
@@ -37,7 +37,9 @@ public static MapRotationDto ToDto(this MapRotation entity, bool expand = true)
                 Category = entity.Category,
                 SequenceOrder = entity.SequenceOrder,
                 CreatedByUserId = entity.CreatedByUserId,
-                CreatedByDisplayName = entity.CreatedByUser?.DisplayName
+                CreatedByDisplayName = entity.CreatedByUser?.DisplayName,
+                LastModifiedByUserId = entity.LastModifiedByUserId,
+                LastModifiedByDisplayName = entity.LastModifiedByUser?.DisplayName
             };
         }
 
@@ -72,6 +74,7 @@ public static void ApplyTo(this UpdateMapRotationDto dto, MapRotation entity)
             if (dto.Status.HasValue) entity.Status = (int)dto.Status.Value;
             if (dto.Category is not null) entity.Category = dto.Category;
             if (dto.SequenceOrder.HasValue) entity.SequenceOrder = dto.SequenceOrder.Value;
+            if (dto.LastModifiedByUserId.HasValue) entity.LastModifiedByUserId = dto.LastModifiedByUserId.Value;
 
             entity.UpdatedAt = DateTime.UtcNow;
         }
diff --git a/src/XtremeIdiots.Portal.Repository.DataLib/MapRotation.cs b/src/XtremeIdiots.Portal.Repository.DataLib/MapRotation.cs
@@ -39,14 +39,20 @@ public partial class MapRotation
 
     public Guid? CreatedByUserId { get; set; }
 
+    public Guid? LastModifiedByUserId { get; set; }
+
     public DateTime CreatedAt { get; set; }
 
     public DateTime UpdatedAt { get; set; }
 
     [ForeignKey("CreatedByUserId")]
-    [InverseProperty("MapRotations")]
+    [InverseProperty("MapRotationCreatedByUsers")]
     public virtual UserProfile? CreatedByUser { get; set; }
 
+    [ForeignKey("LastModifiedByUserId")]
+    [InverseProperty("MapRotationLastModifiedByUsers")]
+    public virtual UserProfile? LastModifiedByUser { get; set; }
+
     [InverseProperty("MapRotation")]
     public virtual ICollection<MapRotationMap> MapRotationMaps { get; set; } = new List<MapRotationMap>();
 
diff --git a/src/XtremeIdiots.Portal.Repository.DataLib/PortalDbContext.cs b/src/XtremeIdiots.Portal.Repository.DataLib/PortalDbContext.cs
@@ -226,9 +226,11 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
             entity.Property(e => e.UpdatedAt).HasDefaultValueSql("SYSUTCDATETIME()");
             entity.Property(e => e.Version).HasDefaultValue(1);
 
-            entity.HasOne(d => d.CreatedByUser).WithMany(p => p.MapRotations)
+            entity.HasOne(d => d.CreatedByUser).WithMany(p => p.MapRotationCreatedByUsers)
                 .OnDelete(DeleteBehavior.SetNull)
                 .HasConstraintName("FK_dbo.MapRotations_dbo.UserProfiles_CreatedByUserId");
+
+            entity.HasOne(d => d.LastModifiedByUser).WithMany(p => p.MapRotationLastModifiedByUsers).HasConstraintName("FK_dbo.MapRotations_dbo.UserProfiles_LastModifiedByUserId");
         });
 
         modelBuilder.Entity<MapRotationAssignmentOperation>(entity =>
diff --git a/src/XtremeIdiots.Portal.Repository.DataLib/UserProfile.cs b/src/XtremeIdiots.Portal.Repository.DataLib/UserProfile.cs
@@ -49,7 +49,10 @@ public partial class UserProfile
     public virtual ICollection<Demo> Demos { get; set; } = new List<Demo>();
 
     [InverseProperty("CreatedByUser")]
-    public virtual ICollection<MapRotation> MapRotations { get; set; } = new List<MapRotation>();
+    public virtual ICollection<MapRotation> MapRotationCreatedByUsers { get; set; } = new List<MapRotation>();
+
+    [InverseProperty("LastModifiedByUser")]
+    public virtual ICollection<MapRotation> MapRotationLastModifiedByUsers { get; set; } = new List<MapRotation>();
 
     [InverseProperty("UserProfile")]
     public virtual ICollection<NotificationPreference> NotificationPreferences { get; set; } = new List<NotificationPreference>();
diff --git a/src/XtremeIdiots.Portal.Repository.Database/dbo/Tables/MapRotations.sql b/src/XtremeIdiots.Portal.Repository.Database/dbo/Tables/MapRotations.sql
@@ -11,10 +11,12 @@ CREATE TABLE [dbo].[MapRotations]
     [Version] INT NOT NULL DEFAULT 1,
     [ContentHash] NVARCHAR(64) NULL,
     [CreatedByUserId] UNIQUEIDENTIFIER NULL,
+    [LastModifiedByUserId] UNIQUEIDENTIFIER NULL,
     [CreatedAt] DATETIME2 NOT NULL DEFAULT SYSUTCDATETIME(),
     [UpdatedAt] DATETIME2 NOT NULL DEFAULT SYSUTCDATETIME(),
     CONSTRAINT [PK_dbo.MapRotations] PRIMARY KEY CLUSTERED ([MapRotationId] ASC),
-    CONSTRAINT [FK_dbo.MapRotations_dbo.UserProfiles_CreatedByUserId] FOREIGN KEY ([CreatedByUserId]) REFERENCES [dbo].[UserProfiles] ([UserProfileId]) ON DELETE SET NULL
+    CONSTRAINT [FK_dbo.MapRotations_dbo.UserProfiles_CreatedByUserId] FOREIGN KEY ([CreatedByUserId]) REFERENCES [dbo].[UserProfiles] ([UserProfileId]) ON DELETE SET NULL,
+    CONSTRAINT [FK_dbo.MapRotations_dbo.UserProfiles_LastModifiedByUserId] FOREIGN KEY ([LastModifiedByUserId]) REFERENCES [dbo].[UserProfiles] ([UserProfileId]) ON DELETE NO ACTION
 )
 
 GO

Original file line number	Diff line number	Diff line change
`@@ -13,5 +13,7 @@ public enum MapRotationsOrder`
`13`	`13`	`CreatedAtAsc,`
`14`	`14`	`CreatedAtDesc,`
`15`	`15`	`UpdatedAtAsc,`
`16`		`- UpdatedAtDesc`
	`16`	`+ UpdatedAtDesc,`
	`17`	`+ CreatedByAsc,`
	`18`	`+ CreatedByDesc`
`17`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,9 @@ public UpdateMapRotationDto(Guid mapRotationId)`
`35`	`35`	`[JsonProperty]`
`36`	`36`	`public List<Guid>? MapIds { get; set; }`
`37`	`37`
	`38`	`+ [JsonProperty]`
	`39`	`+ public Guid? LastModifiedByUserId { get; set; }`
	`40`	`+`
`38`	`41`	`[JsonIgnore]`
`39`	`42`	`public Dictionary<string, string> TelemetryProperties => [];`
`40`	`43`	`}`