From caf16bda48753e39d343722588e383802f51d77a Mon Sep 17 00:00:00 2001 From: adelikat Date: Wed, 6 Jul 2022 17:13:19 -0500 Subject: [PATCH] API - subs - add additional authors and publication id, pubs - add additional authors --- TASVideos.Api/Extensions/EntityExtensions.cs | 9 +++++++-- TASVideos.Api/Responses/PublicationsResponse.cs | 3 +++ TASVideos.Api/Responses/SubmissionsResponse.cs | 6 ++++++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/TASVideos.Api/Extensions/EntityExtensions.cs b/TASVideos.Api/Extensions/EntityExtensions.cs index 76b173864..2936ff089 100644 --- a/TASVideos.Api/Extensions/EntityExtensions.cs +++ b/TASVideos.Api/Extensions/EntityExtensions.cs @@ -47,6 +47,7 @@ public static IQueryable ToPublicationsResponse(this IQuer RerecordCount = p.RerecordCount, SystemFrameRate = p.SystemFrameRate!.FrameRate, MovieFileName = p.MovieFileName, + AdditionalAuthors = p.AdditionalAuthors, Authors = p.Authors .OrderBy(pa => pa.Ordinal) .Select(a => a.Author!.UserName), @@ -66,6 +67,9 @@ public static IQueryable ToSubmissionsResponse(this IQuerya return query.Select(s => new SubmissionsResponse { Id = s.Id, + PublicationId = s.Publication != null + ? s.Publication.Id + : null, Title = s.Title, IntendedClass = s.IntendedClass != null ? s.IntendedClass.Name @@ -100,8 +104,9 @@ public static IQueryable ToSubmissionsResponse(this IQuerya EmulatorVersion = s.EmulatorVersion, MovieStartType = s.MovieStartType, Authors = s.SubmissionAuthors - .OrderBy(s => s.Ordinal) - .Select(a => a.Author!.UserName) + .OrderBy(a => a.Ordinal) + .Select(a => a.Author!.UserName), + AdditionalAuthors = s.AdditionalAuthors }); } } diff --git a/TASVideos.Api/Responses/PublicationsResponse.cs b/TASVideos.Api/Responses/PublicationsResponse.cs index 187a9de74..1e2420361 100644 --- a/TASVideos.Api/Responses/PublicationsResponse.cs +++ b/TASVideos.Api/Responses/PublicationsResponse.cs @@ -50,6 +50,9 @@ public class PublicationsResponse [Sortable] public string MovieFileName { get; init; } = ""; + [Sortable] + public string? AdditionalAuthors { get; init; } + public IEnumerable Authors { get; init; } = Array.Empty(); public IEnumerable Tags { get; init; } = Array.Empty(); public IEnumerable Flags { get; init; } = Array.Empty(); diff --git a/TASVideos.Api/Responses/SubmissionsResponse.cs b/TASVideos.Api/Responses/SubmissionsResponse.cs index 254ef6d83..951e4fbed 100644 --- a/TASVideos.Api/Responses/SubmissionsResponse.cs +++ b/TASVideos.Api/Responses/SubmissionsResponse.cs @@ -9,6 +9,9 @@ public class SubmissionsResponse [Sortable] public int Id { get; init; } + [Sortable] + public int? PublicationId { get; init; } + [Sortable] public string Title { get; init; } = ""; @@ -66,5 +69,8 @@ public class SubmissionsResponse [Sortable] public int? MovieStartType { get; init; } + [Sortable] + public string? AdditionalAuthors { get; init; } + public IEnumerable Authors { get; init; } = new List(); }