From f416c62ea6bf4a0238602cf1fb2f68859bda95bc Mon Sep 17 00:00:00 2001 From: Mateusz Skoczek Date: Wed, 9 Oct 2024 01:16:05 +0200 Subject: [PATCH] PersonRolesEditCreatorComponent fixed --- .../Roles/ActorRoleRequest.cs | 2 +- .../WatchIt.Common.Model/Roles/CreatorRole.cs | 2 +- .../Roles/CreatorRoleMediaRequest.cs | 2 +- .../Roles/CreatorRolePersonRequest.cs | 4 ++-- .../Roles/CreatorRoleRequest.cs | 2 +- .../Roles/CreatorRoleUniversalRequest.cs | 17 ++++++++++++++++- .../Roles/ICreatorRoleMediaRequest.cs | 10 ++++++++++ .../Roles/ICreatorRolePersonRequest.cs | 10 ++++++++++ .../Roles/ICreatorRoleRequest.cs | 10 ++++++++++ .../PersonRolesEditCreatorComponent.razor | 3 --- 10 files changed, 52 insertions(+), 10 deletions(-) create mode 100644 WatchIt.Common/WatchIt.Common.Model/Roles/ICreatorRoleMediaRequest.cs create mode 100644 WatchIt.Common/WatchIt.Common.Model/Roles/ICreatorRolePersonRequest.cs create mode 100644 WatchIt.Common/WatchIt.Common.Model/Roles/ICreatorRoleRequest.cs diff --git a/WatchIt.Common/WatchIt.Common.Model/Roles/ActorRoleRequest.cs b/WatchIt.Common/WatchIt.Common.Model/Roles/ActorRoleRequest.cs index ab30f23..8b096ad 100644 --- a/WatchIt.Common/WatchIt.Common.Model/Roles/ActorRoleRequest.cs +++ b/WatchIt.Common/WatchIt.Common.Model/Roles/ActorRoleRequest.cs @@ -3,7 +3,7 @@ using WatchIt.Database.Model.Person; namespace WatchIt.Common.Model.Roles; -public abstract class ActorRoleRequest : ActorRole +public abstract class ActorRoleRequest : ActorRole, IActorRoleRequest { #region PUBLIC METHODS diff --git a/WatchIt.Common/WatchIt.Common.Model/Roles/CreatorRole.cs b/WatchIt.Common/WatchIt.Common.Model/Roles/CreatorRole.cs index b62c387..5262eed 100644 --- a/WatchIt.Common/WatchIt.Common.Model/Roles/CreatorRole.cs +++ b/WatchIt.Common/WatchIt.Common.Model/Roles/CreatorRole.cs @@ -7,7 +7,7 @@ public abstract class CreatorRole #region PROPERTIES [JsonPropertyName("type_id")] - public required short TypeId { get; set; } + public short TypeId { get; set; } #endregion } \ No newline at end of file diff --git a/WatchIt.Common/WatchIt.Common.Model/Roles/CreatorRoleMediaRequest.cs b/WatchIt.Common/WatchIt.Common.Model/Roles/CreatorRoleMediaRequest.cs index 63b3455..d2373f9 100644 --- a/WatchIt.Common/WatchIt.Common.Model/Roles/CreatorRoleMediaRequest.cs +++ b/WatchIt.Common/WatchIt.Common.Model/Roles/CreatorRoleMediaRequest.cs @@ -3,7 +3,7 @@ using WatchIt.Database.Model.Person; namespace WatchIt.Common.Model.Roles; -public class CreatorRoleMediaRequest : CreatorRoleRequest +public class CreatorRoleMediaRequest : CreatorRoleRequest, ICreatorRoleMediaRequest { #region PROPERTIES diff --git a/WatchIt.Common/WatchIt.Common.Model/Roles/CreatorRolePersonRequest.cs b/WatchIt.Common/WatchIt.Common.Model/Roles/CreatorRolePersonRequest.cs index f922efa..7bf53dd 100644 --- a/WatchIt.Common/WatchIt.Common.Model/Roles/CreatorRolePersonRequest.cs +++ b/WatchIt.Common/WatchIt.Common.Model/Roles/CreatorRolePersonRequest.cs @@ -3,12 +3,12 @@ using WatchIt.Database.Model.Person; namespace WatchIt.Common.Model.Roles; -public class CreatorRolePersonRequest : CreatorRoleRequest +public class CreatorRolePersonRequest : CreatorRoleRequest, ICreatorRolePersonRequest { #region PROPERTIES [JsonPropertyName("media_id")] - public required long MediaId { get; set; } + public long MediaId { get; set; } #endregion diff --git a/WatchIt.Common/WatchIt.Common.Model/Roles/CreatorRoleRequest.cs b/WatchIt.Common/WatchIt.Common.Model/Roles/CreatorRoleRequest.cs index ab93a3a..1aa45f7 100644 --- a/WatchIt.Common/WatchIt.Common.Model/Roles/CreatorRoleRequest.cs +++ b/WatchIt.Common/WatchIt.Common.Model/Roles/CreatorRoleRequest.cs @@ -2,7 +2,7 @@ using WatchIt.Database.Model.Person; namespace WatchIt.Common.Model.Roles; -public abstract class CreatorRoleRequest : CreatorRole +public abstract class CreatorRoleRequest : CreatorRole, ICreatorRoleRequest { #region PUBLIC METHODS diff --git a/WatchIt.Common/WatchIt.Common.Model/Roles/CreatorRoleUniversalRequest.cs b/WatchIt.Common/WatchIt.Common.Model/Roles/CreatorRoleUniversalRequest.cs index 00eae9e..931c794 100644 --- a/WatchIt.Common/WatchIt.Common.Model/Roles/CreatorRoleUniversalRequest.cs +++ b/WatchIt.Common/WatchIt.Common.Model/Roles/CreatorRoleUniversalRequest.cs @@ -3,7 +3,7 @@ using WatchIt.Database.Model.Person; namespace WatchIt.Common.Model.Roles; -public class CreatorRoleUniversalRequest : CreatorRoleRequest +public class CreatorRoleUniversalRequest : CreatorRoleRequest, ICreatorRolePersonRequest, ICreatorRoleMediaRequest { #region PROPERTIES @@ -14,6 +14,21 @@ public class CreatorRoleUniversalRequest : CreatorRoleRequest public long MediaId { get; set; } #endregion + + + + #region CONSTRUCTORS + + public CreatorRoleUniversalRequest() { } + + public CreatorRoleUniversalRequest(CreatorRoleResponse data) + { + MediaId = data.MediaId; + PersonId = data.PersonId; + TypeId = data.TypeId; + } + + #endregion diff --git a/WatchIt.Common/WatchIt.Common.Model/Roles/ICreatorRoleMediaRequest.cs b/WatchIt.Common/WatchIt.Common.Model/Roles/ICreatorRoleMediaRequest.cs new file mode 100644 index 0000000..40fb45d --- /dev/null +++ b/WatchIt.Common/WatchIt.Common.Model/Roles/ICreatorRoleMediaRequest.cs @@ -0,0 +1,10 @@ +namespace WatchIt.Common.Model.Roles; + +public interface ICreatorRoleMediaRequest : ICreatorRoleRequest +{ + #region PROPERTIES + + public long PersonId { get; set; } + + #endregion +} \ No newline at end of file diff --git a/WatchIt.Common/WatchIt.Common.Model/Roles/ICreatorRolePersonRequest.cs b/WatchIt.Common/WatchIt.Common.Model/Roles/ICreatorRolePersonRequest.cs new file mode 100644 index 0000000..2e569e5 --- /dev/null +++ b/WatchIt.Common/WatchIt.Common.Model/Roles/ICreatorRolePersonRequest.cs @@ -0,0 +1,10 @@ +namespace WatchIt.Common.Model.Roles; + +public interface ICreatorRolePersonRequest : ICreatorRoleRequest +{ + #region PROPERTIES + + public long MediaId { get; set; } + + #endregion +} \ No newline at end of file diff --git a/WatchIt.Common/WatchIt.Common.Model/Roles/ICreatorRoleRequest.cs b/WatchIt.Common/WatchIt.Common.Model/Roles/ICreatorRoleRequest.cs new file mode 100644 index 0000000..150eba0 --- /dev/null +++ b/WatchIt.Common/WatchIt.Common.Model/Roles/ICreatorRoleRequest.cs @@ -0,0 +1,10 @@ +namespace WatchIt.Common.Model.Roles; + +public interface ICreatorRoleRequest +{ + #region PROPERTIES + + public short TypeId { get; set; } + + #endregion +} \ No newline at end of file diff --git a/WatchIt.Website/WatchIt.Website/Components/PersonEditPage/PersonRolesEditCreatorComponent.razor b/WatchIt.Website/WatchIt.Website/Components/PersonEditPage/PersonRolesEditCreatorComponent.razor index 0815a92..0165b83 100644 --- a/WatchIt.Website/WatchIt.Website/Components/PersonEditPage/PersonRolesEditCreatorComponent.razor +++ b/WatchIt.Website/WatchIt.Website/Components/PersonEditPage/PersonRolesEditCreatorComponent.razor @@ -65,9 +65,6 @@ Role type - - Role name - Actions