From eb42bfded9a1ee22722710f7ba4434c992ac5153 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elias=20H=C3=B6rner?= Date: Thu, 4 Jun 2026 12:02:59 +0200 Subject: [PATCH 01/18] Initial renaming of c# class --- .../Helpers/RbacScopeHelperTest.cs | 2 +- .../Applications/GetApplicationsEndpoint.cs | 4 +- .../CreatePlanningRealmEndpoint.cs | 2 +- .../UpdatePlanningRealmEndpoint.cs | 70 +++++++++---------- .../CreateRoleAssignmentEndpoint.cs | 2 +- .../DeleteRoleAssignmentEndpoint.cs | 2 +- .../GetRoleAssignmentsEndpoint.cs | 2 +- .../ConfigureTournamentEndpoint.cs | 2 +- .../Tournaments/GetTournamentEndpoint.cs | 2 +- .../Rules/PlanningRealmHeaderMappingRule.cs | 4 +- .../Mapping/Rules/PlanningRealmMappingRule.cs | 4 +- .../Rules/RoleAssignmentMappingRule.cs | 2 +- .../Mapping/Rules/TournamentMappingRule.cs | 4 +- .../Pages/InvitationForm.cshtml.cs | 2 +- .../Security/AccessValidator.cs | 4 +- .../Organization/Organization.cs | 4 +- .../PlanningRealm/Application.cs | 6 +- .../PlanningRealm/InvitationLink.cs | 6 +- .../PlanningRealm/TeamLink.cs | 2 +- ...{PlanningRealm.cs => TournamentPlanner.cs} | 18 ++--- .../RoleAssignmentEntityTypeConfiguration.cs | 3 +- ...urnamentPlannerEntityTypeConfiguration.cs} | 29 ++++---- .../Extensions/ServiceCollectionExtensions.cs | 6 +- .../Repositories/InvitationLinkRepository.cs | 2 +- .../Repositories/PlanningRealmRepository.cs | 10 +-- .../Repositories/RoleAssignmentRepository.cs | 2 +- .../Repositories/TournamentRepository.cs | 2 +- src/Turnierplan.Dal/TurnierplanContext.cs | 8 +-- 28 files changed, 104 insertions(+), 102 deletions(-) rename src/Turnierplan.Core/PlanningRealm/{PlanningRealm.cs => TournamentPlanner.cs} (79%) rename src/Turnierplan.Dal/EntityConfigurations/{PlanningRealmEntityTypeConfiguration.cs => TournamentPlannerEntityTypeConfiguration.cs} (53%) diff --git a/src/Turnierplan.App.Test.Unit/Helpers/RbacScopeHelperTest.cs b/src/Turnierplan.App.Test.Unit/Helpers/RbacScopeHelperTest.cs index ea55a7e7..ba5c351b 100644 --- a/src/Turnierplan.App.Test.Unit/Helpers/RbacScopeHelperTest.cs +++ b/src/Turnierplan.App.Test.Unit/Helpers/RbacScopeHelperTest.cs @@ -32,7 +32,7 @@ public void RbacScopeHelper___GetScopeId___Returns_Expected_Value() [InlineData("Folder:NobBmcA2jNc", nameof(Folder))] [InlineData("Image:NobBmcA2jNc", nameof(Image))] [InlineData("Organization:NobBmcA2jNc", nameof(Organization))] - [InlineData("PlanningRealm:NobBmcA2jNc", nameof(PlanningRealm))] + [InlineData("PlanningRealm:NobBmcA2jNc", nameof(TournamentPlanner))] [InlineData("Tournament:NobBmcA2jNc", nameof(Tournament))] [InlineData("Venue:NobBmcA2jNc", nameof(Venue))] public void RbacScopeHelper___TryParseScopeId___Works_As_Expected(string scopeId, string expectedTypeName) diff --git a/src/Turnierplan.App/Endpoints/Applications/GetApplicationsEndpoint.cs b/src/Turnierplan.App/Endpoints/Applications/GetApplicationsEndpoint.cs index 5d1afc53..60ed07d2 100644 --- a/src/Turnierplan.App/Endpoints/Applications/GetApplicationsEndpoint.cs +++ b/src/Turnierplan.App/Endpoints/Applications/GetApplicationsEndpoint.cs @@ -90,9 +90,9 @@ public QueryLogic( _labelFilter = labelFilter; } - public PaginationResultDto Process(PlanningRealm planningRealm, IMapper mapper) + public PaginationResultDto Process(TournamentPlanner tournamentPlanner, IMapper mapper) { - var applications = planningRealm.Applications.AsEnumerable(); + var applications = tournamentPlanner.Applications.AsEnumerable(); if (_tournamentClassFilter is not null) { diff --git a/src/Turnierplan.App/Endpoints/PlanningRealms/CreatePlanningRealmEndpoint.cs b/src/Turnierplan.App/Endpoints/PlanningRealms/CreatePlanningRealmEndpoint.cs index 95defcc4..1e8ebdb4 100644 --- a/src/Turnierplan.App/Endpoints/PlanningRealms/CreatePlanningRealmEndpoint.cs +++ b/src/Turnierplan.App/Endpoints/PlanningRealms/CreatePlanningRealmEndpoint.cs @@ -43,7 +43,7 @@ private static async Task Handle( return Results.Forbid(); } - var planningRealm = new PlanningRealm(organization, request.Name.Trim()); + var planningRealm = new TournamentPlanner(organization, request.Name.Trim()); await planningRealmRepository.CreateAsync(planningRealm); await planningRealmRepository.UnitOfWork.SaveChangesAsync(cancellationToken); diff --git a/src/Turnierplan.App/Endpoints/PlanningRealms/UpdatePlanningRealmEndpoint.cs b/src/Turnierplan.App/Endpoints/PlanningRealms/UpdatePlanningRealmEndpoint.cs index f3c8c827..100de827 100644 --- a/src/Turnierplan.App/Endpoints/PlanningRealms/UpdatePlanningRealmEndpoint.cs +++ b/src/Turnierplan.App/Endpoints/PlanningRealms/UpdatePlanningRealmEndpoint.cs @@ -65,16 +65,16 @@ private static async Task Handle( return Results.NoContent(); } - private static bool TryApplyChangesToPlanningRealm(PlanningRealm planningRealm, UpdatePlanningRealmEndpointRequest request, [NotNullWhen(false)] out string? error) + private static bool TryApplyChangesToPlanningRealm(TournamentPlanner tournamentPlanner, UpdatePlanningRealmEndpointRequest request, [NotNullWhen(false)] out string? error) { - planningRealm.Name = request.Name.Trim(); - - if (!TryDeleteNoLongerNeededTournamentClasses(planningRealm, request, out error) - || !TryDeleteNoLongerNeededInvitationLinks(planningRealm, request, out error) - || !TryDeleteNoLongerNeededLabels(planningRealm, request, out error) - || !TryCreateOrUpdateTournamentClasses(planningRealm, request, out error) - || !TryCreateOrUpdateInvitationLinks(planningRealm, request, out error) - || !TryCreateOrUpdateLabels(planningRealm, request, out error)) + tournamentPlanner.Name = request.Name.Trim(); + + if (!TryDeleteNoLongerNeededTournamentClasses(tournamentPlanner, request, out error) + || !TryDeleteNoLongerNeededInvitationLinks(tournamentPlanner, request, out error) + || !TryDeleteNoLongerNeededLabels(tournamentPlanner, request, out error) + || !TryCreateOrUpdateTournamentClasses(tournamentPlanner, request, out error) + || !TryCreateOrUpdateInvitationLinks(tournamentPlanner, request, out error) + || !TryCreateOrUpdateLabels(tournamentPlanner, request, out error)) { return false; } @@ -83,9 +83,9 @@ private static bool TryApplyChangesToPlanningRealm(PlanningRealm planningRealm, return true; } - private static bool TryDeleteNoLongerNeededTournamentClasses(PlanningRealm planningRealm, UpdatePlanningRealmEndpointRequest request, [NotNullWhen(false)] out string? error) + private static bool TryDeleteNoLongerNeededTournamentClasses(TournamentPlanner tournamentPlanner, UpdatePlanningRealmEndpointRequest request, [NotNullWhen(false)] out string? error) { - foreach (var tournamentClass in planningRealm.TournamentClasses.ToList()) + foreach (var tournamentClass in tournamentPlanner.TournamentClasses.ToList()) { var shouldDelete = request.TournamentClasses.None(x => x.Id == tournamentClass.Id); @@ -94,7 +94,7 @@ private static bool TryDeleteNoLongerNeededTournamentClasses(PlanningRealm plann continue; } - var numberOfAppliedTeams = planningRealm.Applications + var numberOfAppliedTeams = tournamentPlanner.Applications .SelectMany(x => x.Teams) .Count(x => x.Class == tournamentClass); @@ -104,16 +104,16 @@ private static bool TryDeleteNoLongerNeededTournamentClasses(PlanningRealm plann return false; } - planningRealm.RemoveTournamentClass(tournamentClass); + tournamentPlanner.RemoveTournamentClass(tournamentClass); } error = null; return true; } - private static bool TryDeleteNoLongerNeededInvitationLinks(PlanningRealm planningRealm, UpdatePlanningRealmEndpointRequest request, [NotNullWhen(false)] out string? error) + private static bool TryDeleteNoLongerNeededInvitationLinks(TournamentPlanner tournamentPlanner, UpdatePlanningRealmEndpointRequest request, [NotNullWhen(false)] out string? error) { - foreach (var invitationLink in planningRealm.InvitationLinks.ToList()) + foreach (var invitationLink in tournamentPlanner.InvitationLinks.ToList()) { var shouldDelete = request.InvitationLinks.None(x => x.Id == invitationLink.Id); @@ -122,7 +122,7 @@ private static bool TryDeleteNoLongerNeededInvitationLinks(PlanningRealm plannin continue; } - var numberOfApplications = planningRealm.Applications.Count(x => x.SourceLink == invitationLink); + var numberOfApplications = tournamentPlanner.Applications.Count(x => x.SourceLink == invitationLink); if (numberOfApplications > 0) { @@ -130,22 +130,22 @@ private static bool TryDeleteNoLongerNeededInvitationLinks(PlanningRealm plannin return false; } - planningRealm.RemoveInvitationLink(invitationLink); + tournamentPlanner.RemoveInvitationLink(invitationLink); } error = null; return true; } - private static bool TryDeleteNoLongerNeededLabels(PlanningRealm planningRealm, UpdatePlanningRealmEndpointRequest request, [NotNullWhen(false)] out string? error) + private static bool TryDeleteNoLongerNeededLabels(TournamentPlanner tournamentPlanner, UpdatePlanningRealmEndpointRequest request, [NotNullWhen(false)] out string? error) { - foreach (var label in planningRealm.Labels.ToList()) + foreach (var label in tournamentPlanner.Labels.ToList()) { var shouldDelete = request.Labels.None(x => x.Id == label.Id); if (shouldDelete) { - planningRealm.RemoveLabel(label); + tournamentPlanner.RemoveLabel(label); } } @@ -153,13 +153,13 @@ private static bool TryDeleteNoLongerNeededLabels(PlanningRealm planningRealm, U return true; } - private static bool TryCreateOrUpdateTournamentClasses(PlanningRealm planningRealm, UpdatePlanningRealmEndpointRequest request, [NotNullWhen(false)] out string? error) + private static bool TryCreateOrUpdateTournamentClasses(TournamentPlanner tournamentPlanner, UpdatePlanningRealmEndpointRequest request, [NotNullWhen(false)] out string? error) { foreach (var requestTournamentClass in request.TournamentClasses) { if (requestTournamentClass.Id.HasValue) { - var result = planningRealm.TournamentClasses.FirstOrDefault(x => x.Id == requestTournamentClass.Id); + var result = tournamentPlanner.TournamentClasses.FirstOrDefault(x => x.Id == requestTournamentClass.Id); if (result is null) { @@ -171,7 +171,7 @@ private static bool TryCreateOrUpdateTournamentClasses(PlanningRealm planningRea } else { - planningRealm.AddTournamentClass(requestTournamentClass.Name.Trim()); + tournamentPlanner.AddTournamentClass(requestTournamentClass.Name.Trim()); } } @@ -179,7 +179,7 @@ private static bool TryCreateOrUpdateTournamentClasses(PlanningRealm planningRea return true; } - private static bool TryCreateOrUpdateInvitationLinks(PlanningRealm planningRealm, UpdatePlanningRealmEndpointRequest request, [NotNullWhen(false)] out string? error) + private static bool TryCreateOrUpdateInvitationLinks(TournamentPlanner tournamentPlanner, UpdatePlanningRealmEndpointRequest request, [NotNullWhen(false)] out string? error) { foreach (var requestInvitationLink in request.InvitationLinks) { @@ -187,7 +187,7 @@ private static bool TryCreateOrUpdateInvitationLinks(PlanningRealm planningRealm if (requestInvitationLink.Id.HasValue) { - var result = planningRealm.InvitationLinks.FirstOrDefault(x => x.Id == requestInvitationLink.Id); + var result = tournamentPlanner.InvitationLinks.FirstOrDefault(x => x.Id == requestInvitationLink.Id); if (result is null) { @@ -200,7 +200,7 @@ private static bool TryCreateOrUpdateInvitationLinks(PlanningRealm planningRealm } else { - invitationLink = planningRealm.AddInvitationLink(requestInvitationLink.Name.Trim()); + invitationLink = tournamentPlanner.AddInvitationLink(requestInvitationLink.Name.Trim()); } // This reference is required for the UpdateInvitationLinkImagesAsync() method so that it can @@ -235,7 +235,7 @@ private static bool TryCreateOrUpdateInvitationLinks(PlanningRealm planningRealm if (entry is null) { - var @class = planningRealm.TournamentClasses.FirstOrDefault(x => x.Id == requestEntry.TournamentClassId); + var @class = tournamentPlanner.TournamentClasses.FirstOrDefault(x => x.Id == requestEntry.TournamentClassId); if (@class is null) { @@ -255,7 +255,7 @@ private static bool TryCreateOrUpdateInvitationLinks(PlanningRealm planningRealm return true; } - private static bool TryCreateOrUpdateLabels(PlanningRealm planningRealm, UpdatePlanningRealmEndpointRequest request, [NotNullWhen(false)] out string? error) + private static bool TryCreateOrUpdateLabels(TournamentPlanner tournamentPlanner, UpdatePlanningRealmEndpointRequest request, [NotNullWhen(false)] out string? error) { foreach (var requestLabel in request.Labels) { @@ -263,7 +263,7 @@ private static bool TryCreateOrUpdateLabels(PlanningRealm planningRealm, UpdateP if (requestLabel.Id.HasValue) { - var result = planningRealm.Labels.FirstOrDefault(x => x.Id == requestLabel.Id); + var result = tournamentPlanner.Labels.FirstOrDefault(x => x.Id == requestLabel.Id); if (result is null) { @@ -276,7 +276,7 @@ private static bool TryCreateOrUpdateLabels(PlanningRealm planningRealm, UpdateP } else { - label = planningRealm.AddLabel(requestLabel.Name.Trim()); + label = tournamentPlanner.AddLabel(requestLabel.Name.Trim()); } label.ColorCode = requestLabel.ColorCode; @@ -290,7 +290,7 @@ private static bool TryCreateOrUpdateLabels(PlanningRealm planningRealm, UpdateP private static async Task UpdateInvitationLinkImagesAsync( IImageRepository imageRepository, IAccessValidator accessValidator, - PlanningRealm planningRealm, + TournamentPlanner tournamentPlanner, UpdatePlanningRealmEndpointRequest request) { foreach (var requestInvitationLink in request.InvitationLinks) @@ -298,7 +298,7 @@ private static bool TryCreateOrUpdateLabels(PlanningRealm planningRealm, UpdateP var primaryImageResult = await UpdateInvitationLinkImageAsync( imageRepository, accessValidator, - planningRealm, + tournamentPlanner, requestInvitationLink._invitationLink!.PrimaryLogo, requestInvitationLink.PrimaryLogoId, x => requestInvitationLink._invitationLink.SetPrimaryLogo(x) @@ -312,7 +312,7 @@ private static bool TryCreateOrUpdateLabels(PlanningRealm planningRealm, UpdateP var secondaryImageResult = await UpdateInvitationLinkImageAsync( imageRepository, accessValidator, - planningRealm, + tournamentPlanner, requestInvitationLink._invitationLink!.SecondaryLogo, requestInvitationLink.SecondaryLogoId, x => requestInvitationLink._invitationLink.SetSecondaryLogo(x) @@ -330,7 +330,7 @@ private static bool TryCreateOrUpdateLabels(PlanningRealm planningRealm, UpdateP private static async Task UpdateInvitationLinkImageAsync( IImageRepository imageRepository, IAccessValidator accessValidator, - PlanningRealm planningRealm, + TournamentPlanner tournamentPlanner, Image? currentImage, PublicId? requestImageId, Action updateImage) @@ -366,7 +366,7 @@ private static bool TryCreateOrUpdateLabels(PlanningRealm planningRealm, UpdateP return Results.Forbid(); } - if (planningRealm.Organization != requestImage.Organization) + if (tournamentPlanner.Organization != requestImage.Organization) { return Results.BadRequest("Image must belong to the same organization as the planning realm."); } diff --git a/src/Turnierplan.App/Endpoints/RoleAssignments/CreateRoleAssignmentEndpoint.cs b/src/Turnierplan.App/Endpoints/RoleAssignments/CreateRoleAssignmentEndpoint.cs index 39f134bf..9128fce0 100644 --- a/src/Turnierplan.App/Endpoints/RoleAssignments/CreateRoleAssignmentEndpoint.cs +++ b/src/Turnierplan.App/Endpoints/RoleAssignments/CreateRoleAssignmentEndpoint.cs @@ -51,7 +51,7 @@ private static async Task Handle( "Folder" => CreateRoleAssignmentAsync(request, serviceProvider, accessValidator, mapper, targetId, cancellationToken), "Image" => CreateRoleAssignmentAsync(request, serviceProvider, accessValidator, mapper, targetId, cancellationToken), "Organization" => CreateRoleAssignmentAsync(request, serviceProvider, accessValidator, mapper, targetId, cancellationToken), - "PlanningRealm" => CreateRoleAssignmentAsync(request, serviceProvider, accessValidator, mapper, targetId, cancellationToken), + "PlanningRealm" => CreateRoleAssignmentAsync(request, serviceProvider, accessValidator, mapper, targetId, cancellationToken), "Tournament" => CreateRoleAssignmentAsync(request, serviceProvider, accessValidator, mapper, targetId, cancellationToken), "Venue" => CreateRoleAssignmentAsync(request, serviceProvider, accessValidator, mapper, targetId, cancellationToken), _ => null diff --git a/src/Turnierplan.App/Endpoints/RoleAssignments/DeleteRoleAssignmentEndpoint.cs b/src/Turnierplan.App/Endpoints/RoleAssignments/DeleteRoleAssignmentEndpoint.cs index 795d7efb..79f2e3eb 100644 --- a/src/Turnierplan.App/Endpoints/RoleAssignments/DeleteRoleAssignmentEndpoint.cs +++ b/src/Turnierplan.App/Endpoints/RoleAssignments/DeleteRoleAssignmentEndpoint.cs @@ -46,7 +46,7 @@ private static async Task Handle( "Folder" => DeleteRoleAssignmentAsync(serviceProvider, accessValidator, targetId, roleAssignmentGuid, cancellationToken), "Image" => DeleteRoleAssignmentAsync(serviceProvider, accessValidator, targetId, roleAssignmentGuid, cancellationToken), "Organization" => DeleteRoleAssignmentAsync(serviceProvider, accessValidator, targetId, roleAssignmentGuid, cancellationToken), - "PlanningRealm" => DeleteRoleAssignmentAsync(serviceProvider, accessValidator, targetId, roleAssignmentGuid, cancellationToken), + "PlanningRealm" => DeleteRoleAssignmentAsync(serviceProvider, accessValidator, targetId, roleAssignmentGuid, cancellationToken), "Tournament" => DeleteRoleAssignmentAsync(serviceProvider, accessValidator, targetId, roleAssignmentGuid, cancellationToken), "Venue" => DeleteRoleAssignmentAsync(serviceProvider, accessValidator, targetId, roleAssignmentGuid, cancellationToken), _ => null diff --git a/src/Turnierplan.App/Endpoints/RoleAssignments/GetRoleAssignmentsEndpoint.cs b/src/Turnierplan.App/Endpoints/RoleAssignments/GetRoleAssignmentsEndpoint.cs index 2377d317..fc92fcdf 100644 --- a/src/Turnierplan.App/Endpoints/RoleAssignments/GetRoleAssignmentsEndpoint.cs +++ b/src/Turnierplan.App/Endpoints/RoleAssignments/GetRoleAssignmentsEndpoint.cs @@ -41,7 +41,7 @@ private static async Task Handle( "Folder" => GetRoleAssignmentsAsync(serviceProvider, accessValidator, mapper, targetId), "Image" => GetRoleAssignmentsAsync(serviceProvider, accessValidator, mapper, targetId), "Organization" => GetRoleAssignmentsAsync(serviceProvider, accessValidator, mapper, targetId), - "PlanningRealm" => GetRoleAssignmentsAsync(serviceProvider, accessValidator, mapper, targetId), + "PlanningRealm" => GetRoleAssignmentsAsync(serviceProvider, accessValidator, mapper, targetId), "Tournament" => GetRoleAssignmentsAsync(serviceProvider, accessValidator, mapper, targetId), "Venue" => GetRoleAssignmentsAsync(serviceProvider, accessValidator, mapper, targetId), _ => null diff --git a/src/Turnierplan.App/Endpoints/Tournaments/ConfigureTournamentEndpoint.cs b/src/Turnierplan.App/Endpoints/Tournaments/ConfigureTournamentEndpoint.cs index 58e04d33..4aff338f 100644 --- a/src/Turnierplan.App/Endpoints/Tournaments/ConfigureTournamentEndpoint.cs +++ b/src/Turnierplan.App/Endpoints/Tournaments/ConfigureTournamentEndpoint.cs @@ -45,7 +45,7 @@ private static async Task Handle( return Results.Forbid(); } - var planningRealms = new Dictionary(); + var planningRealms = new Dictionary(); var planningRealmIds = request.Groups .SelectMany(x => x.Teams) diff --git a/src/Turnierplan.App/Endpoints/Tournaments/GetTournamentEndpoint.cs b/src/Turnierplan.App/Endpoints/Tournaments/GetTournamentEndpoint.cs index d1a7de4a..b1affc3d 100644 --- a/src/Turnierplan.App/Endpoints/Tournaments/GetTournamentEndpoint.cs +++ b/src/Turnierplan.App/Endpoints/Tournaments/GetTournamentEndpoint.cs @@ -42,7 +42,7 @@ private static async Task Handle( var planningRealms = tournament.Teams.Select(x => x.TeamLink) .WhereNotNull() - .Select(x => x.ApplicationTeam.Application.PlanningRealm) + .Select(x => x.ApplicationTeam.Application.TournamentPlanner) .Distinct(); foreach (var planningRealm in planningRealms) diff --git a/src/Turnierplan.App/Mapping/Rules/PlanningRealmHeaderMappingRule.cs b/src/Turnierplan.App/Mapping/Rules/PlanningRealmHeaderMappingRule.cs index 1d4cdb57..cef9ecc9 100644 --- a/src/Turnierplan.App/Mapping/Rules/PlanningRealmHeaderMappingRule.cs +++ b/src/Turnierplan.App/Mapping/Rules/PlanningRealmHeaderMappingRule.cs @@ -3,9 +3,9 @@ namespace Turnierplan.App.Mapping.Rules; -internal sealed class PlanningRealmHeaderMappingRule : MappingRuleBase +internal sealed class PlanningRealmHeaderMappingRule : MappingRuleBase { - protected override PlanningRealmHeaderDto Map(IMapper mapper, MappingContext context, PlanningRealm source) + protected override PlanningRealmHeaderDto Map(IMapper mapper, MappingContext context, TournamentPlanner source) { return new PlanningRealmHeaderDto { diff --git a/src/Turnierplan.App/Mapping/Rules/PlanningRealmMappingRule.cs b/src/Turnierplan.App/Mapping/Rules/PlanningRealmMappingRule.cs index 8b4600e5..13ed7d0d 100644 --- a/src/Turnierplan.App/Mapping/Rules/PlanningRealmMappingRule.cs +++ b/src/Turnierplan.App/Mapping/Rules/PlanningRealmMappingRule.cs @@ -4,9 +4,9 @@ namespace Turnierplan.App.Mapping.Rules; -internal sealed class PlanningRealmMappingRule : MappingRuleBase +internal sealed class PlanningRealmMappingRule : MappingRuleBase { - protected override PlanningRealmDto Map(IMapper mapper, MappingContext context, PlanningRealm source) + protected override PlanningRealmDto Map(IMapper mapper, MappingContext context, TournamentPlanner source) { return new PlanningRealmDto { diff --git a/src/Turnierplan.App/Mapping/Rules/RoleAssignmentMappingRule.cs b/src/Turnierplan.App/Mapping/Rules/RoleAssignmentMappingRule.cs index ddc2a4fb..05a42858 100644 --- a/src/Turnierplan.App/Mapping/Rules/RoleAssignmentMappingRule.cs +++ b/src/Turnierplan.App/Mapping/Rules/RoleAssignmentMappingRule.cs @@ -42,7 +42,7 @@ internal sealed class ImageRoleAssignmentMappingRule : RoleAssignmentMappingRule internal sealed class OrganizationRoleAssignmentMappingRule : RoleAssignmentMappingRuleBase; -internal sealed class PlanningRealmRoleAssignmentMappingRule : RoleAssignmentMappingRuleBase; +internal sealed class PlanningRealmRoleAssignmentMappingRule : RoleAssignmentMappingRuleBase; internal sealed class TournamentRoleAssignmentMappingRule : RoleAssignmentMappingRuleBase; diff --git a/src/Turnierplan.App/Mapping/Rules/TournamentMappingRule.cs b/src/Turnierplan.App/Mapping/Rules/TournamentMappingRule.cs index 8b30f96a..3315fd8e 100644 --- a/src/Turnierplan.App/Mapping/Rules/TournamentMappingRule.cs +++ b/src/Turnierplan.App/Mapping/Rules/TournamentMappingRule.cs @@ -44,8 +44,8 @@ protected override TournamentDto Map(IMapper mapper, MappingContext context, Tou }, Link = team.TeamLink is null ? null : new TeamLinkDto { - PlanningRealmId = team.TeamLink.ApplicationTeam.Application.PlanningRealm.PublicId, - PlanningRealmName = team.TeamLink.ApplicationTeam.Application.PlanningRealm.Name, + PlanningRealmId = team.TeamLink.ApplicationTeam.Application.TournamentPlanner.PublicId, + PlanningRealmName = team.TeamLink.ApplicationTeam.Application.TournamentPlanner.Name, TournamentClassName = team.TeamLink.ApplicationTeam.Class.Name, ApplicationTeamId = team.TeamLink.ApplicationTeam.Id } diff --git a/src/Turnierplan.App/Pages/InvitationForm.cshtml.cs b/src/Turnierplan.App/Pages/InvitationForm.cshtml.cs index 6f82a7c0..557eed9d 100644 --- a/src/Turnierplan.App/Pages/InvitationForm.cshtml.cs +++ b/src/Turnierplan.App/Pages/InvitationForm.cshtml.cs @@ -93,7 +93,7 @@ public async Task OnPost() return; } - var application = Data.PlanningRealm.AddApplication(Data, contactPerson); + var application = Data.TournamentPlanner.AddApplication(Data, contactPerson); application.ContactEmail = contactEMail; application.ContactTelephone = contactTelephoneNr; diff --git a/src/Turnierplan.App/Security/AccessValidator.cs b/src/Turnierplan.App/Security/AccessValidator.cs index e3077d84..80fe01bf 100644 --- a/src/Turnierplan.App/Security/AccessValidator.cs +++ b/src/Turnierplan.App/Security/AccessValidator.cs @@ -103,7 +103,7 @@ internal static bool IsActionAllowed(IEntityWithRoleAssignments target, Ac ApiKey apiKey => IsActionAllowed(apiKey.Organization, action, principal), Image image => IsActionAllowed(image.Organization, action, principal), Folder folder => IsActionAllowed(folder.Organization, action, principal), - PlanningRealm planningRealm => IsActionAllowed(planningRealm.Organization, action, principal), + TournamentPlanner planningRealm => IsActionAllowed(planningRealm.Organization, action, principal), Tournament tournament => (tournament.Folder is not null && IsActionAllowed(tournament.Folder, action, principal)) || IsActionAllowed(tournament.Organization, action, principal), Venue venue => IsActionAllowed(venue.Organization, action, principal), _ => false @@ -126,7 +126,7 @@ internal static void AddAvailableRoles(IEntityWithRoleAssignments target, case Folder folder: AddAvailableRoles(folder.Organization, rolesList, principal); break; - case PlanningRealm planningRealm: + case TournamentPlanner planningRealm: AddAvailableRoles(planningRealm.Organization, rolesList, principal); break; case Tournament tournament: diff --git a/src/Turnierplan.Core/Organization/Organization.cs b/src/Turnierplan.Core/Organization/Organization.cs index e699e24c..8a5ba0e5 100644 --- a/src/Turnierplan.Core/Organization/Organization.cs +++ b/src/Turnierplan.Core/Organization/Organization.cs @@ -9,7 +9,7 @@ public sealed class Organization : Entity, IEntityWithRoleAssignments _apiKeys = []; internal readonly List _folders = []; internal readonly List _images = []; - internal readonly List _planningRealms = []; + internal readonly List _planningRealms = []; internal readonly List _tournaments = []; internal readonly List _venues = []; @@ -45,7 +45,7 @@ internal Organization(long id, PublicId.PublicId publicId, DateTime createdAt, s public IReadOnlyList Images => _images.AsReadOnly(); - public IReadOnlyList PlanningRealms => _planningRealms.AsReadOnly(); + public IReadOnlyList PlanningRealms => _planningRealms.AsReadOnly(); public IReadOnlyList Tournaments => _tournaments.AsReadOnly(); diff --git a/src/Turnierplan.Core/PlanningRealm/Application.cs b/src/Turnierplan.Core/PlanningRealm/Application.cs index ad6338e4..8b157b22 100644 --- a/src/Turnierplan.Core/PlanningRealm/Application.cs +++ b/src/Turnierplan.Core/PlanningRealm/Application.cs @@ -28,10 +28,10 @@ internal Application(long id, int tag, DateTime createdAt, string notes, string _comment = comment; } - internal Application(PlanningRealm planningRealm, InvitationLink? sourceLink, int tag, string contact) + internal Application(TournamentPlanner tournamentPlanner, InvitationLink? sourceLink, int tag, string contact) { Id = 0; - PlanningRealm = planningRealm; + TournamentPlanner = tournamentPlanner; SourceLink = sourceLink; Tag = tag; CreatedAt = DateTime.UtcNow; @@ -42,7 +42,7 @@ internal Application(PlanningRealm planningRealm, InvitationLink? sourceLink, in public override long Id { get; protected set; } - public PlanningRealm PlanningRealm { get; internal set; } = null!; + public TournamentPlanner TournamentPlanner { get; internal set; } = null!; public InvitationLink? SourceLink { get; internal set; } diff --git a/src/Turnierplan.Core/PlanningRealm/InvitationLink.cs b/src/Turnierplan.Core/PlanningRealm/InvitationLink.cs index d31eb4e8..17e60688 100644 --- a/src/Turnierplan.Core/PlanningRealm/InvitationLink.cs +++ b/src/Turnierplan.Core/PlanningRealm/InvitationLink.cs @@ -36,7 +36,7 @@ internal InvitationLink(string name) public PublicId.PublicId PublicId { get; } - public PlanningRealm PlanningRealm { get; internal set; } = null!; + public TournamentPlanner TournamentPlanner { get; internal set; } = null!; public string Name { get; set; } @@ -66,7 +66,7 @@ internal InvitationLink(string name) public InvitationLinkEntry AddEntry(TournamentClass tournamentClass) { - if (!PlanningRealm._tournamentClasses.Contains(tournamentClass)) + if (!TournamentPlanner._tournamentClasses.Contains(tournamentClass)) { throw new TurnierplanException("Cannot add entry with a tournament class from another planning realm."); } @@ -105,7 +105,7 @@ private void ValidateAndSetImage(Image.Image? provided, Action apply) return; } - if (provided.Organization != PlanningRealm.Organization) + if (provided.Organization != TournamentPlanner.Organization) { throw new TurnierplanException("Cannot assign an image from another organization."); } diff --git a/src/Turnierplan.Core/PlanningRealm/TeamLink.cs b/src/Turnierplan.Core/PlanningRealm/TeamLink.cs index 340cbefe..4d41ee1e 100644 --- a/src/Turnierplan.Core/PlanningRealm/TeamLink.cs +++ b/src/Turnierplan.Core/PlanningRealm/TeamLink.cs @@ -7,7 +7,7 @@ public sealed class TeamLink : Entity { public TeamLink(ApplicationTeam applicationTeam, Team team) { - var planningRealm = applicationTeam.Application.PlanningRealm; + var planningRealm = applicationTeam.Application.TournamentPlanner; var tournament = team.Tournament; if (planningRealm.Organization is null || planningRealm.Organization != tournament.Organization) diff --git a/src/Turnierplan.Core/PlanningRealm/PlanningRealm.cs b/src/Turnierplan.Core/PlanningRealm/TournamentPlanner.cs similarity index 79% rename from src/Turnierplan.Core/PlanningRealm/PlanningRealm.cs rename to src/Turnierplan.Core/PlanningRealm/TournamentPlanner.cs index 7acbd7ea..84a67e42 100644 --- a/src/Turnierplan.Core/PlanningRealm/PlanningRealm.cs +++ b/src/Turnierplan.Core/PlanningRealm/TournamentPlanner.cs @@ -3,15 +3,15 @@ namespace Turnierplan.Core.PlanningRealm; -public sealed class PlanningRealm : Entity, IEntityWithRoleAssignments, IEntityWithOrganization +public sealed class TournamentPlanner : Entity, IEntityWithRoleAssignments, IEntityWithOrganization { - internal readonly List> _roleAssignments = []; + internal readonly List> _roleAssignments = []; internal readonly List _tournamentClasses = []; internal readonly List _invitationLinks = []; internal readonly List _applications = []; internal readonly List