diff --git a/src/Turnierplan.Adapter/TurnierplanClient.cs b/src/Turnierplan.Adapter/TurnierplanClient.cs index 9792b6fc..fa643fc9 100644 --- a/src/Turnierplan.Adapter/TurnierplanClient.cs +++ b/src/Turnierplan.Adapter/TurnierplanClient.cs @@ -16,19 +16,16 @@ public sealed partial class TurnierplanClient : IDisposable { private const string TurnierplanVersionHeaderName = "x-turnierplan-version"; - private static readonly string __turnierplanAdapterVersion; + private static readonly string __turnierplanAdapterVersion = + typeof(TurnierplanClient).Assembly.GetName().Version?.ToString() + ?? throw new InvalidOperationException("Could not determine Turnierplan.Adapter version from assembly name."); + private static readonly JsonSerializerOptions __serializerOptions = new() { PropertyNameCaseInsensitive = true, Converters = { new JsonStringEnumConverter() } }; - static TurnierplanClient() - { - __turnierplanAdapterVersion = typeof(TurnierplanClient).Assembly.GetName().Version?.ToString() - ?? throw new InvalidOperationException("Could not determine Turnierplan.Adapter version from assembly name."); - } - private readonly HttpClient _httpClient; private readonly bool _disposeHttpClient; private readonly bool _disableIdVerification; diff --git a/src/Turnierplan.App/Client/src/app/portal/components/document-config-match-plan/document-config-match-plan.component.ts b/src/Turnierplan.App/Client/src/app/portal/components/document-config-match-plan/document-config-match-plan.component.ts index acc8f89c..a3157610 100644 --- a/src/Turnierplan.App/Client/src/app/portal/components/document-config-match-plan/document-config-match-plan.component.ts +++ b/src/Turnierplan.App/Client/src/app/portal/components/document-config-match-plan/document-config-match-plan.component.ts @@ -15,7 +15,7 @@ export class DocumentConfigMatchPlanComponent extends DocumentConfigComponent(); + private readonly destroyed$ = new Subject(); constructor(formBuilder: FormBuilder, @Inject(CURRENT_CONFIGURATION) config: MatchPlanDocumentConfiguration) { super(); diff --git a/src/Turnierplan.App/Client/src/app/portal/components/document-config-receipts/document-config-receipts.component.ts b/src/Turnierplan.App/Client/src/app/portal/components/document-config-receipts/document-config-receipts.component.ts index 2c4f1155..4df6d873 100644 --- a/src/Turnierplan.App/Client/src/app/portal/components/document-config-receipts/document-config-receipts.component.ts +++ b/src/Turnierplan.App/Client/src/app/portal/components/document-config-receipts/document-config-receipts.component.ts @@ -111,7 +111,7 @@ export class DocumentConfigReceiptsComponent extends DocumentConfigComponent +a - +b); } protected removeReducedAmountEntry(amountKey: string): void { diff --git a/src/Turnierplan.App/Client/src/app/portal/components/document-manager/document-manager.component.ts b/src/Turnierplan.App/Client/src/app/portal/components/document-manager/document-manager.component.ts index 2f4d512e..f5ea0d89 100644 --- a/src/Turnierplan.App/Client/src/app/portal/components/document-manager/document-manager.component.ts +++ b/src/Turnierplan.App/Client/src/app/portal/components/document-manager/document-manager.component.ts @@ -41,7 +41,7 @@ export class DocumentManagerComponent { protected currentlyLoadingPreview?: string; protected currentlyUpdatingName?: string; - private configComponents = new Map>>(); + private readonly configComponents = new Map>>(); constructor( private readonly injector: Injector, @@ -67,7 +67,7 @@ export class DocumentManagerComponent { return; } - const configComponent = this.configComponents.get(document.type as DocumentType); + const configComponent = this.configComponents.get(document.type); if (configComponent === undefined) { return; } @@ -204,7 +204,7 @@ export class DocumentManagerComponent { } private getDocumentConfig(document: DocumentDto): Observable { - switch (document.type as DocumentType) { + switch (document.type) { case DocumentType.MatchPlan: return this.documentService.getMatchPlanDocumentConfiguration({ id: document.id }); case DocumentType.Receipts: @@ -215,7 +215,7 @@ export class DocumentManagerComponent { } private getDocumentConfigSaveFunction(document: DocumentDto): (config: DocumentConfiguration) => Observable { - switch (document.type as DocumentType) { + switch (document.type) { case DocumentType.MatchPlan: return (config) => this.documentService.setMatchPlanDocumentConfiguration({ id: document.id, body: config as MatchPlanDocumentConfiguration }); diff --git a/src/Turnierplan.App/Client/src/app/portal/components/duration-picker/duration-picker.component.ts b/src/Turnierplan.App/Client/src/app/portal/components/duration-picker/duration-picker.component.ts index 7901fb27..26507705 100644 --- a/src/Turnierplan.App/Client/src/app/portal/components/duration-picker/duration-picker.component.ts +++ b/src/Turnierplan.App/Client/src/app/portal/components/duration-picker/duration-picker.component.ts @@ -17,7 +17,7 @@ export class DurationPickerComponent { public set duration(value: string) { // The regex matches duration strings from the .NET TimeSpan class. This allows for the 'days' value // to be set, however the resulting minutes/seconds is clamped to be at most 23h:59m:59s - const match = value.match(/^(?:(?\d+)\.)?(?\d{2}):(?\d{2}):(?\d{2})(?:\.\d{7})?$/); + const match = /^(?:(?\d+)\.)?(?\d{2}):(?\d{2}):(?\d{2})(?:\.\d{7})?$/.exec(value); if (match?.groups) { let hours = +match.groups['h']; diff --git a/src/Turnierplan.App/Client/src/app/portal/components/image-chooser/image-chooser.component.ts b/src/Turnierplan.App/Client/src/app/portal/components/image-chooser/image-chooser.component.ts index 7f865d7d..1b48bd17 100644 --- a/src/Turnierplan.App/Client/src/app/portal/components/image-chooser/image-chooser.component.ts +++ b/src/Turnierplan.App/Client/src/app/portal/components/image-chooser/image-chooser.component.ts @@ -111,7 +111,7 @@ export class ImageChooserComponent { next: () => { if (deleteImageId === this.currentImageId) { // Close modal with undefined to trigger re-load of tournament page - this.modal.close(undefined); + this.modal.close(); } else { this.loadImages(); } diff --git a/src/Turnierplan.App/Client/src/app/portal/components/match-tree/match-tree.component.ts b/src/Turnierplan.App/Client/src/app/portal/components/match-tree/match-tree.component.ts index a8b59b5c..56628a65 100644 --- a/src/Turnierplan.App/Client/src/app/portal/components/match-tree/match-tree.component.ts +++ b/src/Turnierplan.App/Client/src/app/portal/components/match-tree/match-tree.component.ts @@ -97,7 +97,7 @@ export class MatchTreeComponent implements OnChanges, AfterViewInit { for (const match of currentColumnMatches) { for (const teamSelector of [match.teamSelectorKeyA, match.teamSelectorKeyB]) { - if (!(teamSelector.charAt(0) === 'W' || teamSelector.charAt(0) === 'L')) { + if (!(teamSelector.startsWith('W') || teamSelector.startsWith('L'))) { dependentMatchIds.push(undefined); continue; } diff --git a/src/Turnierplan.App/Client/src/app/portal/components/rename-dialog/rename-dialog.component.ts b/src/Turnierplan.App/Client/src/app/portal/components/rename-dialog/rename-dialog.component.ts index bc8686b8..33bd5c66 100644 --- a/src/Turnierplan.App/Client/src/app/portal/components/rename-dialog/rename-dialog.component.ts +++ b/src/Turnierplan.App/Client/src/app/portal/components/rename-dialog/rename-dialog.component.ts @@ -55,7 +55,7 @@ export class RenameDialogComponent { } } else if (sanitized.length === 0 && this.allowReset) { if (sanitizedInitial.length > 0) { - this.modal.close(undefined); + this.modal.close(); } else { this.modal.dismiss(); } diff --git a/src/Turnierplan.App/Client/src/app/portal/components/validation-error-dialog/validation-error-dialog.component.html b/src/Turnierplan.App/Client/src/app/portal/components/validation-error-dialog/validation-error-dialog.component.html index aa5b005a..1bc29fde 100644 --- a/src/Turnierplan.App/Client/src/app/portal/components/validation-error-dialog/validation-error-dialog.component.html +++ b/src/Turnierplan.App/Client/src/app/portal/components/validation-error-dialog/validation-error-dialog.component.html @@ -5,8 +5,15 @@

    - @for (error of _errors; track error) { -
  • {{ error }}
    • + @for (key of _errorKeys; track key) { +
  • + {{ key }} +
      + @for (error of _errors[key]; track error) { +
    • {{ error }}
      • + } +
    +
    • }
diff --git a/src/Turnierplan.App/Client/src/app/portal/components/validation-error-dialog/validation-error-dialog.component.ts b/src/Turnierplan.App/Client/src/app/portal/components/validation-error-dialog/validation-error-dialog.component.ts index 5847d2f5..d8699f63 100644 --- a/src/Turnierplan.App/Client/src/app/portal/components/validation-error-dialog/validation-error-dialog.component.ts +++ b/src/Turnierplan.App/Client/src/app/portal/components/validation-error-dialog/validation-error-dialog.component.ts @@ -5,11 +5,13 @@ import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; templateUrl: './validation-error-dialog.component.html' }) export class ValidationErrorDialogComponent { - protected _errors: string[] = []; + protected _errors: { [key: string]: string[] } = {}; + protected _errorKeys: string[] = []; constructor(protected readonly modal: NgbActiveModal) {} - public set errors(value: string[]) { + public set errors(value: { [key: string]: string[] }) { this._errors = value; + this._errorKeys = Object.keys(value); } } diff --git a/src/Turnierplan.App/Client/src/app/portal/pages/configure-tournament/configure-tournament.component.ts b/src/Turnierplan.App/Client/src/app/portal/pages/configure-tournament/configure-tournament.component.ts index 1b3d0320..52330709 100644 --- a/src/Turnierplan.App/Client/src/app/portal/pages/configure-tournament/configure-tournament.component.ts +++ b/src/Turnierplan.App/Client/src/app/portal/pages/configure-tournament/configure-tournament.component.ts @@ -90,7 +90,7 @@ export class ConfigureTournamentComponent implements OnInit, OnDestroy, DiscardC protected additionalPlayoffs: { [position: number]: TemporaryAdditionalPlayoff } = {}; // Private variables - private destroyed$ = new Subject(); + private readonly destroyed$ = new Subject(); private finalsMatchDefinitions?: FinalsMatchDefinitionDto[]; private originalTournament?: TournamentDto; @@ -237,26 +237,35 @@ export class ConfigureTournamentComponent implements OnInit, OnDestroy, DiscardC next: () => { this.loadingState = { isLoading: false }; }, - error: (error: { response?: string }) => { - if (error.response) { + error: (error: { error?: string }) => { + if (error.error) { + let parsedError: unknown; + try { - const validationErrors = (JSON.parse(error.response) as { errors?: { validations?: string[] } })?.errors?.validations; - if (validationErrors) { - const ref = this.modalService.open(ValidationErrorDialogComponent, { - size: 'md', - fullscreen: 'md', - centered: true - }); - (ref.componentInstance as ValidationErrorDialogComponent).errors = validationErrors; - this.loadingState = { isLoading: false }; - return; - } + parsedError = JSON.parse(error.error); } catch (e) { - // ignored + this.loadingState = { isLoading: false, error: error.error }; + return; } - } - this.loadingState = { isLoading: false, error: error }; + const validationErrors = (parsedError as { errors?: { [key: string]: string[] } })?.errors; + + if (validationErrors) { + const ref = this.modalService.open(ValidationErrorDialogComponent, { + size: 'md', + fullscreen: 'md', + centered: true + }); + + (ref.componentInstance as ValidationErrorDialogComponent).errors = validationErrors; + + this.loadingState = { isLoading: false }; + } else { + this.loadingState = { isLoading: false, error: error.error }; + } + } else { + this.loadingState = { isLoading: false, error: error }; + } } }); } @@ -377,13 +386,11 @@ export class ConfigureTournamentComponent implements OnInit, OnDestroy, DiscardC this.additionalPlayoffPositions.push(playoffPosition); - if (this.additionalPlayoffs[playoffPosition] === undefined) { - this.additionalPlayoffs[playoffPosition] = { - isEnabled: false, - teamSelectorA: '', - teamSelectorB: '' - }; - } + this.additionalPlayoffs[playoffPosition] ??= { + isEnabled: false, + teamSelectorA: '', + teamSelectorB: '' + }; } } diff --git a/src/Turnierplan.App/Client/src/app/portal/pages/create-tournament/create-tournament.component.ts b/src/Turnierplan.App/Client/src/app/portal/pages/create-tournament/create-tournament.component.ts index 308f51ed..aac9cac1 100644 --- a/src/Turnierplan.App/Client/src/app/portal/pages/create-tournament/create-tournament.component.ts +++ b/src/Turnierplan.App/Client/src/app/portal/pages/create-tournament/create-tournament.component.ts @@ -24,7 +24,7 @@ export class CreateTournamentComponent implements OnDestroy { protected newFolderName = new FormControl(''); protected visibility: Visibility = Visibility.Public; - private destroyed$ = new Subject(); + private readonly destroyed$ = new Subject(); constructor( private readonly organizationService: OrganizationsService, diff --git a/src/Turnierplan.App/Client/src/app/portal/pages/create-venue/create-venue.component.ts b/src/Turnierplan.App/Client/src/app/portal/pages/create-venue/create-venue.component.ts index 75b9e1e4..6e439a3d 100644 --- a/src/Turnierplan.App/Client/src/app/portal/pages/create-venue/create-venue.component.ts +++ b/src/Turnierplan.App/Client/src/app/portal/pages/create-venue/create-venue.component.ts @@ -16,7 +16,7 @@ export class CreateVenueComponent implements OnDestroy { protected organization?: OrganizationDto; protected venueName = new FormControl('', { nonNullable: true }); - private destroyed$ = new Subject(); + private readonly destroyed$ = new Subject(); constructor( private readonly organizationService: OrganizationsService, diff --git a/src/Turnierplan.App/Client/src/app/portal/pages/edit-match-plan/edit-match-plan.component.ts b/src/Turnierplan.App/Client/src/app/portal/pages/edit-match-plan/edit-match-plan.component.ts index 6ad3d125..68d45b65 100644 --- a/src/Turnierplan.App/Client/src/app/portal/pages/edit-match-plan/edit-match-plan.component.ts +++ b/src/Turnierplan.App/Client/src/app/portal/pages/edit-match-plan/edit-match-plan.component.ts @@ -49,7 +49,7 @@ export class EditMatchPlanComponent implements OnInit, OnDestroy, DiscardChanges protected localizedTeamSelectors: { [key: string]: string } = {}; // Private variables - private destroyed$ = new Subject(); + private readonly destroyed$ = new Subject(); private tournamentId?: string; constructor( diff --git a/src/Turnierplan.App/Client/src/app/portal/pages/folder-statistics/folder-statistics.component.ts b/src/Turnierplan.App/Client/src/app/portal/pages/folder-statistics/folder-statistics.component.ts index 3137de39..53e79bb8 100644 --- a/src/Turnierplan.App/Client/src/app/portal/pages/folder-statistics/folder-statistics.component.ts +++ b/src/Turnierplan.App/Client/src/app/portal/pages/folder-statistics/folder-statistics.component.ts @@ -31,7 +31,7 @@ export class FolderStatisticsComponent implements OnInit, OnDestroy { datasets: [] }; - private destroyed$ = new Subject(); + private readonly destroyed$ = new Subject(); constructor( private readonly route: ActivatedRoute, @@ -65,18 +65,16 @@ export class FolderStatisticsComponent implements OnInit, OnDestroy { .subscribe({ next: (statistics) => { if (statistics) { - if (statistics) { - this.folderName = statistics.folderName; - this.organizationId = statistics.organizationId; - this.titleService.setCompoundTitle(statistics.folderName); - - if (statistics.goalDistributionExcludedTournaments.length > 0) { - const names = [...statistics.goalDistributionExcludedTournaments.map((x) => x.tournamentName)]; - names.sort((a, b) => a.localeCompare(b)); - this.goalDistributionExcludedTournaments = names.join(', '); - } else { - this.goalDistributionExcludedTournaments = undefined; - } + this.folderName = statistics.folderName; + this.organizationId = statistics.organizationId; + this.titleService.setCompoundTitle(statistics.folderName); + + if (statistics.goalDistributionExcludedTournaments.length > 0) { + const names = [...statistics.goalDistributionExcludedTournaments.map((x) => x.tournamentName)]; + names.sort((a, b) => a.localeCompare(b)); + this.goalDistributionExcludedTournaments = names.join(', '); + } else { + this.goalDistributionExcludedTournaments = undefined; } this.loadingState = { isLoading: false }; diff --git a/src/Turnierplan.App/Client/src/app/portal/pages/folder-timetable/folder-timetable.component.ts b/src/Turnierplan.App/Client/src/app/portal/pages/folder-timetable/folder-timetable.component.ts index c1bc98f7..63cd84a4 100644 --- a/src/Turnierplan.App/Client/src/app/portal/pages/folder-timetable/folder-timetable.component.ts +++ b/src/Turnierplan.App/Client/src/app/portal/pages/folder-timetable/folder-timetable.component.ts @@ -48,8 +48,8 @@ export class FolderTimetableComponent implements OnInit, OnDestroy { protected organizationId?: string; protected missingTournaments: FolderTimetableTournamentEntry[] = []; - private refresh$ = new BehaviorSubject(false); - private destroyed$ = new Subject(); + private readonly refresh$ = new BehaviorSubject(false); + private readonly destroyed$ = new Subject(); constructor( private readonly route: ActivatedRoute, @@ -83,11 +83,9 @@ export class FolderTimetableComponent implements OnInit, OnDestroy { .subscribe({ next: (timetable) => { if (timetable) { - if (timetable) { - this.organizationId = timetable.organizationId; - this.titleService.setCompoundTitle(timetable.folderName); - this.generateTimetableView(timetable); - } + this.organizationId = timetable.organizationId; + this.titleService.setCompoundTitle(timetable.folderName); + this.generateTimetableView(timetable); this.loadingState = { isLoading: false }; this.showRefreshButton = false; @@ -249,8 +247,7 @@ export class FolderTimetableComponent implements OnInit, OnDestroy { for (const row of day.rows) { let previousEnd = 0; - for (let i = 0; i < row.entries.length; i++) { - const entry = row.entries[i]; + for (const entry of row.entries) { entry.columnsSpacing = entry.columnsOffset - previousEnd; previousEnd = entry.columnsOffset + entry.columnsCount; } diff --git a/src/Turnierplan.App/Client/src/app/portal/pages/view-organization/view-organization.component.ts b/src/Turnierplan.App/Client/src/app/portal/pages/view-organization/view-organization.component.ts index 83aa361d..a99cbc5e 100644 --- a/src/Turnierplan.App/Client/src/app/portal/pages/view-organization/view-organization.component.ts +++ b/src/Turnierplan.App/Client/src/app/portal/pages/view-organization/view-organization.component.ts @@ -59,7 +59,7 @@ export class ViewOrganizationComponent implements OnInit, OnDestroy { } ]; - private destroyed$ = new Subject(); + private readonly destroyed$ = new Subject(); constructor( private readonly route: ActivatedRoute, diff --git a/src/Turnierplan.App/Client/src/app/portal/pages/view-tournament/view-tournament.component.ts b/src/Turnierplan.App/Client/src/app/portal/pages/view-tournament/view-tournament.component.ts index e8299f17..abf9b40e 100644 --- a/src/Turnierplan.App/Client/src/app/portal/pages/view-tournament/view-tournament.component.ts +++ b/src/Turnierplan.App/Client/src/app/portal/pages/view-tournament/view-tournament.component.ts @@ -115,7 +115,7 @@ export class ViewTournamentComponent implements OnInit, OnDestroy { protected isUpdatingVisibility = false; protected isUpdatingName = false; - private destroyed$ = new Subject(); + private readonly destroyed$ = new Subject(); constructor( private readonly injector: Injector, @@ -521,7 +521,7 @@ export class ViewTournamentComponent implements OnInit, OnDestroy { } this.groupService - .setGroupName({ groupId: groupId, tournamentId: this.tournament.id, body: { name: name ? name : null } }) + .setGroupName({ groupId: groupId, tournamentId: this.tournament.id, body: { name: name ?? null } }) .pipe(switchMap(() => this.tournamentService.getTournament({ id: tournamentId }))) .subscribe({ next: (tournament) => { @@ -582,11 +582,8 @@ export class ViewTournamentComponent implements OnInit, OnDestroy { centered: true }); const component = ref.componentInstance as MoveTournamentToFolderComponent; - component.initialize( - this.tournament.organizationId, - this.tournament.folderId, - this.tournament.folderName ? this.tournament.folderName : undefined - ); + + component.initialize(this.tournament.organizationId, this.tournament.folderId, this.tournament.folderName ?? undefined); component.save$ .pipe( diff --git a/src/Turnierplan.App/Client/src/app/portal/pipes/translate-date.pipe.ts b/src/Turnierplan.App/Client/src/app/portal/pipes/translate-date.pipe.ts index 51297787..9094e0bc 100644 --- a/src/Turnierplan.App/Client/src/app/portal/pipes/translate-date.pipe.ts +++ b/src/Turnierplan.App/Client/src/app/portal/pipes/translate-date.pipe.ts @@ -25,13 +25,11 @@ export class TranslateDatePipe implements PipeTransform, OnDestroy { this.updateValue(this.translateService.currentLang ?? this.translateService.defaultLang); - if (!this.onLangChange) { - this.onLangChange = this.translateService.onLangChange.subscribe((event: LangChangeEvent) => { - if (this.lastDate && this.lastFormat) { - this.updateValue(event.lang); - } - }); - } + this.onLangChange ??= this.translateService.onLangChange.subscribe((event: LangChangeEvent) => { + if (this.lastDate && this.lastFormat) { + this.updateValue(event.lang); + } + }); return this.currentValue; } diff --git a/src/Turnierplan.App/Client/src/app/portal/portal.component.ts b/src/Turnierplan.App/Client/src/app/portal/portal.component.ts index 1c23b174..8fd342aa 100644 --- a/src/Turnierplan.App/Client/src/app/portal/portal.component.ts +++ b/src/Turnierplan.App/Client/src/app/portal/portal.component.ts @@ -21,7 +21,7 @@ export class PortalComponent implements OnInit, OnDestroy { private readonly destroyed$ = new Subject(); - constructor(private readonly authenticationService: AuthenticationService, @Inject(DOCUMENT) private document: Document) {} + constructor(private readonly authenticationService: AuthenticationService, @Inject(DOCUMENT) private readonly document: Document) {} public ngOnInit(): void { this.authenticationService.authentication$.pipe(takeUntil(this.destroyed$)).subscribe((user) => { diff --git a/src/Turnierplan.App/Dockerfile b/src/Turnierplan.App/Dockerfile index 9d53fb35..30b0045a 100644 --- a/src/Turnierplan.App/Dockerfile +++ b/src/Turnierplan.App/Dockerfile @@ -1,6 +1,6 @@ FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base ARG DATA_DIRECTORY=/var/turnierplan -RUN mkdir $DATA_DIRECTORY && chown $APP_UID $DATA_DIRECTORY +RUN mkdir "$DATA_DIRECTORY" && chown "$APP_UID" "$DATA_DIRECTORY" USER $APP_UID WORKDIR /app EXPOSE 8080 @@ -11,14 +11,14 @@ ARG BUILD_CONFIGURATION=Release WORKDIR /src COPY . . WORKDIR "/src/Turnierplan.App" -RUN dotnet build "./Turnierplan.App.csproj" -c $BUILD_CONFIGURATION -o /app/build +RUN dotnet build "./Turnierplan.App.csproj" -c "$BUILD_CONFIGURATION" -o /app/build FROM build AS publish ARG BUILD_CONFIGURATION=Release RUN curl -fsSL https://deb.nodesource.com/setup_22.x | bash - && apt-get install -y nodejs -RUN dotnet publish "./Turnierplan.App.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false +RUN dotnet publish "./Turnierplan.App.csproj" -c "$BUILD_CONFIGURATION" -o /app/publish /p:UseAppHost=false FROM base AS final WORKDIR /app diff --git a/src/Turnierplan.App/Endpoints/Documents/CreateDocumentEndpoint.cs b/src/Turnierplan.App/Endpoints/Documents/CreateDocumentEndpoint.cs index a43b48cc..c98abbbd 100644 --- a/src/Turnierplan.App/Endpoints/Documents/CreateDocumentEndpoint.cs +++ b/src/Turnierplan.App/Endpoints/Documents/CreateDocumentEndpoint.cs @@ -55,7 +55,7 @@ private static async Task Handle( if (!documentTypeRegistry.TryGetDocumentDefaultConfiguration(request.Type, out var configuration)) { - logger.LogCritical("Could not get the default document configuration for document type {documentType}.", request.Type); + logger.LogCritical("Could not get the default document configuration for document type {DocumentType}.", request.Type); return Results.InternalServerError(); } diff --git a/src/Turnierplan.App/Endpoints/Documents/GetDocumentPdfEndpoint.cs b/src/Turnierplan.App/Endpoints/Documents/GetDocumentPdfEndpoint.cs index 592570cf..f179f880 100644 --- a/src/Turnierplan.App/Endpoints/Documents/GetDocumentPdfEndpoint.cs +++ b/src/Turnierplan.App/Endpoints/Documents/GetDocumentPdfEndpoint.cs @@ -59,7 +59,7 @@ private static async Task Handle( if (!documentTypeRegistry.TryParseDocumentConfiguration(document.Type, document.Configuration, out var configuration)) { - logger.LogError("Failed to parse the document configuration of document with type '{documentType}'.", document.Type); + logger.LogError("Failed to parse the document configuration of document with type '{DocumentType}'.", document.Type); return Results.InternalServerError(); } @@ -68,7 +68,7 @@ private static async Task Handle( if (renderer is null) { - logger.LogCritical("No document renderer available for document type '{documentType}'.", document.Type); + logger.LogCritical("No document renderer available for document type '{DocumentType}'.", document.Type); return Results.InternalServerError(); } diff --git a/src/Turnierplan.App/Endpoints/Documents/SetDocumentConfigurationEndpoint.cs b/src/Turnierplan.App/Endpoints/Documents/SetDocumentConfigurationEndpoint.cs index 47092f67..2092d0dd 100644 --- a/src/Turnierplan.App/Endpoints/Documents/SetDocumentConfigurationEndpoint.cs +++ b/src/Turnierplan.App/Endpoints/Documents/SetDocumentConfigurationEndpoint.cs @@ -108,7 +108,7 @@ private MatchPlanDocumentConfigurationValidator() .IsInEnum(); RuleFor(x => x.IncludeRankingTable) - .Must(x => x == false) + .Must(x => !x) .WithMessage($"{nameof(MatchPlanDocumentConfiguration.IncludeRankingTable)} must be false if {nameof(MatchPlanDocumentConfiguration.Outcomes)} is {nameof(MatchPlanOutcomes.HideOutcomeStructures)}.") .When(x => x.Outcomes is MatchPlanOutcomes.HideOutcomeStructures); } diff --git a/src/Turnierplan.App/Endpoints/Identity/IdentityEndpointBase.cs b/src/Turnierplan.App/Endpoints/Identity/IdentityEndpointBase.cs index 34bce57f..9ef3934a 100644 --- a/src/Turnierplan.App/Endpoints/Identity/IdentityEndpointBase.cs +++ b/src/Turnierplan.App/Endpoints/Identity/IdentityEndpointBase.cs @@ -66,6 +66,7 @@ void AddCookie(string path) { HttpOnly = true, SameSite = SameSiteMode.Strict, + Secure = true, Path = path, Expires = cookieExpires }; diff --git a/src/Turnierplan.App/Endpoints/Organizations/CreateOrganizationEndpoint.cs b/src/Turnierplan.App/Endpoints/Organizations/CreateOrganizationEndpoint.cs index 6d3d6a88..f71f58df 100644 --- a/src/Turnierplan.App/Endpoints/Organizations/CreateOrganizationEndpoint.cs +++ b/src/Turnierplan.App/Endpoints/Organizations/CreateOrganizationEndpoint.cs @@ -3,7 +3,6 @@ using Turnierplan.App.Extensions; using Turnierplan.App.Mapping; using Turnierplan.App.Models; -using Turnierplan.App.Security; using Turnierplan.Core.Organization; using Turnierplan.Core.User; using Turnierplan.Dal; @@ -23,7 +22,6 @@ private static async Task Handle( HttpContext httpContext, IUserRepository userRepository, IOrganizationRepository organizationRepository, - IAccessValidator accessValidator, IMapper mapper, CancellationToken cancellationToken) { diff --git a/src/Turnierplan.App/Endpoints/Tournaments/ConfigureTournamentEndpoint.cs b/src/Turnierplan.App/Endpoints/Tournaments/ConfigureTournamentEndpoint.cs index dda750b5..fc7cfad1 100644 --- a/src/Turnierplan.App/Endpoints/Tournaments/ConfigureTournamentEndpoint.cs +++ b/src/Turnierplan.App/Endpoints/Tournaments/ConfigureTournamentEndpoint.cs @@ -345,7 +345,7 @@ private Validator() .WithMessage($"First finals round must be one of the following: {string.Join(", ", Enum.GetValues().Select(x => (int)x))}"); finalsPhase.RuleFor(x => x.ThirdPlacePlayoff) - .Must(x => x == false) + .Must(x => !x) .When(x => x.FirstFinalsRound == (int)FinalsRoundOrder.FinalOnly) .WithMessage("Third place playoff must be disabled if first finals round is 'final only'."); diff --git a/src/Turnierplan.App/Endpoints/Tournaments/GetTournamentTeamSelectorsEndpoint.cs b/src/Turnierplan.App/Endpoints/Tournaments/GetTournamentTeamSelectorsEndpoint.cs index 2bfd5d56..3c99de71 100644 --- a/src/Turnierplan.App/Endpoints/Tournaments/GetTournamentTeamSelectorsEndpoint.cs +++ b/src/Turnierplan.App/Endpoints/Tournaments/GetTournamentTeamSelectorsEndpoint.cs @@ -1,5 +1,4 @@ using Microsoft.AspNetCore.Mvc; -using Turnierplan.App.Mapping; using Turnierplan.App.Models; using Turnierplan.App.Security; using Turnierplan.Core.PublicId; @@ -22,8 +21,7 @@ private static async Task Handle( [FromQuery] string languageCode, ITournamentRepository repository, IAccessValidator accessValidator, - ILocalizationProvider localizationProvider, - IMapper mapper) + ILocalizationProvider localizationProvider) { var tournament = await repository.GetByPublicIdAsync(id, ITournamentRepository.Include.GameRelevant).ConfigureAwait(false); diff --git a/src/Turnierplan.App/Endpoints/Tournaments/SetTournamentImageEndpoint.cs b/src/Turnierplan.App/Endpoints/Tournaments/SetTournamentImageEndpoint.cs index 8f3479ef..6c3c6fac 100644 --- a/src/Turnierplan.App/Endpoints/Tournaments/SetTournamentImageEndpoint.cs +++ b/src/Turnierplan.App/Endpoints/Tournaments/SetTournamentImageEndpoint.cs @@ -75,7 +75,8 @@ private static async Task Handle( tournament.SetSponsorBanner(image); break; default: - throw new ArgumentOutOfRangeException(nameof(request.Target), request.Target, "Invalid target provided."); + // This cannot happen because its prevented by the validator + throw new InvalidOperationException(); } await tournamentRepository.UnitOfWork.SaveChangesAsync(cancellationToken).ConfigureAwait(false); diff --git a/src/Turnierplan.App/Extensions/StringExtensions.cs b/src/Turnierplan.App/Extensions/StringExtensions.cs index af62266e..5f2db57f 100644 --- a/src/Turnierplan.App/Extensions/StringExtensions.cs +++ b/src/Turnierplan.App/Extensions/StringExtensions.cs @@ -8,9 +8,9 @@ public static string ToSnakeCase(this string input) { var result = new StringBuilder(); - for (var index = 0; index < input.ToCharArray().Length; index++) + for (var index = 0; index < input.Length; index++) { - var c = input.ToCharArray()[index]; + var c = input[index]; if (char.IsLower(c)) { diff --git a/src/Turnierplan.App/Extensions/WebApplicationExtensions.cs b/src/Turnierplan.App/Extensions/WebApplicationExtensions.cs new file mode 100644 index 00000000..7ff30f29 --- /dev/null +++ b/src/Turnierplan.App/Extensions/WebApplicationExtensions.cs @@ -0,0 +1,53 @@ +using Microsoft.AspNetCore.Identity; +using Microsoft.EntityFrameworkCore; +using Turnierplan.Core.User; +using Turnierplan.Dal; +using Turnierplan.Dal.Extensions; + +namespace Turnierplan.App.Extensions; + +internal static class WebApplicationExtensions +{ + public static async Task InitializeDatabaseAsync(this WebApplication app) + { + if (string.IsNullOrWhiteSpace(app.Configuration.GetDatabaseConnectionString())) + { + return; + } + + using var scope = app.Services.CreateScope(); + + var logger = scope.ServiceProvider.GetRequiredService>(); + var context = scope.ServiceProvider.GetRequiredService(); + + await context.Database.MigrateAsync().ConfigureAwait(false); + + var userCount = await context.Users.CountAsync().ConfigureAwait(false); + + if (userCount == 0) + { + const string initialEmail = "admin@example.com"; + var initialPassword = Guid.NewGuid().ToString(); + + // The available roles are inserted by the EFCore migration + var administratorRole = await context.Roles.Where(role => role.Id == UserRoles.Administrator.Id).SingleAsync().ConfigureAwait(false); + + var passwordHasher = scope.ServiceProvider.GetRequiredService>(); + var initialUser = new User("Administrator", initialEmail); + + initialUser.AddRole(administratorRole); + initialUser.UpdatePassword(passwordHasher.HashPassword(initialUser, initialPassword)); + + await context.Users.AddAsync(initialUser).ConfigureAwait(false); + await context.SaveChangesAsync().ConfigureAwait(false); + + logger.LogWarning("An initial user was created. You can log in using \"{Email}\" and the password \"{Password}\". IMMEDIATELY change this password when running in a production environment!", initialEmail, initialPassword); + } + else + { + logger.LogInformation("Database contains {UserCount} user(s). No administrator account was created.", userCount); + } + } + + private sealed record DatabaseMigrator; +} diff --git a/src/Turnierplan.App/Helpers/DeletionHelper.cs b/src/Turnierplan.App/Helpers/DeletionHelper.cs index 58ee596f..bcd9bf68 100644 --- a/src/Turnierplan.App/Helpers/DeletionHelper.cs +++ b/src/Turnierplan.App/Helpers/DeletionHelper.cs @@ -1,4 +1,3 @@ -using Turnierplan.Core.Folder; using Turnierplan.Core.Image; using Turnierplan.Core.Organization; using Turnierplan.Core.Tournament; @@ -23,7 +22,6 @@ internal sealed class DeletionHelper : IDeletionHelper private readonly IVenueRepository _venueRepository; private readonly IImageRepository _imageRepository; private readonly IImageStorage _imageStorage; - private readonly IFolderRepository _folderRepository; private readonly ILogger _logger; public DeletionHelper( @@ -33,7 +31,6 @@ public DeletionHelper( IVenueRepository venueRepository, IImageRepository imageRepository, IImageStorage imageStorage, - IFolderRepository folderRepository, ILogger logger) { _userRepository = userRepository; @@ -42,7 +39,6 @@ public DeletionHelper( _venueRepository = venueRepository; _imageRepository = imageRepository; _imageStorage = imageStorage; - _folderRepository = folderRepository; _logger = logger; } @@ -91,7 +87,7 @@ public async Task DeleteOrganizationAsync(Organization organization, Cance { _logger.LogError(ex, "Image with id '{ImageId}' was successfully deleted from image storage but the deletion from the database failed.", image.Id); - throw; + return false; } } else diff --git a/src/Turnierplan.App/Mapping/Mapper.cs b/src/Turnierplan.App/Mapping/Mapper.cs index 268e58a7..4278b664 100644 --- a/src/Turnierplan.App/Mapping/Mapper.cs +++ b/src/Turnierplan.App/Mapping/Mapper.cs @@ -4,7 +4,7 @@ namespace Turnierplan.App.Mapping; internal interface IMapper { - private const string DefaultLanguageCode = "de"; + internal const string DefaultLanguageCode = "de"; TDestination Map(object source, string languageCode = DefaultLanguageCode) where TDestination : class; @@ -39,7 +39,7 @@ public Mapper(ILocalizationProvider localizationProvider, IServiceProvider servi } } - public TDestination Map(object source, string langaugeCode) + public TDestination Map(object source, string languageCode = IMapper.DefaultLanguageCode) where TDestination : class { var key = new Key(source.GetType(), typeof(TDestination)); @@ -49,18 +49,18 @@ public TDestination Map(object source, string langaugeCode) throw new InvalidOperationException($"There exists no mapping rule from '{key.SourceType.FullName}' to '{key.DestinationType.FullName}'."); } - var context = CreateContext(langaugeCode); + var context = CreateContext(languageCode); return (TDestination)rule.Map(this, context, source); } - public TDestination? MapNullable(object? source, string langaugeCode) + public TDestination? MapNullable(object? source, string languageCode) where TDestination : class { - return source is null ? null : Map(source, langaugeCode); + return source is null ? null : Map(source, languageCode); } - public IEnumerable MapCollection(IReadOnlyCollection source, string langaugeCode) + public IEnumerable MapCollection(IReadOnlyCollection source, string languageCode = IMapper.DefaultLanguageCode) where TDestination : class { if (source.Count == 0) @@ -75,16 +75,16 @@ public IEnumerable MapCollection(IReadOnlyCollection throw new InvalidOperationException($"There exists no mapping rule from '{key.SourceType.FullName}' to '{key.DestinationType.FullName}'."); } - var context = CreateContext(langaugeCode); + var context = CreateContext(languageCode); return source.Select(x => rule.Map(this, context, x)).Cast(); } - private MappingContext CreateContext(string langaugeCode) + private MappingContext CreateContext(string languageCode = IMapper.DefaultLanguageCode) { - if (!_localizationProvider.TryGetLocalization(langaugeCode, out var localization)) + if (!_localizationProvider.TryGetLocalization(languageCode, out var localization)) { - throw new ArgumentException($"There exists no localization with language code '{langaugeCode}'."); + throw new ArgumentException($"There exists no localization with language code '{languageCode}'."); } return new MappingContext(localization); diff --git a/src/Turnierplan.App/Program.cs b/src/Turnierplan.App/Program.cs index d686784e..735b4be5 100644 --- a/src/Turnierplan.App/Program.cs +++ b/src/Turnierplan.App/Program.cs @@ -2,16 +2,12 @@ using System.Text.Json.Serialization; using FluentValidation; using Microsoft.AspNetCore.Http.Json; -using Microsoft.AspNetCore.Identity; -using Microsoft.EntityFrameworkCore; using Scalar.AspNetCore; using Turnierplan.App.Converters; using Turnierplan.App.Extensions; using Turnierplan.App.Helpers; using Turnierplan.App.Mapping; using Turnierplan.App.OpenApi; -using Turnierplan.Core.User; -using Turnierplan.Dal; using Turnierplan.Dal.Extensions; using Turnierplan.ImageStorage.Extensions; using Turnierplan.Localization.Extensions; @@ -98,37 +94,7 @@ app.UseDefaultFiles(); app.UseStaticFiles(); -if (!string.IsNullOrWhiteSpace(app.Configuration.GetDatabaseConnectionString())) -{ - using var scope = app.Services.CreateScope(); - - var logger = scope.ServiceProvider.GetRequiredService>(); - var context = scope.ServiceProvider.GetRequiredService(); - - await context.Database.MigrateAsync().ConfigureAwait(false); - - var userCount = await context.Users.CountAsync().ConfigureAwait(false); - - if (userCount == 0) - { - const string initialEmail = "admin@example.com"; - var initialPassword = Guid.NewGuid().ToString(); - - // The available roles are inserted by the EFCore migration - var administratorRole = await context.Roles.Where(role => role.Id == UserRoles.Administrator.Id).SingleAsync().ConfigureAwait(false); - - var passwordHasher = scope.ServiceProvider.GetRequiredService>(); - var initialUser = new User("Administrator", initialEmail); - - initialUser.AddRole(administratorRole); - initialUser.UpdatePassword(passwordHasher.HashPassword(initialUser, initialPassword)); - - await context.Users.AddAsync(initialUser).ConfigureAwait(false); - await context.SaveChangesAsync().ConfigureAwait(false); - - logger.LogWarning("An initial user was created. You can log in using \"{email}\" and the password \"{password}\".", initialEmail, initialPassword); - logger.LogWarning("IMMEDIATELY change this password when running in a production environment!"); - } -} +// Migrate database and create admin user if DB is empty +await app.InitializeDatabaseAsync().ConfigureAwait(false); -app.Run(); +await app.RunAsync().ConfigureAwait(false); diff --git a/src/Turnierplan.App/Security/ApiKeyAuthenticationHandler.cs b/src/Turnierplan.App/Security/ApiKeyAuthenticationHandler.cs index e29551df..d49ea5c8 100644 --- a/src/Turnierplan.App/Security/ApiKeyAuthenticationHandler.cs +++ b/src/Turnierplan.App/Security/ApiKeyAuthenticationHandler.cs @@ -15,13 +15,9 @@ internal sealed class ApiKeyAuthenticationHandler : AuthenticationHandler _secretHasher; @@ -44,8 +40,8 @@ protected override async Task HandleAuthenticateAsync() try { - apiKeyId = Request.Headers[ApiKeyIdHeaderName].First()!; - apiKeySecret = Request.Headers[ApiKeySecretHeaderName].First()!; + apiKeyId = Request.Headers[ApiKeyIdHeaderName][0]!; + apiKeySecret = Request.Headers[ApiKeySecretHeaderName][0]!; } catch { diff --git a/src/Turnierplan.App/Security/JwtAuthenticationHandler.cs b/src/Turnierplan.App/Security/JwtAuthenticationHandler.cs index 8c784a05..48035e00 100644 --- a/src/Turnierplan.App/Security/JwtAuthenticationHandler.cs +++ b/src/Turnierplan.App/Security/JwtAuthenticationHandler.cs @@ -9,7 +9,6 @@ namespace Turnierplan.App.Security; internal sealed class JwtAuthenticationHandler : AuthenticationHandler { - private readonly IOptionsMonitor _options; private readonly ISigningKeyProvider _signingKeyProvider; public JwtAuthenticationHandler( @@ -19,7 +18,6 @@ public JwtAuthenticationHandler( UrlEncoder encoder) : base(options, logger, encoder) { - _options = options; _signingKeyProvider = signingKeyProvider; } diff --git a/src/Turnierplan.Core.Test.Unit/Tournament/TournamentTest.cs b/src/Turnierplan.Core.Test.Unit/Tournament/TournamentTest.cs index 3c985710..86876b9d 100644 --- a/src/Turnierplan.Core.Test.Unit/Tournament/TournamentTest.cs +++ b/src/Turnierplan.Core.Test.Unit/Tournament/TournamentTest.cs @@ -111,13 +111,13 @@ public void Tournament___StartTimestamp_And_EndTimestamp_When_Matches_Have_Kicko ScheduleConfig = new ScheduleConfig { FirstMatchKickoff = default, - GroupPhaseNumberOfCourts = default, + GroupPhaseNumberOfCourts = 0, GroupPhasePlayTime = 7.Minutes(), - GroupPhasePauseTime = default, - PauseBetweenGroupAndFinalsPhase = default, - FinalsPhaseNumberOfCourts = default, + GroupPhasePauseTime = TimeSpan.Zero, + PauseBetweenGroupAndFinalsPhase = TimeSpan.Zero, + FinalsPhaseNumberOfCourts = 0, FinalsPhasePlayTime = 9.Minutes(), - FinalsPhasePauseTime = default + FinalsPhasePauseTime = TimeSpan.Zero } }; diff --git a/src/Turnierplan.Core/Image/ImageConstraints.cs b/src/Turnierplan.Core/Image/ImageConstraints.cs index a76a6372..3e9e92db 100644 --- a/src/Turnierplan.Core/Image/ImageConstraints.cs +++ b/src/Turnierplan.Core/Image/ImageConstraints.cs @@ -22,12 +22,9 @@ private ImageConstraints(bool mustBeSquare, float? minimumAspectRatio = null, fl } else { - ArgumentNullException.ThrowIfNull(minimumAspectRatio); - ArgumentNullException.ThrowIfNull(maximumAspectRatio); - _mustBeSquare = false; - _minimumAspectRatio = minimumAspectRatio; - _maximumAspectRatio = maximumAspectRatio; + _minimumAspectRatio = minimumAspectRatio ?? throw new ArgumentNullException(nameof(minimumAspectRatio)); + _maximumAspectRatio = maximumAspectRatio ?? throw new ArgumentNullException(nameof(maximumAspectRatio)); } } diff --git a/src/Turnierplan.Core/Tournament/Definitions/AbstractTeamSelectorParser.cs b/src/Turnierplan.Core/Tournament/Definitions/AbstractTeamSelectorParser.cs index 03a8ec36..a00ea169 100644 --- a/src/Turnierplan.Core/Tournament/Definitions/AbstractTeamSelectorParser.cs +++ b/src/Turnierplan.Core/Tournament/Definitions/AbstractTeamSelectorParser.cs @@ -8,7 +8,7 @@ namespace Turnierplan.Core.Tournament.Definitions; /// The FinalsMatchDefinitions.json uses a modified string representation for the abstract team selectors because the /// definitions file should be easily readable and the "standard" string representation format is not particularly intuitive. /// -public sealed partial class AbstractTeamSelectorParser +public static partial class AbstractTeamSelectorParser { public static AbstractTeamSelector ParseAbstractTeamSelector(string? source) { diff --git a/src/Turnierplan.Core/Tournament/TeamSelectors/GroupDefinitionSelector.cs b/src/Turnierplan.Core/Tournament/TeamSelectors/GroupDefinitionSelector.cs index 040aaf2c..e48657ee 100644 --- a/src/Turnierplan.Core/Tournament/TeamSelectors/GroupDefinitionSelector.cs +++ b/src/Turnierplan.Core/Tournament/TeamSelectors/GroupDefinitionSelector.cs @@ -8,12 +8,12 @@ public sealed record GroupDefinitionSelector(int TargetGroupId, int TargetTeamIn if (group is null) { - return default; + return null; } if (TargetTeamIndex < 0 || TargetTeamIndex >= group._participants.Count) { - return default; + return null; } return group._participants[TargetTeamIndex].Team; diff --git a/src/Turnierplan.Core/Tournament/TeamSelectors/GroupResultsNthRankedSelector.cs b/src/Turnierplan.Core/Tournament/TeamSelectors/GroupResultsNthRankedSelector.cs index 08ae398e..13aaef6a 100644 --- a/src/Turnierplan.Core/Tournament/TeamSelectors/GroupResultsNthRankedSelector.cs +++ b/src/Turnierplan.Core/Tournament/TeamSelectors/GroupResultsNthRankedSelector.cs @@ -6,7 +6,7 @@ public sealed record GroupResultsNthRankedSelector(int[] TargetGroupIds, int Ord { if (OrdinalNumber < 0 || PlacementRank < 1) { - return default; + return null; } var eligibleTeams = new List(); @@ -22,12 +22,12 @@ public sealed record GroupResultsNthRankedSelector(int[] TargetGroupIds, int Ord if (tournament._matches.Where(x => x.Group?.Id == groupId).Any(x => !x.IsFinished)) { - return default; + return null; } var results = group._participants.SingleOrDefault(x => x.Statistics.Position == PlacementRank); - if (results == default) + if (results == null) { continue; } @@ -35,9 +35,9 @@ public sealed record GroupResultsNthRankedSelector(int[] TargetGroupIds, int Ord eligibleTeams.Add(results); } - if (OrdinalNumber < 0 || OrdinalNumber >= eligibleTeams.Count) + if (OrdinalNumber >= eligibleTeams.Count) { - return default; + return null; } eligibleTeams.Sort(tournament._groupParticipantComparer); diff --git a/src/Turnierplan.Core/Tournament/TeamSelectors/GroupResultsSelector.cs b/src/Turnierplan.Core/Tournament/TeamSelectors/GroupResultsSelector.cs index 32119930..b14eb1b7 100644 --- a/src/Turnierplan.Core/Tournament/TeamSelectors/GroupResultsSelector.cs +++ b/src/Turnierplan.Core/Tournament/TeamSelectors/GroupResultsSelector.cs @@ -8,12 +8,12 @@ public sealed record GroupResultsSelector(int TargetGroupId, int TargetGroupPosi if (group is null) { - return default; + return null; } if (tournament._matches.Where(x => x.Group?.Id == TargetGroupId).Any(x => !x.IsFinished)) { - return default; + return null; } var result = group._participants.SingleOrDefault(x => x.Statistics.Position == TargetGroupPosition); diff --git a/src/Turnierplan.Core/Tournament/TeamSelectors/MatchSelector.cs b/src/Turnierplan.Core/Tournament/TeamSelectors/MatchSelector.cs index 65a72829..4506ec52 100644 --- a/src/Turnierplan.Core/Tournament/TeamSelectors/MatchSelector.cs +++ b/src/Turnierplan.Core/Tournament/TeamSelectors/MatchSelector.cs @@ -8,7 +8,7 @@ public sealed record MatchSelector(int TargetMatchIndex, MatchSelector.Mode Sele if (match is null || !match.IsFinished || match.ScoreA is null || match.ScoreB is null) { - return default; + return null; } if (match.ScoreA > match.ScoreB) @@ -21,7 +21,7 @@ public sealed record MatchSelector(int TargetMatchIndex, MatchSelector.Mode Sele return SelectionMode == Mode.Winner ? match.TeamB : match.TeamA; } - return default; + return null; } public enum Mode diff --git a/src/Turnierplan.Core/Tournament/TeamSelectors/NullSelector.cs b/src/Turnierplan.Core/Tournament/TeamSelectors/NullSelector.cs index d2e4c765..f26f9d89 100644 --- a/src/Turnierplan.Core/Tournament/TeamSelectors/NullSelector.cs +++ b/src/Turnierplan.Core/Tournament/TeamSelectors/NullSelector.cs @@ -4,6 +4,6 @@ public sealed record NullSelector : TeamSelectorBase { public override Team? GetTargetTeam(Tournament tournament) { - return default; + return null; } } diff --git a/src/Turnierplan.Core/Tournament/Tournament.cs b/src/Turnierplan.Core/Tournament/Tournament.cs index e6e7243b..7b662ee4 100644 --- a/src/Turnierplan.Core/Tournament/Tournament.cs +++ b/src/Turnierplan.Core/Tournament/Tournament.cs @@ -101,11 +101,11 @@ public DateTime? StartTimestamp { DateTime? start = null; - foreach (var match in _matches) + foreach (var kickoff in _matches.Select(x => x.Kickoff)) { - if (match.Kickoff.HasValue && (!start.HasValue || match.Kickoff.Value < start)) + if (kickoff.HasValue && (!start.HasValue || kickoff.Value < start)) { - start = match.Kickoff; + start = kickoff; } } @@ -411,10 +411,10 @@ public IEnumerable GenerateAllTeamSelectors() } } - foreach (var match in _matches.Where(match => !match.IsGroupMatch)) + foreach (var index in _matches.Where(match => !match.IsGroupMatch).Select(match => match.Index)) { - yield return new MatchSelector(match.Index, MatchSelector.Mode.Winner); - yield return new MatchSelector(match.Index, MatchSelector.Mode.Loser); + yield return new MatchSelector(index, MatchSelector.Mode.Winner); + yield return new MatchSelector(index, MatchSelector.Mode.Loser); } } @@ -841,7 +841,7 @@ private void GenerateFinalsMatches(FinalsRoundConfig? config, int matchIndexOffs _matches.Add(new Match(GetNextId(), globalMatchIndex, finalTeamA, finalTeamB, 0, 1)); } - private void GenerateAdditionalRankingMatches(IList? config, ref int globalMatchIndex) + private void GenerateAdditionalRankingMatches(List? config, ref int globalMatchIndex) { if (config is null || config.Count == 0) { @@ -929,7 +929,7 @@ private void GenerateSchedule(ScheduleConfig? config) { nextKickoffTime += config.PauseBetweenGroupAndFinalsPhase; - var firstFinalsMatch = finalsMatches.First(); + var firstFinalsMatch = finalsMatches[0]; var previousFinalsMatchRound = firstFinalsMatch.FinalsRound; firstFinalsMatch.Kickoff = nextKickoffTime; diff --git a/src/Turnierplan.Dal/EntityConfigurations/RoleEntityTypeConfiguration.cs b/src/Turnierplan.Dal/EntityConfigurations/RoleEntityTypeConfiguration.cs index fcd70cc1..6196517e 100644 --- a/src/Turnierplan.Dal/EntityConfigurations/RoleEntityTypeConfiguration.cs +++ b/src/Turnierplan.Dal/EntityConfigurations/RoleEntityTypeConfiguration.cs @@ -22,8 +22,6 @@ public void Configure(EntityTypeBuilder builder) .IsRequired() .HasMaxLength(ValidationConstants.Role.MaxNameLength); - builder.HasData([ - UserRoles.Administrator - ]); + builder.HasData(UserRoles.Administrator); } } diff --git a/src/Turnierplan.Dal/Extensions/UnitOfWorkExtensions.cs b/src/Turnierplan.Dal/Extensions/UnitOfWorkExtensions.cs index bbb538b7..7a03f690 100644 --- a/src/Turnierplan.Dal/Extensions/UnitOfWorkExtensions.cs +++ b/src/Turnierplan.Dal/Extensions/UnitOfWorkExtensions.cs @@ -4,7 +4,7 @@ namespace Turnierplan.Dal.Extensions; public static class UnitOfWorkExtensions { - public sealed class TransactionWrapper : IDisposable, IAsyncDisposable + public sealed class TransactionWrapper : IAsyncDisposable { private readonly IUnitOfWork _unitOfWork; @@ -16,11 +16,6 @@ public TransactionWrapper(IUnitOfWork unitOfWork) public bool ShouldCommit { private get; set; } - public void Dispose() - { - throw new NotSupportedException($"Only use '{nameof(UnitOfWorkExtensions)}.{nameof(WrapTransactionAsync)}()' with 'await using ...;'"); - } - public async ValueTask DisposeAsync() { if (ShouldCommit) diff --git a/src/Turnierplan.Dal/Repositories/UserRepository.cs b/src/Turnierplan.Dal/Repositories/UserRepository.cs index 366a9fce..53723da4 100644 --- a/src/Turnierplan.Dal/Repositories/UserRepository.cs +++ b/src/Turnierplan.Dal/Repositories/UserRepository.cs @@ -12,7 +12,7 @@ public Task> GetAllUsers() .ToListAsync(); } - public Task GetByIdAsync(Guid id, bool includeOrganizationsDeep) + public Task GetByIdAsync(Guid id, bool includeOrganizationsDeep = false) { var query = DbSet.Where(x => x.Id.Equals(id)); diff --git a/src/Turnierplan.ImageStorage/Local/LocalImageStorage.cs b/src/Turnierplan.ImageStorage/Local/LocalImageStorage.cs index b845577b..2c33a821 100644 --- a/src/Turnierplan.ImageStorage/Local/LocalImageStorage.cs +++ b/src/Turnierplan.ImageStorage/Local/LocalImageStorage.cs @@ -18,7 +18,7 @@ public LocalImageStorage(ILogger logger, IOptions SaveImageAsync(Image image, MemoryStream imageData) if (!Directory.Exists(imageDirectoryPath)) { - _logger.LogCritical("The directory for the image could not be created: '{imageDirectory}'.", imageDirectoryPath); + _logger.LogCritical("The directory for the image could not be created: '{ImageDirectory}'.", imageDirectoryPath); return Task.FromResult(false); } } - _logger.LogDebug("Writing image to: {filePath}", filePath); + _logger.LogDebug("Writing image to: {FilePath}", filePath); using var destination = new FileStream(filePath, FileMode.Create); imageData.CopyTo(destination); @@ -64,7 +64,7 @@ public Task SaveImageAsync(Image image, MemoryStream imageData) } catch (Exception ex) { - _logger.LogError(ex, "Failed to save image to file to '{filePath}'.", filePath); + _logger.LogError(ex, "Failed to save image to file to '{FilePath}'.", filePath); return Task.FromResult(false); } @@ -85,7 +85,7 @@ public Task DeleteImageAsync(Image image) } catch (Exception ex) { - _logger.LogError(ex, "Failed to delete image file '{filePath}'.", filePath); + _logger.LogError(ex, "Failed to delete image file '{FilePath}'.", filePath); return Task.FromResult(false); } diff --git a/src/Turnierplan.Localization/ILocalization.cs b/src/Turnierplan.Localization/ILocalization.cs index 3e10cf61..084718df 100644 --- a/src/Turnierplan.Localization/ILocalization.cs +++ b/src/Turnierplan.Localization/ILocalization.cs @@ -7,11 +7,11 @@ public interface ILocalization { string Get(string key); - string Get(string key, object arg1); + string Get(string key, object arg0); - string Get(string key, object arg1, object arg2); + string Get(string key, object arg0, object arg1); - string Get(string key, object arg1, object arg2, object arg3); + string Get(string key, object arg0, object arg1, object arg2); string Get(string key, params object[] args); diff --git a/src/Turnierplan.Localization/ILocalizationProvider.cs b/src/Turnierplan.Localization/ILocalizationProvider.cs index 207c02c6..2a551d5d 100644 --- a/src/Turnierplan.Localization/ILocalizationProvider.cs +++ b/src/Turnierplan.Localization/ILocalizationProvider.cs @@ -4,5 +4,5 @@ namespace Turnierplan.Localization; public interface ILocalizationProvider { - bool TryGetLocalization(string languageCode, [NotNullWhen(true)] out ILocalization? translator); + bool TryGetLocalization(string languageCode, [NotNullWhen(true)] out ILocalization? localization); } diff --git a/src/Turnierplan.Localization/InMemoryLocalization.cs b/src/Turnierplan.Localization/InMemoryLocalization.cs index 673eb328..0ea8adcb 100644 --- a/src/Turnierplan.Localization/InMemoryLocalization.cs +++ b/src/Turnierplan.Localization/InMemoryLocalization.cs @@ -20,19 +20,19 @@ public override string Get(string key) return _values.GetValueOrDefault(key, key); } - public override string Get(string key, object arg1) + public override string Get(string key, object arg0) { - return _values.TryGetValue(key, out var value) ? string.Format(Culture, value, arg1) : key; + return _values.TryGetValue(key, out var value) ? string.Format(Culture, value, arg0) : key; } - public override string Get(string key, object arg1, object arg2) + public override string Get(string key, object arg0, object arg1) { - return _values.TryGetValue(key, out var value) ? string.Format(Culture, value, arg1, arg2) : key; + return _values.TryGetValue(key, out var value) ? string.Format(Culture, value, arg0, arg1) : key; } - public override string Get(string key, object arg1, object arg2, object arg3) + public override string Get(string key, object arg0, object arg1, object arg2) { - return _values.TryGetValue(key, out var value) ? string.Format(Culture, value, arg1, arg2, arg3) : key; + return _values.TryGetValue(key, out var value) ? string.Format(Culture, value, arg0, arg1, arg2) : key; } public override string Get(string key, params object[] args) diff --git a/src/Turnierplan.Localization/LocalizationBase.cs b/src/Turnierplan.Localization/LocalizationBase.cs index 77a8b3b8..bf2b42e9 100644 --- a/src/Turnierplan.Localization/LocalizationBase.cs +++ b/src/Turnierplan.Localization/LocalizationBase.cs @@ -7,11 +7,11 @@ public abstract class LocalizationBase : ILocalization { public abstract string Get(string key); - public abstract string Get(string key, object arg1); + public abstract string Get(string key, object arg0); - public abstract string Get(string key, object arg1, object arg2); + public abstract string Get(string key, object arg0, object arg1); - public abstract string Get(string key, object arg1, object arg2, object arg3); + public abstract string Get(string key, object arg0, object arg1, object arg2); public abstract string Get(string key, params object[] args); diff --git a/src/Turnierplan.Localization/LocalizationProvider.cs b/src/Turnierplan.Localization/LocalizationProvider.cs index 0ad330da..ba1a1e27 100644 --- a/src/Turnierplan.Localization/LocalizationProvider.cs +++ b/src/Turnierplan.Localization/LocalizationProvider.cs @@ -47,7 +47,7 @@ private void LoadLanguages() if (stream is null) { - _logger.LogError("Stream for translations file '{}' is null.", resourceName); + _logger.LogError("Stream for translations file '{LocalizationResourceName}' is null.", resourceName); continue; } @@ -55,7 +55,7 @@ private void LoadLanguages() if (culture is null) { - _logger.LogWarning("Could not find '{}' for language code '{}'. Falling back to '{}'.", nameof(CultureInfo), languageCode, nameof(CultureInfo.InvariantCulture)); + _logger.LogWarning("Could not find CultureInfo for language code '{LanguageCode}'. Falling back to 'InvariantCulture'.", languageCode); culture = CultureInfo.InvariantCulture; } @@ -64,7 +64,7 @@ private void LoadLanguages() } catch (Exception ex) { - _logger.LogError(ex, "Failed to load translations for language with code '{}'.", languageCode); + _logger.LogError(ex, "Failed to load translations for language with code '{LanguageCode}'.", languageCode); } } } diff --git a/src/Turnierplan.PdfRendering.Test.Unit/Renderer/RendererTestBase.cs b/src/Turnierplan.PdfRendering.Test.Unit/Renderer/RendererTestBase.cs index 824abab1..abce5e79 100644 --- a/src/Turnierplan.PdfRendering.Test.Unit/Renderer/RendererTestBase.cs +++ b/src/Turnierplan.PdfRendering.Test.Unit/Renderer/RendererTestBase.cs @@ -53,10 +53,10 @@ protected void AssertRender(Tournament tournament, IDocumentConfiguration config { foreach(var languageCode in __languageCodes) { - __serviceProvider.GetRequiredService().TryGetLocalization(languageCode, out var translator).Should().BeTrue(); + __serviceProvider.GetRequiredService().TryGetLocalization(languageCode, out var localization).Should().BeTrue(); using var stream = new MemoryStream(); - GetRenderer().Render(tournament, configuration, new TranslatorWrapper(translator!), stream); + GetRenderer().Render(tournament, configuration, new LocalizationWrapper(localization!), stream); var pdfData = stream.ToArray(); @@ -85,15 +85,15 @@ private void SaveGeneratedPdf(string name, string languageCode, byte[] pdfData) [GeneratedRegex(@"^%PDF-\d\.\d")] private static partial Regex PdfHeaderRegex(); - private sealed class TranslatorWrapper(ILocalization inner) : LocalizationBase + private sealed class LocalizationWrapper(ILocalization inner) : LocalizationBase { public override string Get(string key) => GetSafe(key, () => inner.Get(key)); - public override string Get(string key, object arg1) => GetSafe(key, () => inner.Get(key, arg1)); + public override string Get(string key, object arg0) => GetSafe(key, () => inner.Get(key, arg0)); - public override string Get(string key, object arg1, object arg2) => GetSafe(key, () => inner.Get(key, arg1, arg2)); + public override string Get(string key, object arg0, object arg1) => GetSafe(key, () => inner.Get(key, arg0, arg1)); - public override string Get(string key, object arg1, object arg2, object arg3) => GetSafe(key, () => inner.Get(key, arg1, arg2, arg3)); + public override string Get(string key, object arg0, object arg1, object arg2) => GetSafe(key, () => inner.Get(key, arg0, arg1, arg2)); public override string Get(string key, params object[] args) => GetSafe(key, () => inner.Get(key, args)); diff --git a/src/Turnierplan.PdfRendering/Renderer/MatchPlanRenderer.cs b/src/Turnierplan.PdfRendering/Renderer/MatchPlanRenderer.cs index 96760c44..665cff81 100644 --- a/src/Turnierplan.PdfRendering/Renderer/MatchPlanRenderer.cs +++ b/src/Turnierplan.PdfRendering/Renderer/MatchPlanRenderer.cs @@ -296,8 +296,10 @@ private static string GetDecidingMatchColor(Match match) } } -static file class MatchPlanQuestPdfExtensions +file static class MatchPlanQuestPdfExtensions { + private const string TableHeaderBackgroundColor = "aaaaaa"; + public static void MatchTimeSection(this IContainer container, DateTime? kickoff, TimeSpan? playTime, TimeSpan? pauseTime, ILocalization localization) { container.Row(row => @@ -394,18 +396,18 @@ public static void GroupPhaseMatches(this IContainer container, Tournament tourn table.Header(header => { - header.Cell().Background("aaaaaa").Border(2).BorderColor(Colors.Black).Padding(2).AlignCenter().Text(localization.Get("Documents.MatchPlan.Headers.Index")).Bold(); - header.Cell().Background("aaaaaa").BorderHorizontal(2).BorderLeft(2).BorderRight(0.5f).BorderColor(Colors.Black).Padding(2).AlignCenter().Text(localization.Get("Documents.MatchPlan.Headers.Group")).Bold(); - header.Cell().Background("aaaaaa").BorderHorizontal(2).BorderVertical(0.5f).BorderColor(Colors.Black).Padding(2).AlignCenter().Text(localization.Get("Documents.MatchPlan.Headers.Court")).Bold(); - header.Cell().Background("aaaaaa").BorderHorizontal(2).BorderRight(2).BorderLeft(0.5f).BorderColor(Colors.Black).Padding(2).AlignCenter().Text(localization.Get("Documents.MatchPlan.Headers.Kickoff")).Bold(); - header.Cell().ColumnSpan(3).Background("aaaaaa").Border(2).BorderColor(Colors.Black).Padding(2).AlignCenter().Text(localization.Get("Documents.MatchPlan.Headers.Teams")).Bold(); + header.Cell().Background(TableHeaderBackgroundColor).Border(2).BorderColor(Colors.Black).Padding(2).AlignCenter().Text(localization.Get("Documents.MatchPlan.Headers.Index")).Bold(); + header.Cell().Background(TableHeaderBackgroundColor).BorderHorizontal(2).BorderLeft(2).BorderRight(0.5f).BorderColor(Colors.Black).Padding(2).AlignCenter().Text(localization.Get("Documents.MatchPlan.Headers.Group")).Bold(); + header.Cell().Background(TableHeaderBackgroundColor).BorderHorizontal(2).BorderVertical(0.5f).BorderColor(Colors.Black).Padding(2).AlignCenter().Text(localization.Get("Documents.MatchPlan.Headers.Court")).Bold(); + header.Cell().Background(TableHeaderBackgroundColor).BorderHorizontal(2).BorderRight(2).BorderLeft(0.5f).BorderColor(Colors.Black).Padding(2).AlignCenter().Text(localization.Get("Documents.MatchPlan.Headers.Kickoff")).Bold(); + header.Cell().ColumnSpan(3).Background(TableHeaderBackgroundColor).Border(2).BorderColor(Colors.Black).Padding(2).AlignCenter().Text(localization.Get("Documents.MatchPlan.Headers.Teams")).Bold(); if (showResultColumn) { - header.Cell().Background("aaaaaa").Border(2).BorderColor(Colors.Black).Padding(2).AlignCenter().Text(localization.Get("Documents.MatchPlan.Headers.Outcome")).Bold(); + header.Cell().Background(TableHeaderBackgroundColor).Border(2).BorderColor(Colors.Black).Padding(2).AlignCenter().Text(localization.Get("Documents.MatchPlan.Headers.Outcome")).Bold(); } - header.Cell().Background("aaaaaa").Border(2).BorderColor(Colors.Black); + header.Cell().Background(TableHeaderBackgroundColor).Border(2).BorderColor(Colors.Black); }); var matches = tournament.Matches.Where(x => x.IsGroupMatch).OrderBy(x => x.Index).ToArray(); @@ -531,13 +533,13 @@ private static void Group(this IContainer container, Group group, ILocalization table.Header(header => { - header.Cell().ColumnSpan(2).Background("aaaaaa").Border(2).BorderColor(Colors.Black).Padding(2).AlignCenter().Text(localization.LocalizeGroupName(group)).Bold(); + header.Cell().ColumnSpan(2).Background(TableHeaderBackgroundColor).Border(2).BorderColor(Colors.Black).Padding(2).AlignCenter().Text(localization.LocalizeGroupName(group)).Bold(); if (showResultColumns) { - header.Cell().Background("aaaaaa").Border(2).BorderColor(Colors.Black).Padding(2).AlignCenter().Text(localization.Get("Documents.MatchPlan.Headers.Points")).Bold(); - header.Cell().Background("aaaaaa").Border(2).BorderColor(Colors.Black).Padding(2).AlignCenter().Text(localization.Get("Documents.MatchPlan.Headers.Score")).Bold(); - header.Cell().Background("aaaaaa").Border(2).BorderColor(Colors.Black).Padding(2).AlignCenter().Text(localization.Get("Documents.MatchPlan.Headers.ScoreDiff")).Bold(); + header.Cell().Background(TableHeaderBackgroundColor).Border(2).BorderColor(Colors.Black).Padding(2).AlignCenter().Text(localization.Get("Documents.MatchPlan.Headers.Points")).Bold(); + header.Cell().Background(TableHeaderBackgroundColor).Border(2).BorderColor(Colors.Black).Padding(2).AlignCenter().Text(localization.Get("Documents.MatchPlan.Headers.Score")).Bold(); + header.Cell().Background(TableHeaderBackgroundColor).Border(2).BorderColor(Colors.Black).Padding(2).AlignCenter().Text(localization.Get("Documents.MatchPlan.Headers.ScoreDiff")).Bold(); } });