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

changes in model, actor roles adding in person edit page finished

Browse Source
This commit is contained in:
Mateusz Skoczek
2024-10-08 19:56:14 +02:00
Unverified
parent 35e657d8d1
commit 4064f49240
38 changed files with 352 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -183,7 +183,7 @@ public class MediaController : ControllerBase
[ProducesResponseType(typeof(void), StatusCodes.Status401Unauthorized)]
[ProducesResponseType(typeof(void), StatusCodes.Status403Forbidden)]
[ProducesResponseType(StatusCodes.Status404NotFound)]
public async Task<ActionResult> PostMediaActorRole([FromRoute]long id, [FromBody]IActorRoleMediaRequest body) => await _mediaControllerService.PostMediaActorRole(id, body);
public async Task<ActionResult> PostMediaActorRole([FromRoute]long id, [FromBody]ActorRoleMediaRequest body) => await _mediaControllerService.PostMediaActorRole(id, body);
[HttpGet("{id}/roles/creator")]
[AllowAnonymous]
@@ -198,7 +198,7 @@ public class MediaController : ControllerBase
[ProducesResponseType(typeof(void), StatusCodes.Status401Unauthorized)]
[ProducesResponseType(typeof(void), StatusCodes.Status403Forbidden)]
[ProducesResponseType(StatusCodes.Status404NotFound)]
public async Task<ActionResult> PostMediaCreatorRole([FromRoute]long id, [FromBody]ICreatorRoleMediaRequest body) => await _mediaControllerService.PostMediaCreatorRole(id, body);
public async Task<ActionResult> PostMediaCreatorRole([FromRoute]long id, [FromBody]CreatorRoleMediaRequest body) => await _mediaControllerService.PostMediaCreatorRole(id, body);
#endregion

4
WatchIt.WebAPI/WatchIt.WebAPI.Controllers/PersonsController.cs
View File

@@ -122,7 +122,7 @@ public class PersonsController : ControllerBase
[ProducesResponseType(typeof(void), StatusCodes.Status401Unauthorized)]
[ProducesResponseType(typeof(void), StatusCodes.Status403Forbidden)]
[ProducesResponseType(StatusCodes.Status404NotFound)]
public async Task<ActionResult> PostPersonActorRole([FromRoute]long id, [FromBody]IActorRolePersonRequest body) => await _personsControllerService.PostPersonActorRole(id, body);
public async Task<ActionResult> PostPersonActorRole([FromRoute]long id, [FromBody]ActorRolePersonRequest body) => await _personsControllerService.PostPersonActorRole(id, body);
[HttpGet("{id}/roles/creator")]
[AllowAnonymous]
@@ -137,7 +137,7 @@ public class PersonsController : ControllerBase
[ProducesResponseType(typeof(void), StatusCodes.Status401Unauthorized)]
[ProducesResponseType(typeof(void), StatusCodes.Status403Forbidden)]
[ProducesResponseType(StatusCodes.Status404NotFound)]
public async Task<ActionResult> PostPersonCreatorRole([FromRoute]long id, [FromBody]ICreatorRolePersonRequest body) => await _personsControllerService.PostPersonCreatorRole(id, body);
public async Task<ActionResult> PostPersonCreatorRole([FromRoute]long id, [FromBody]CreatorRolePersonRequest body) => await _personsControllerService.PostPersonCreatorRole(id, body);
#endregion

4
WatchIt.WebAPI/WatchIt.WebAPI.Controllers/RolesController.cs
View File

@@ -47,7 +47,7 @@ public class RolesController : ControllerBase
[ProducesResponseType(typeof(void), StatusCodes.Status401Unauthorized)]
[ProducesResponseType(typeof(void), StatusCodes.Status403Forbidden)]
[ProducesResponseType(StatusCodes.Status404NotFound)]
public async Task<ActionResult> PutActorRole([FromRoute]Guid id, [FromBody]ActorRoleRequest body) => await _rolesControllerService.PutActorRole(id, body);
public async Task<ActionResult> PutActorRole([FromRoute]Guid id, [FromBody]ActorRoleUniversalRequest body) => await _rolesControllerService.PutActorRole(id, body);
[HttpDelete("actor/{id}")]
[Authorize(AuthenticationSchemes = JwtBearerDefaults.AuthenticationScheme)]
@@ -98,7 +98,7 @@ public class RolesController : ControllerBase
[ProducesResponseType(typeof(void), StatusCodes.Status401Unauthorized)]
[ProducesResponseType(typeof(void), StatusCodes.Status403Forbidden)]
[ProducesResponseType(StatusCodes.Status404NotFound)]
public async Task<ActionResult> PutCreatorRole([FromRoute]Guid id, [FromBody]CreatorRoleRequest body) => await _rolesControllerService.PutCreatorRole(id, body);
public async Task<ActionResult> PutCreatorRole([FromRoute]Guid id, [FromBody]CreatorRoleUniversalRequest body) => await _rolesControllerService.PutCreatorRole(id, body);
[HttpDelete("creator/{id}")]
[Authorize(AuthenticationSchemes = JwtBearerDefaults.AuthenticationScheme)]

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

@@ -31,7 +31,7 @@ public interface IMediaControllerService
Task<RequestResult> PostMediaPhoto(long mediaId, MediaPhotoRequest data);
Task<RequestResult> GetMediaAllActorRoles(long mediaId, ActorRoleMediaQueryParameters queryParameters);
Task<RequestResult> PostMediaActorRole(long mediaId, IActorRoleMediaRequest data);
Task<RequestResult> PostMediaActorRole(long mediaId, ActorRoleMediaRequest data);
Task<RequestResult> GetMediaAllCreatorRoles(long mediaId, CreatorRoleMediaQueryParameters queryParameters);
Task<RequestResult> PostMediaCreatorRole(long mediaId, ICreatorRoleMediaRequest data);
Task<RequestResult> PostMediaCreatorRole(long mediaId, CreatorRoleMediaRequest data);
}

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

@@ -377,7 +377,7 @@ public class MediaControllerService(DatabaseContext database, IUserService userS
return RequestResult.Ok(data);
}
public async Task<RequestResult> PostMediaActorRole(long mediaId, IActorRoleMediaRequest data)
public async Task<RequestResult> PostMediaActorRole(long mediaId, ActorRoleMediaRequest data)
{
UserValidator validator = userService.GetValidator().MustBeAdmin();
if (!validator.IsValid)
@@ -412,7 +412,7 @@ public class MediaControllerService(DatabaseContext database, IUserService userS
return RequestResult.Ok(data);
}
public async Task<RequestResult> PostMediaCreatorRole(long mediaId, ICreatorRoleMediaRequest data)
public async Task<RequestResult> PostMediaCreatorRole(long mediaId, CreatorRoleMediaRequest data)
{
UserValidator validator = userService.GetValidator().MustBeAdmin();
if (!validator.IsValid)

4
WatchIt.WebAPI/WatchIt.WebAPI.Services/WatchIt.WebAPI.Services.Controllers/WatchIt.WebAPI.Services.Controllers.Persons/IPersonsControllerService.cs
View File

@@ -19,7 +19,7 @@ public interface IPersonsControllerService
Task<RequestResult> DeletePersonPhoto(long id);
Task<RequestResult> GetPersonAllActorRoles(long personId, ActorRolePersonQueryParameters queryParameters);
Task<RequestResult> PostPersonActorRole(long personId, IActorRolePersonRequest data);
Task<RequestResult> PostPersonActorRole(long personId, ActorRolePersonRequest data);
Task<RequestResult> GetPersonAllCreatorRoles(long personId, CreatorRolePersonQueryParameters queryParameters);
Task<RequestResult> PostPersonCreatorRole(long personId, ICreatorRolePersonRequest data);
Task<RequestResult> PostPersonCreatorRole(long personId, CreatorRolePersonRequest data);
}

10
WatchIt.WebAPI/WatchIt.WebAPI.Services/WatchIt.WebAPI.Services.Controllers/WatchIt.WebAPI.Services.Controllers.Persons/PersonsControllerService.cs
View File

@@ -235,7 +235,7 @@ public class PersonsControllerService : IPersonsControllerService
return RequestResult.Ok(data);
}
public async Task<RequestResult> PostPersonActorRole(long personId, IActorRolePersonRequest data)
public async Task<RequestResult> PostPersonActorRole(long personId, ActorRolePersonRequest data)
{
UserValidator validator = _userService.GetValidator().MustBeAdmin();
if (!validator.IsValid)
@@ -243,7 +243,7 @@ public class PersonsControllerService : IPersonsControllerService
return RequestResult.Forbidden();
}
Database.Model.Person.Person? person = await _database.Persons.FirstOrDefaultAsync(x => x.Id == personId);
Person? person = await _database.Persons.FirstOrDefaultAsync(x => x.Id == personId);
if (person is null)
{
return RequestResult.NotFound();
@@ -258,7 +258,7 @@ public class PersonsControllerService : IPersonsControllerService
public async Task<RequestResult> GetPersonAllCreatorRoles(long personId, CreatorRolePersonQueryParameters queryParameters)
{
Database.Model.Person.Person? media = await _database.Persons.FirstOrDefaultAsync(x => x.Id == personId);
Person? media = await _database.Persons.FirstOrDefaultAsync(x => x.Id == personId);
if (media is null)
{
return RequestResult.NotFound();
@@ -270,7 +270,7 @@ public class PersonsControllerService : IPersonsControllerService
return RequestResult.Ok(data);
}
public async Task<RequestResult> PostPersonCreatorRole(long personId, ICreatorRolePersonRequest data)
public async Task<RequestResult> PostPersonCreatorRole(long personId, CreatorRolePersonRequest data)
{
UserValidator validator = _userService.GetValidator().MustBeAdmin();
if (!validator.IsValid)
@@ -278,7 +278,7 @@ public class PersonsControllerService : IPersonsControllerService
return RequestResult.Forbidden();
}
Database.Model.Person.Person? media = await _database.Persons.FirstOrDefaultAsync(x => x.Id == personId);
Person? media = await _database.Persons.FirstOrDefaultAsync(x => x.Id == personId);
if (media is null)
{
return RequestResult.NotFound();

4
WatchIt.WebAPI/WatchIt.WebAPI.Services/WatchIt.WebAPI.Services.Controllers/WatchIt.WebAPI.Services.Controllers.Roles/IRolesControllerService.cs
View File

@@ -6,7 +6,7 @@ namespace WatchIt.WebAPI.Services.Controllers.Roles;
public interface IRolesControllerService
{
Task<RequestResult> GetActorRole(Guid id);
Task<RequestResult> PutActorRole(Guid id, ActorRoleRequest data);
Task<RequestResult> PutActorRole(Guid id, ActorRoleUniversalRequest data);
Task<RequestResult> DeleteActorRole(Guid id);
Task<RequestResult> GetAllActorRoleTypes(RoleTypeQueryParameters query);
Task<RequestResult> GetActorRoleType(short typeId);
@@ -14,7 +14,7 @@ public interface IRolesControllerService
Task<RequestResult> DeleteActorRoleType(short typeId);
Task<RequestResult> GetCreatorRole(Guid id);
Task<RequestResult> PutCreatorRole(Guid id, CreatorRoleRequest data);
Task<RequestResult> PutCreatorRole(Guid id, CreatorRoleUniversalRequest data);
Task<RequestResult> DeleteCreatorRole(Guid id);
Task<RequestResult> GetAllCreatorRoleTypes(RoleTypeQueryParameters query);
Task<RequestResult> GetCreatorRoleType(short typeId);

4
WatchIt.WebAPI/WatchIt.WebAPI.Services/WatchIt.WebAPI.Services.Controllers/WatchIt.WebAPI.Services.Controllers.Roles/RolesControllerService.cs
View File

@@ -46,7 +46,7 @@ public class RolesControllerService : IRolesControllerService
return RequestResult.Ok(data);
}
public async Task<RequestResult> PutActorRole(Guid id, ActorRoleRequest data)
public async Task<RequestResult> PutActorRole(Guid id, ActorRoleUniversalRequest data)
{
UserValidator validator = _userService.GetValidator().MustBeAdmin();
if (!validator.IsValid)
@@ -159,7 +159,7 @@ public class RolesControllerService : IRolesControllerService
return RequestResult.Ok(data);
}
public async Task<RequestResult> PutCreatorRole(Guid id, CreatorRoleRequest data)
public async Task<RequestResult> PutCreatorRole(Guid id, CreatorRoleUniversalRequest data)
{
UserValidator validator = _userService.GetValidator().MustBeAdmin();
if (!validator.IsValid)

16
WatchIt.WebAPI/WatchIt.WebAPI.Validators/Roles/ActorRoleMediaRequestValidator.cs Normal file
View File

@@ -0,0 +1,16 @@
using FluentValidation;
using WatchIt.Common.Model.Roles;
using WatchIt.Database;
namespace WatchIt.WebAPI.Validators.Roles;
public class ActorRoleMediaRequestValidator : AbstractValidator<ActorRoleMediaRequest>
{
public ActorRoleMediaRequestValidator(DatabaseContext database)
{
Include(new BaseActorRoleRequestValidator(database));
RuleFor(x => x.PersonId).NotEmpty()
.NotNull()
.MustBeIn(database.Persons.Select(x => x.Id).ToList());
}
}

16
WatchIt.WebAPI/WatchIt.WebAPI.Validators/Roles/ActorRolePersonRequestValidator.cs Normal file
View File

@@ -0,0 +1,16 @@
using FluentValidation;
using WatchIt.Common.Model.Roles;
using WatchIt.Database;
namespace WatchIt.WebAPI.Validators.Roles;
public class ActorRolePersonRequestValidator : AbstractValidator<ActorRolePersonRequest>
{
public ActorRolePersonRequestValidator(DatabaseContext database)
{
Include(new BaseActorRoleRequestValidator(database));
RuleFor(x => x.MediaId).NotEmpty()
.NotNull()
.MustBeIn(database.Media.Select(x => x.Id).ToList());
}
}

19
WatchIt.WebAPI/WatchIt.WebAPI.Validators/Roles/ActorRoleUniversalRequestValidator.cs Normal file
View File

@@ -0,0 +1,19 @@
using FluentValidation;
using WatchIt.Common.Model.Roles;
using WatchIt.Database;
namespace WatchIt.WebAPI.Validators.Roles;
public class ActorRoleUniversalRequestValidator : AbstractValidator<ActorRoleUniversalRequest>
{
public ActorRoleUniversalRequestValidator(DatabaseContext database)
{
Include(new BaseActorRoleRequestValidator(database));
RuleFor(x => x.PersonId).NotEmpty()
.NotNull()
.MustBeIn(database.Persons.Select(x => x.Id).ToList());
RuleFor(x => x.MediaId).NotEmpty()
.NotNull()
.MustBeIn(database.Media.Select(x => x.Id).ToList());
}
}

17
WatchIt.WebAPI/WatchIt.WebAPI.Validators/Roles/BaseActorRoleRequestValidator.cs Normal file
View File

@@ -0,0 +1,17 @@
using FluentValidation;
using WatchIt.Common.Model.Roles;
using WatchIt.Database;
namespace WatchIt.WebAPI.Validators.Roles;
public class BaseActorRoleRequestValidator : AbstractValidator<ActorRoleRequest>
{
public BaseActorRoleRequestValidator(DatabaseContext database)
{
RuleFor(x => x.Name).NotEmpty()
.MaximumLength(100);
RuleFor(x => x.TypeId).NotEmpty()
.NotNull()
.MustBeIn(database.PersonActorRoleTypes.Select(x => x.Id).ToList());
}
}