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

rating adding completed

Browse Source
This commit is contained in:
Mateusz Skoczek
2024-09-20 23:37:55 +02:00
Unverified
parent 774b8832b5
commit 0ffd92d9c8
16 changed files with 561 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
WatchIt.WebAPI/WatchIt.WebAPI.Controllers/MediaController.cs
View File

@@ -12,17 +12,25 @@ namespace WatchIt.WebAPI.Controllers;
[Route("media")]
public class MediaController(IMediaControllerService mediaControllerService)
{
#region MAIN
[HttpGet("{id}")]
[AllowAnonymous]
[ProducesResponseType(typeof(MediaResponse), StatusCodes.Status200OK)]
[ProducesResponseType(StatusCodes.Status404NotFound)]
public async Task<ActionResult> GetMedia([FromRoute] long id) => await mediaControllerService.GetMedia(id);
#endregion
#region GENRES
[HttpGet("{id}/genres")]
[AllowAnonymous]
[ProducesResponseType(typeof(IEnumerable<GenreResponse>), StatusCodes.Status200OK)]
[ProducesResponseType(StatusCodes.Status404NotFound)]
public async Task<ActionResult> GetGenres([FromRoute]long id) => await mediaControllerService.GetGenres(id);
public async Task<ActionResult> GetMediaGenres([FromRoute]long id) => await mediaControllerService.GetMediaGenres(id);
[HttpPost("{id}/genres/{genre_id}")]
[Authorize(AuthenticationSchemes = JwtBearerDefaults.AuthenticationScheme)]
@@ -30,7 +38,7 @@ public class MediaController(IMediaControllerService mediaControllerService)
[ProducesResponseType(typeof(void), StatusCodes.Status401Unauthorized)]
[ProducesResponseType(typeof(void), StatusCodes.Status403Forbidden)]
[ProducesResponseType(StatusCodes.Status404NotFound)]
public async Task<ActionResult> PostGenre([FromRoute]long id, [FromRoute(Name = "genre_id")]short genreId) => await mediaControllerService.PostGenre(id, genreId);
public async Task<ActionResult> PostMediaGenre([FromRoute]long id, [FromRoute(Name = "genre_id")]short genreId) => await mediaControllerService.PostMediaGenre(id, genreId);
[HttpDelete("{id}/genres/{genre_id}")]
[Authorize(AuthenticationSchemes = JwtBearerDefaults.AuthenticationScheme)]
@@ -38,20 +46,52 @@ public class MediaController(IMediaControllerService mediaControllerService)
[ProducesResponseType(typeof(void), StatusCodes.Status401Unauthorized)]
[ProducesResponseType(typeof(void), StatusCodes.Status403Forbidden)]
[ProducesResponseType(StatusCodes.Status404NotFound)]
public async Task<ActionResult> DeleteGenre([FromRoute]long id, [FromRoute(Name = "genre_id")]short genreId) => await mediaControllerService.DeleteGenre(id, genreId);
public async Task<ActionResult> DeleteMediaGenre([FromRoute]long id, [FromRoute(Name = "genre_id")]short genreId) => await mediaControllerService.DeleteMediaGenre(id, genreId);
[HttpGet("{id}/photos/random_background")]
[AllowAnonymous]
[ProducesResponseType(typeof(MediaPhotoResponse), StatusCodes.Status200OK)]
[ProducesResponseType(StatusCodes.Status404NotFound)]
public async Task<ActionResult> GetMediaRandomBackgroundPhoto([FromRoute]long id) => await mediaControllerService.GetMediaRandomBackgroundPhoto(id);
#endregion
#region RATING
[HttpGet("{id}/rating")]
[AllowAnonymous]
[ProducesResponseType(typeof(MediaRatingResponse), StatusCodes.Status200OK)]
[ProducesResponseType(StatusCodes.Status404NotFound)]
public async Task<ActionResult> GetMediaRating([FromRoute] long id) => await mediaControllerService.GetMediaRating(id);
[HttpGet("{id}/rating/{user_id}")]
[AllowAnonymous]
[ProducesResponseType(typeof(short), StatusCodes.Status200OK)]
[ProducesResponseType(StatusCodes.Status404NotFound)]
public async Task<ActionResult> GetMediaRatingByUser([FromRoute] long id, [FromRoute(Name = "user_id")]long userId) => await mediaControllerService.GetMediaRatingByUser(id, userId);
[HttpPut("{id}/rating")]
[Authorize(AuthenticationSchemes = JwtBearerDefaults.AuthenticationScheme)]
[ProducesResponseType(StatusCodes.Status200OK)]
[ProducesResponseType(StatusCodes.Status400BadRequest)]
[ProducesResponseType(typeof(void), StatusCodes.Status401Unauthorized)]
[ProducesResponseType(StatusCodes.Status404NotFound)]
public async Task<ActionResult> PutMediaRating([FromRoute] long id, [FromBody] MediaRatingRequest data) => await mediaControllerService.PutMediaRating(id, data);
[HttpDelete("{id}/rating")]
[Authorize(AuthenticationSchemes = JwtBearerDefaults.AuthenticationScheme)]
[ProducesResponseType(StatusCodes.Status200OK)]
[ProducesResponseType(typeof(void), StatusCodes.Status401Unauthorized)]
public async Task<ActionResult> DeleteMediaRating([FromRoute] long id) => await mediaControllerService.DeleteMediaRating(id);
#endregion
#region POSTER
[HttpGet("{id}/poster")]
[AllowAnonymous]
[ProducesResponseType(typeof(MediaPosterResponse), StatusCodes.Status200OK)]
[ProducesResponseType(typeof(ValidationProblemDetails), StatusCodes.Status400BadRequest)]
[ProducesResponseType(StatusCodes.Status404NotFound)]
public async Task<ActionResult> GetPoster([FromRoute] long id) => await mediaControllerService.GetPoster(id);
public async Task<ActionResult> GetMediaPoster([FromRoute] long id) => await mediaControllerService.GetMediaPoster(id);
[HttpPut("{id}/poster")]
[Authorize(AuthenticationSchemes = JwtBearerDefaults.AuthenticationScheme)]
@@ -59,14 +99,26 @@ public class MediaController(IMediaControllerService mediaControllerService)
[ProducesResponseType(typeof(ValidationProblemDetails), StatusCodes.Status400BadRequest)]
[ProducesResponseType(typeof(void), StatusCodes.Status401Unauthorized)]
[ProducesResponseType(typeof(void), StatusCodes.Status403Forbidden)]
public async Task<ActionResult> PutPoster([FromRoute]long id, [FromBody]MediaPosterRequest body) => await mediaControllerService.PutPoster(id, body);
public async Task<ActionResult> PutMediaPoster([FromRoute]long id, [FromBody]MediaPosterRequest body) => await mediaControllerService.PutMediaPoster(id, body);
[HttpDelete("{id}/poster")]
[Authorize(AuthenticationSchemes = JwtBearerDefaults.AuthenticationScheme)]
[ProducesResponseType(typeof(void), StatusCodes.Status204NoContent)]
[ProducesResponseType(typeof(void), StatusCodes.Status401Unauthorized)]
[ProducesResponseType(typeof(void), StatusCodes.Status403Forbidden)]
public async Task<ActionResult> DeletePoster([FromRoute]long id) => await mediaControllerService.DeletePoster(id);
public async Task<ActionResult> DeleteMediaPoster([FromRoute]long id) => await mediaControllerService.DeleteMediaPoster(id);
#endregion
#region PHOTOS
[HttpGet("{id}/photos/random_background")]
[AllowAnonymous]
[ProducesResponseType(typeof(MediaPhotoResponse), StatusCodes.Status200OK)]
[ProducesResponseType(StatusCodes.Status404NotFound)]
public async Task<ActionResult> GetMediaPhotoRandomBackground([FromRoute]long id) => await mediaControllerService.GetMediaRandomBackgroundPhoto(id);
[HttpGet("photos/{photo_id}")]
[AllowAnonymous]
@@ -83,7 +135,7 @@ public class MediaController(IMediaControllerService mediaControllerService)
[AllowAnonymous]
[ProducesResponseType(typeof(MediaPhotoResponse), StatusCodes.Status200OK)]
[ProducesResponseType(StatusCodes.Status404NotFound)]
public async Task<ActionResult> GetRandomBackgroundPhoto() => await mediaControllerService.GetRandomBackgroundPhoto();
public async Task<ActionResult> GetPhotoRandomBackground() => await mediaControllerService.GetRandomBackgroundPhoto();
[HttpPost("photos")]
[Authorize(AuthenticationSchemes = JwtBearerDefaults.AuthenticationScheme)]
@@ -109,4 +161,6 @@ public class MediaController(IMediaControllerService mediaControllerService)
[ProducesResponseType(typeof(void), StatusCodes.Status403Forbidden)]
[ProducesResponseType(StatusCodes.Status404NotFound)]
public async Task<ActionResult> DeletePhoto([FromRoute(Name = "photo_id")]Guid photoId) => await mediaControllerService.DeletePhoto(photoId);
#endregion
}

20
WatchIt.WebAPI/WatchIt.WebAPI.Services/WatchIt.WebAPI.Services.Controllers/WatchIt.WebAPI.Services.Controllers.Media/IMediaControllerService.cs
View File

@@ -6,16 +6,24 @@ namespace WatchIt.WebAPI.Services.Controllers.Media;
public interface IMediaControllerService
{
Task<RequestResult> GetMedia(long mediaId);
Task<RequestResult> GetGenres(long mediaId);
Task<RequestResult> PostGenre(long mediaId, short genreId);
Task<RequestResult> DeleteGenre(long mediaId, short genreId);
Task<RequestResult> GetMediaGenres(long mediaId);
Task<RequestResult> PostMediaGenre(long mediaId, short genreId);
Task<RequestResult> DeleteMediaGenre(long mediaId, short genreId);
Task<RequestResult> GetMediaRating(long mediaId);
Task<RequestResult> GetMediaRatingByUser(long mediaId, long userId);
Task<RequestResult> PutMediaRating(long mediaId, MediaRatingRequest data);
Task<RequestResult> DeleteMediaRating(long mediaId);
Task<RequestResult> GetMediaPoster(long id);
Task<RequestResult> PutMediaPoster(long id, MediaPosterRequest data);
Task<RequestResult> DeleteMediaPoster(long id);
Task<RequestResult> GetPhoto(Guid id);
Task<RequestResult> GetPhotos(MediaPhotoQueryParameters query);
Task<RequestResult> GetRandomBackgroundPhoto();
Task<RequestResult> GetMediaRandomBackgroundPhoto(long id);
Task<RequestResult> GetPoster(long id);
Task<RequestResult> PutPoster(long id, MediaPosterRequest data);
Task<RequestResult> DeletePoster(long id);
Task<RequestResult> PostPhoto(MediaPhotoRequest data);
Task<RequestResult> PutPhoto(Guid photoId, MediaPhotoRequest data);
Task<RequestResult> DeletePhoto(Guid photoId);

254
WatchIt.WebAPI/WatchIt.WebAPI.Services/WatchIt.WebAPI.Services.Controllers/WatchIt.WebAPI.Services.Controllers.Media/MediaControllerService.cs
View File

@@ -4,6 +4,7 @@ using WatchIt.Common.Model.Genres;
using WatchIt.Common.Model.Media;
using WatchIt.Database;
using WatchIt.Database.Model.Media;
using WatchIt.Database.Model.Rating;
using WatchIt.WebAPI.Services.Controllers.Common;
using WatchIt.WebAPI.Services.Utility.User;
@@ -13,6 +14,8 @@ public class MediaControllerService(DatabaseContext database, IUserService userS
{
#region PUBLIC METHODS
#region Main
public async Task<RequestResult> GetMedia(long mediaId)
{
Database.Model.Media.Media? item = await database.Media.FirstOrDefaultAsync(x => x.Id == mediaId);
@@ -27,8 +30,12 @@ public class MediaControllerService(DatabaseContext database, IUserService userS
return RequestResult.Ok(mediaResponse);
}
public async Task<RequestResult> GetGenres(long mediaId)
#endregion
#region Genres
public async Task<RequestResult> GetMediaGenres(long mediaId)
{
Database.Model.Media.Media? item = await database.Media.FirstOrDefaultAsync(x => x.Id == mediaId);
if (item is null)
@@ -40,7 +47,7 @@ public class MediaControllerService(DatabaseContext database, IUserService userS
return RequestResult.Ok(genres);
}
public async Task<RequestResult> PostGenre(long mediaId, short genreId)
public async Task<RequestResult> PostMediaGenre(long mediaId, short genreId)
{
UserValidator validator = userService.GetValidator().MustBeAdmin();
if (!validator.IsValid)
@@ -65,7 +72,7 @@ public class MediaControllerService(DatabaseContext database, IUserService userS
return RequestResult.Ok();
}
public async Task<RequestResult> DeleteGenre(long mediaId, short genreId)
public async Task<RequestResult> DeleteMediaGenre(long mediaId, short genreId)
{
UserValidator validator = userService.GetValidator().MustBeAdmin();
if (!validator.IsValid)
@@ -86,6 +93,173 @@ public class MediaControllerService(DatabaseContext database, IUserService userS
return RequestResult.Ok();
}
#endregion
#region Rating
public async Task<RequestResult> GetMediaRating(long mediaId)
{
Database.Model.Media.Media? item = await database.Media.FirstOrDefaultAsync(x => x.Id == mediaId);
if (item is null)
{
return RequestResult.NotFound();
}
double ratingAverage = item.RatingMedia.Any() ? item.RatingMedia.Average(x => x.Rating) : 0;
long ratingCount = item.RatingMedia.Count();
MediaRatingResponse ratingResponse = new MediaRatingResponse(ratingAverage, ratingCount);
return RequestResult.Ok(ratingResponse);
}
public async Task<RequestResult> GetMediaRatingByUser(long mediaId, long userId)
{
Database.Model.Media.Media? item = await database.Media.FirstOrDefaultAsync(x => x.Id == mediaId);
if (item is null)
{
return RequestResult.NotFound();
}
short? rating = item.RatingMedia.FirstOrDefault(x => x.AccountId == userId)?.Rating;
if (!rating.HasValue)
{
return RequestResult.NotFound();
}
return RequestResult.Ok(rating.Value);
}
public async Task<RequestResult> PutMediaRating(long mediaId, MediaRatingRequest data)
{
short ratingValue = data.Rating;
if (ratingValue < 1 || ratingValue > 10)
{
return RequestResult.BadRequest();
}
Database.Model.Media.Media? item = await database.Media.FirstOrDefaultAsync(x => x.Id == mediaId);
if (item is null)
{
return RequestResult.NotFound();
}
long userId = userService.GetUserId();
RatingMedia? rating = item.RatingMedia.FirstOrDefault(x => x.AccountId == userId);
if (rating is not null)
{
rating.Rating = ratingValue;
}
else
{
rating = new RatingMedia
{
AccountId = userId,
MediaId = mediaId,
Rating = ratingValue
};
await database.RatingsMedia.AddAsync(rating);
}
await database.SaveChangesAsync();
return RequestResult.Ok();
}
public async Task<RequestResult> DeleteMediaRating(long mediaId)
{
long userId = userService.GetUserId();
RatingMedia? item = await database.RatingsMedia.FirstOrDefaultAsync(x => x.MediaId == mediaId && x.AccountId == userId);
if (item is null)
{
return RequestResult.Ok();
}
database.RatingsMedia.Attach(item);
database.RatingsMedia.Remove(item);
await database.SaveChangesAsync();
return RequestResult.Ok();
}
#endregion
#region Poster
public async Task<RequestResult> GetMediaPoster(long id)
{
Database.Model.Media.Media? media = await database.Media.FirstOrDefaultAsync(x => x.Id == id);
if (media is null)
{
return RequestResult.BadRequest();
}
MediaPosterImage? poster = media.MediaPosterImage;
if (poster is null)
{
return RequestResult.NotFound();
}
MediaPosterResponse data = new MediaPosterResponse(poster);
return RequestResult.Ok(data);
}
public async Task<RequestResult> PutMediaPoster(long id, MediaPosterRequest data)
{
UserValidator validator = userService.GetValidator().MustBeAdmin();
if (!validator.IsValid)
{
return RequestResult.Forbidden();
}
Database.Model.Media.Media? media = await database.Media.FirstOrDefaultAsync(x => x.Id == id);
if (media is null)
{
return RequestResult.BadRequest();
}
if (media.MediaPosterImage is null)
{
MediaPosterImage image = data.CreateMediaPosterImage();
await database.MediaPosterImages.AddAsync(image);
await database.SaveChangesAsync();
media.MediaPosterImageId = image.Id;
}
else
{
data.UpdateMediaPosterImage(media.MediaPosterImage);
}
await database.SaveChangesAsync();
return RequestResult.Ok();
}
public async Task<RequestResult> DeleteMediaPoster(long id)
{
UserValidator validator = userService.GetValidator().MustBeAdmin();
if (!validator.IsValid)
{
return RequestResult.Forbidden();
}
Database.Model.Media.Media? media = await database.Media.FirstOrDefaultAsync(x => x.Id == id);
if (media?.MediaPosterImage != null)
{
database.MediaPosterImages.Attach(media.MediaPosterImage);
database.MediaPosterImages.Remove(media.MediaPosterImage);
await database.SaveChangesAsync();
}
return RequestResult.NoContent();
}
#endregion
#region Photos
public async Task<RequestResult> GetPhoto(Guid id)
{
MediaPhotoImage? item = await database.MediaPhotoImages.FirstOrDefaultAsync(x => x.Id == id);
@@ -129,76 +303,6 @@ public class MediaControllerService(DatabaseContext database, IUserService userS
return Task.FromResult<RequestResult>(RequestResult.Ok(data));
}
public async Task<RequestResult> GetPoster(long id)
{
Database.Model.Media.Media? media = await database.Media.FirstOrDefaultAsync(x => x.Id == id);
if (media is null)
{
return RequestResult.BadRequest();
}
MediaPosterImage? poster = media.MediaPosterImage;
if (poster is null)
{
return RequestResult.NotFound();
}
MediaPosterResponse data = new MediaPosterResponse(poster);
return RequestResult.Ok(data);
}
public async Task<RequestResult> PutPoster(long id, MediaPosterRequest data)
{
UserValidator validator = userService.GetValidator().MustBeAdmin();
if (!validator.IsValid)
{
return RequestResult.Forbidden();
}
Database.Model.Media.Media? media = await database.Media.FirstOrDefaultAsync(x => x.Id == id);
if (media is null)
{
return RequestResult.BadRequest();
}
if (media.MediaPosterImage is null)
{
MediaPosterImage image = data.CreateMediaPosterImage();
await database.MediaPosterImages.AddAsync(image);
await database.SaveChangesAsync();
media.MediaPosterImageId = image.Id;
}
else
{
data.UpdateMediaPosterImage(media.MediaPosterImage);
}
await database.SaveChangesAsync();
return RequestResult.Ok();
}
public async Task<RequestResult> DeletePoster(long id)
{
UserValidator validator = userService.GetValidator().MustBeAdmin();
if (!validator.IsValid)
{
return RequestResult.Forbidden();
}
Database.Model.Media.Media? media = await database.Media.FirstOrDefaultAsync(x => x.Id == id);
if (media?.MediaPosterImage != null)
{
database.MediaPosterImages.Attach(media.MediaPosterImage);
database.MediaPosterImages.Remove(media.MediaPosterImage);
await database.SaveChangesAsync();
}
return RequestResult.NoContent();
}
public async Task<RequestResult> PostPhoto(MediaPhotoRequest data)
{
UserValidator validator = userService.GetValidator().MustBeAdmin();
@@ -284,4 +388,6 @@ public class MediaControllerService(DatabaseContext database, IUserService userS
}
#endregion
#endregion
}

1
WatchIt.WebAPI/WatchIt.WebAPI.Services/WatchIt.WebAPI.Services.Utility/WatchIt.WebAPI.Services.Utility.User/IUserService.cs
View File

@@ -8,4 +8,5 @@ public interface IUserService
string? GetRawToken();
UserValidator GetValidator();
Guid GetJti();
long GetUserId();
}

8
WatchIt.WebAPI/WatchIt.WebAPI.Services/WatchIt.WebAPI.Services.Utility/WatchIt.WebAPI.Services.Utility.User/UserService.cs
View File

@@ -40,6 +40,14 @@ public class UserService(DatabaseContext database, IHttpContextAccessor accessor
Guid guid = Guid.Parse(jtiClaim.Value);
return guid;
}
public long GetUserId()
{
ClaimsPrincipal user = GetRawUser();
Claim subClaim = user.FindFirst(JwtRegisteredClaimNames.Sub)!;
long id = long.Parse(subClaim.Value);
return id;
}
#endregion
}

20
WatchIt.WebAPI/WatchIt.WebAPI/Program.cs
View File

@@ -1,3 +1,4 @@
using System.IdentityModel.Tokens.Jwt;
using System.Reflection;
using System.Text;
using FluentValidation;
@@ -5,6 +6,7 @@ using FluentValidation.AspNetCore;
using Microsoft.AspNetCore.Authentication;
using Microsoft.AspNetCore.Authentication.JwtBearer;
using Microsoft.EntityFrameworkCore;
using Microsoft.IdentityModel.JsonWebTokens;
using Microsoft.IdentityModel.Tokens;
using WatchIt.Database;
using WatchIt.WebAPI.Services.Controllers.Accounts;
@@ -26,12 +28,12 @@ public static class Program
public static void Main(string[] args)
{
WebApplication app = WebApplication.CreateBuilder(args)
.SetupAuthentication()
.SetupDatabase()
.SetupWorkerServices()
.SetupServices()
.SetupApplication()
.Build();
.SetupAuthentication()
.SetupDatabase()
.SetupWorkerServices()
.SetupServices()
.SetupApplication()
.Build();
if (app.Environment.IsDevelopment())
{
@@ -40,7 +42,8 @@ public static class Program
}
app.UseHttpsRedirection();
app.UseAuthentication();
app.UseAuthorization();
app.MapControllers();
@@ -56,6 +59,9 @@ public static class Program
private static WebApplicationBuilder SetupAuthentication(this WebApplicationBuilder builder)
{
JsonWebTokenHandler.DefaultInboundClaimTypeMap.Clear();
JwtSecurityTokenHandler.DefaultInboundClaimTypeMap.Clear();
AuthenticationBuilder authenticationBuilder = builder.Services.AddAuthentication(x =>
{
x.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme;