MateuszSkoczek/WatchIt
1
0
Fork 0
Code Issues Pull Requests Actions Projects Wiki Activity

new ordering system added

Browse Source
This commit is contained in:
Mateusz Skoczek
2024-09-29 23:00:32 +02:00
Unverified
parent 69937f13e6
commit 450e4a2f94
19 changed files with 275 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
WatchIt.Common/WatchIt.Common.Model/Genres/GenreQueryParameters.cs
View File

@@ -21,9 +21,9 @@ public class GenreQueryParameters : QueryParameters<GenreResponse>
public override bool IsMeetingConditions(GenreResponse item) =>
(
TestString(item.Name, Name)
TestStringWithRegex(item.Name, Name)
&&
TestString(item.Description, Description)
TestStringWithRegex(item.Description, Description)
);
#endregion

12
WatchIt.Common/WatchIt.Common.Model/Genres/GenreResponse.cs
View File

@@ -1,12 +1,22 @@
using System.Diagnostics.CodeAnalysis;
using System.Text.Json.Serialization;
using WatchIt.Common.Query;
namespace WatchIt.Common.Model.Genres;
public class GenreResponse : Genre
public class GenreResponse : Genre, IQueryOrderable<GenreResponse>
{
#region PROPERTIES
[JsonIgnore]
public static IDictionary<string, Func<GenreResponse, IComparable>> OrderableProperties { get; } = new Dictionary<string, Func<GenreResponse, IComparable>>
{
{ "id", x => x.Id },
{ "name", x => x.Name },
{ "description", x => x.Description }
};
[JsonPropertyName("id")]
public long Id { get; set; }

84
WatchIt.Common/WatchIt.Common.Model/Media/MediaQueryParameters.cs Normal file
View File

@@ -0,0 +1,84 @@
using Microsoft.AspNetCore.Mvc;
using WatchIt.Common.Query;
namespace WatchIt.Common.Model.Media;
public class MediaQueryParameters : QueryParameters<MediaResponse>
{
#region PROPERTIES
[FromQuery(Name = "type")]
public MediaType? Type { get; set; }
[FromQuery(Name = "title")]
public string? Title { get; set; }
[FromQuery(Name = "original_title")]
public string? OriginalTitle { get; set; }
[FromQuery(Name = "description")]
public string? Description { get; set; }
[FromQuery(Name = "release_date")]
public DateOnly? ReleaseDate { get; set; }
[FromQuery(Name = "release_date_from")]
public DateOnly? ReleaseDateFrom { get; set; }
[FromQuery(Name = "release_date_to")]
public DateOnly? ReleaseDateTo { get; set; }
[FromQuery(Name = "length")]
public short? Length { get; set; }
[FromQuery(Name = "length_from")]
public short? LengthFrom { get; set; }
[FromQuery(Name = "length_to")]
public short? LengthTo { get; set; }
[FromQuery(Name = "rating_average")]
public double? RatingAverage { get; set; }
[FromQuery(Name = "rating_average_from")]
public double? RatingAverageFrom { get; set; }
[FromQuery(Name = "rating_average_to")]
public double? RatingAverageTo { get; set; }
[FromQuery(Name = "rating_count")]
public double? RatingCount { get; set; }
[FromQuery(Name = "rating_count_from")]
public double? RatingCountFrom { get; set; }
[FromQuery(Name = "rating_count_to")]
public double? RatingCountTo { get; set; }
#endregion
#region PUBLIC METHODS
public override bool IsMeetingConditions(MediaResponse item) =>
(
Test(item.Type, Type)
&&
TestStringWithRegex(item.Title, Title)
&&
TestStringWithRegex(item.OriginalTitle, OriginalTitle)
&&
TestStringWithRegex(item.Description, Description)
&&
TestComparable(item.ReleaseDate, ReleaseDate, ReleaseDateFrom, ReleaseDateTo)
&&
TestComparable(item.Length, Length, LengthFrom, LengthTo)
&&
TestComparable(item.Rating.Average, RatingAverage, RatingAverageFrom, RatingAverageTo)
&&
TestComparable(item.Rating.Count, RatingCount, RatingCountFrom, RatingCountTo)
);
#endregion
}

22
WatchIt.Common/WatchIt.Common.Model/Media/MediaResponse.cs
View File

@@ -1,17 +1,36 @@
using System.Diagnostics.CodeAnalysis;
using System.Text.Json.Serialization;
using WatchIt.Common.Model.Rating;
using WatchIt.Common.Query;
namespace WatchIt.Common.Model.Media;
public class MediaResponse : Media
public class MediaResponse : Media, IQueryOrderable<MediaResponse>
{
#region PROPERTIES
[JsonIgnore]
public static IDictionary<string, Func<MediaResponse, IComparable>> OrderableProperties { get; } = new Dictionary<string, Func<MediaResponse, IComparable>>
{
{ "id", x => x.Id },
{ "title", x => x.Title },
{ "original_title", x => x.OriginalTitle },
{ "description", x => x.Description },
{ "release_date", x => x.ReleaseDate },
{ "length", x => x.Length },
{ "rating.average", x => x.Rating.Average },
{ "rating.count", x => x.Rating.Count }
};
[JsonPropertyName("id")]
public long Id { get; set; }
[JsonPropertyName("type")]
public MediaType Type { get; set; }
[JsonPropertyName("rating")]
public RatingResponse Rating { get; set; }
#endregion
@@ -32,6 +51,7 @@ public class MediaResponse : Media
ReleaseDate = media.ReleaseDate;
Length = media.Length;
Type = mediaType;
Rating = new RatingResponse(media.RatingMedia);
}
#endregion

28
WatchIt.Common/WatchIt.Common.Model/Movies/MovieQueryParameters.cs
View File

@@ -43,6 +43,24 @@ public class MovieQueryParameters : QueryParameters<MovieResponse>
[FromQuery(Name = "budget_to")]
public decimal? BudgetTo { get; set; }
[FromQuery(Name = "rating_average")]
public double? RatingAverage { get; set; }
[FromQuery(Name = "rating_average_from")]
public double? RatingAverageFrom { get; set; }
[FromQuery(Name = "rating_average_to")]
public double? RatingAverageTo { get; set; }
[FromQuery(Name = "rating_count")]
public double? RatingCount { get; set; }
[FromQuery(Name = "rating_count_from")]
public double? RatingCountFrom { get; set; }
[FromQuery(Name = "rating_count_to")]
public double? RatingCountTo { get; set; }
#endregion
@@ -51,17 +69,21 @@ public class MovieQueryParameters : QueryParameters<MovieResponse>
public override bool IsMeetingConditions(MovieResponse item) =>
(
TestString(item.Title, Title)
TestStringWithRegex(item.Title, Title)
&&
TestString(item.OriginalTitle, OriginalTitle)
TestStringWithRegex(item.OriginalTitle, OriginalTitle)
&&
TestString(item.Description, Description)
TestStringWithRegex(item.Description, Description)
&&
TestComparable(item.ReleaseDate, ReleaseDate, ReleaseDateFrom, ReleaseDateTo)
&&
TestComparable(item.Length, Length, LengthFrom, LengthTo)
&&
TestComparable(item.Budget, Budget, BudgetFrom, BudgetTo)
&&
TestComparable(item.Rating.Average, RatingAverage, RatingAverageFrom, RatingAverageTo)
&&
TestComparable(item.Rating.Count, RatingCount, RatingCountFrom, RatingCountTo)
);
#endregion

23
WatchIt.Common/WatchIt.Common.Model/Movies/MovieResponse.cs
View File

@@ -1,15 +1,35 @@
using System.Diagnostics.CodeAnalysis;
using System.Text.Json.Serialization;
using WatchIt.Common.Model.Rating;
using WatchIt.Common.Query;
using WatchIt.Database.Model.Media;
namespace WatchIt.Common.Model.Movies;
public class MovieResponse : Movie
public class MovieResponse : Movie, IQueryOrderable<MovieResponse>
{
#region PROPERTIES
[JsonIgnore]
public static IDictionary<string, Func<MovieResponse, IComparable>> OrderableProperties { get; } = new Dictionary<string, Func<MovieResponse, IComparable>>
{
{ "id", x => x.Id },
{ "title", x => x.Title },
{ "original_title", x => x.OriginalTitle },
{ "description", x => x.Description },
{ "release_date", x => x.ReleaseDate },
{ "length", x => x.Length },
{ "budget", x => x.Budget },
{ "rating.average", x => x.Rating.Average },
{ "rating.count", x => x.Rating.Count }
};
[JsonPropertyName("id")]
public long Id { get; set; }
[JsonPropertyName("rating")]
public RatingResponse Rating { get; set; }
#endregion
@@ -30,6 +50,7 @@ public class MovieResponse : Movie
ReleaseDate = mediaMovie.Media.ReleaseDate;
Length = mediaMovie.Media.Length;
Budget = mediaMovie.Budget;
Rating = new RatingResponse(mediaMovie.Media.RatingMedia);
}
#endregion

8
WatchIt.Common/WatchIt.Common.Model/Photos/PhotoQueryParameters.cs
View File

@@ -1,5 +1,7 @@
using System.Text.Json.Serialization;
using Microsoft.AspNetCore.Mvc;
using WatchIt.Common.Model.Media;
using WatchIt.Common.Model.Series;
using WatchIt.Common.Query;
namespace WatchIt.Common.Model.Photos;
@@ -34,11 +36,11 @@ public class PhotoQueryParameters : QueryParameters<PhotoResponse>
public override bool IsMeetingConditions(PhotoResponse item) =>
(
TestString(item.MimeType, MimeType)
TestStringWithRegex(item.MimeType, MimeType)
&&
TestBoolean(item.Background is not null, IsBackground)
Test(item.Background is not null, IsBackground)
&&
TestBoolean(item.Background is not null && item.Background.IsUniversalBackground, IsUniversalBackground)
Test(item.Background is not null && item.Background.IsUniversalBackground, IsUniversalBackground)
&&
TestComparable(item.UploadDate, UploadDate, UploadDateFrom, UploadDateTo)
);

14
WatchIt.Common/WatchIt.Common.Model/Photos/PhotoResponse.cs
View File

@@ -1,13 +1,25 @@
using System.Diagnostics.CodeAnalysis;
using System.Text.Json.Serialization;
using WatchIt.Common.Query;
using WatchIt.Database.Model.Media;
namespace WatchIt.Common.Model.Photos;
public class PhotoResponse : Photo
public class PhotoResponse : Photo, IQueryOrderable<PhotoResponse>
{
#region PROPERTIES
[JsonIgnore]
public static IDictionary<string, Func<PhotoResponse, IComparable>> OrderableProperties { get; } = new Dictionary<string, Func<PhotoResponse, IComparable>>
{
{ "id", x => x.Id },
{ "media_id", x => x.MediaId },
{ "mime_type", x => x.MimeType },
{ "is_background", x => x.Background is not null },
{ "is_universal_background", x => x.Background is not null && x.Background.IsUniversalBackground }
};
[JsonPropertyName("id")]
public Guid Id { get; set; }

18
WatchIt.Common/WatchIt.Common.Model/Rating/RatingResponse.cs
View File

@@ -1,5 +1,6 @@
using System.Diagnostics.CodeAnalysis;
using System.Text.Json.Serialization;
using WatchIt.Database.Model.Rating;
namespace WatchIt.Common.Model.Rating;
@@ -7,11 +8,11 @@ public class RatingResponse
{
#region PROPERTIES
[JsonPropertyName("rating_average")]
public required double RatingAverage { get; set; }
[JsonPropertyName("average")]
public required double Average { get; set; }
[JsonPropertyName("rating_count")]
public required long RatingCount { get; set; }
[JsonPropertyName("count")]
public required long Count { get; set; }
#endregion
@@ -21,12 +22,15 @@ public class RatingResponse
[JsonConstructor]
public RatingResponse() {}
[SetsRequiredMembers]
public RatingResponse(IEnumerable<RatingMedia> ratingMedia) : this(ratingMedia.Any() ? ratingMedia.Average(x => x.Rating) : 0, ratingMedia.Count()) {}
[SetsRequiredMembers]
public RatingResponse(double ratingAverage, long ratingCount)
{
RatingAverage = ratingAverage;
RatingCount = ratingCount;
Average = ratingAverage;
Count = ratingCount;
}
#endregion

30
WatchIt.Common/WatchIt.Common.Model/Series/SeriesQueryParameters.cs
View File

@@ -37,6 +37,24 @@ public class SeriesQueryParameters : QueryParameters<SeriesResponse>
[FromQuery(Name = "has_ended")]
public bool? HasEnded { get; set; }
[FromQuery(Name = "rating_average")]
public double? RatingAverage { get; set; }
[FromQuery(Name = "rating_average_from")]
public double? RatingAverageFrom { get; set; }
[FromQuery(Name = "rating_average_to")]
public double? RatingAverageTo { get; set; }
[FromQuery(Name = "rating_count")]
public double? RatingCount { get; set; }
[FromQuery(Name = "rating_count_from")]
public double? RatingCountFrom { get; set; }
[FromQuery(Name = "rating_count_to")]
public double? RatingCountTo { get; set; }
#endregion
@@ -45,17 +63,21 @@ public class SeriesQueryParameters : QueryParameters<SeriesResponse>
public override bool IsMeetingConditions(SeriesResponse item) =>
(
TestString(item.Title, Title)
TestStringWithRegex(item.Title, Title)
&&
TestString(item.OriginalTitle, OriginalTitle)
TestStringWithRegex(item.OriginalTitle, OriginalTitle)
&&
TestString(item.Description, Description)
TestStringWithRegex(item.Description, Description)
&&
TestComparable(item.ReleaseDate, ReleaseDate, ReleaseDateFrom, ReleaseDateTo)
&&
TestComparable(item.Length, Length, LengthFrom, LengthTo)
&&
TestBoolean(item.HasEnded, HasEnded)
Test(item.HasEnded, HasEnded)
&&
TestComparable(item.Rating.Average, RatingAverage, RatingAverageFrom, RatingAverageTo)
&&
TestComparable(item.Rating.Count, RatingCount, RatingCountFrom, RatingCountTo)
);
#endregion

23
WatchIt.Common/WatchIt.Common.Model/Series/SeriesResponse.cs
View File

@@ -1,15 +1,35 @@
using System.Diagnostics.CodeAnalysis;
using System.Text.Json.Serialization;
using WatchIt.Common.Model.Rating;
using WatchIt.Common.Query;
using WatchIt.Database.Model.Media;
namespace WatchIt.Common.Model.Series;
public class SeriesResponse : Series
public class SeriesResponse : Series, IQueryOrderable<SeriesResponse>
{
#region PROPERTIES
[JsonIgnore]
public static IDictionary<string, Func<SeriesResponse, IComparable>> OrderableProperties { get; } = new Dictionary<string, Func<SeriesResponse, IComparable>>
{
{ "id", x => x.Id },
{ "title", x => x.Title },
{ "original_title", x => x.OriginalTitle },
{ "description", x => x.Description },
{ "release_date", x => x.ReleaseDate },
{ "length", x => x.Length },
{ "has_ended", x => x.HasEnded },
{ "rating.average", x => x.Rating.Average },
{ "rating.count", x => x.Rating.Count }
};
[JsonPropertyName("id")]
public long Id { get; set; }
[JsonPropertyName("rating")]
public RatingResponse Rating { get; set; }
#endregion
@@ -30,6 +50,7 @@ public class SeriesResponse : Series
ReleaseDate = mediaSeries.Media.ReleaseDate;
Length = mediaSeries.Media.Length;
HasEnded = mediaSeries.HasEnded;
Rating = new RatingResponse(mediaSeries.Media.RatingMedia);
}
#endregion

9
WatchIt.Common/WatchIt.Common.Query/IQueryOrderable.cs Normal file
View File

@@ -0,0 +1,9 @@
using System.Text.Json.Serialization;
namespace WatchIt.Common.Query;
public interface IQueryOrderable<T>
{
[JsonIgnore]
public static abstract IDictionary<string, Func<T, IComparable>> OrderableProperties { get; }
}

29
WatchIt.Common/WatchIt.Common.Query/QueryParameters.cs
View File

@@ -52,14 +52,18 @@ public abstract class QueryParameters
#region PRIVATE METHODS
protected static bool TestBoolean(bool property, bool? query) =>
protected static bool Test<T>(T? property, T? query) =>
(
query is null
||
property == query
(
property is not null
&&
property.Equals(query)
)
);
protected static bool TestString(string? property, string? regexQuery) =>
protected static bool TestStringWithRegex(string? property, string? regexQuery) =>
(
string.IsNullOrEmpty(regexQuery)
||
@@ -108,7 +112,7 @@ public abstract class QueryParameters
public abstract class QueryParameters<T> : QueryParameters where T : class
public abstract class QueryParameters<T> : QueryParameters where T : IQueryOrderable<T>
{
#region PUBLIC METHODS
@@ -120,22 +124,9 @@ public abstract class QueryParameters<T> : QueryParameters where T : class
if (OrderBy is not null)
{
PropertyInfo[] properties = typeof(T).GetProperties();
foreach (PropertyInfo property in properties)
if (T.OrderableProperties.TryGetValue(OrderBy, out Func<T, IComparable>? orderFunc))
{
JsonPropertyNameAttribute? attribute = property.GetCustomAttributes<JsonPropertyNameAttribute>(true).FirstOrDefault();
if (attribute is not null && attribute.Name == OrderBy)
{
if (Order == "asc")
{
data = data.OrderBy(property.GetValue);
}
else
{
data = data.OrderByDescending(property.GetValue);
}
break;
}
data = Order == "asc" ? data.OrderBy(orderFunc) : data.OrderByDescending(orderFunc);
}
}
if (After is not null)