From c48f0a7d51e0aabc1f33090b8981fc31fa103edf Mon Sep 17 00:00:00 2001 From: Jason Dove Date: Mon, 29 Mar 2021 09:43:09 -0500 Subject: [PATCH] don't require preferred language on channels (#114) --- ErsatzTV.Application/Channels/Commands/CreateChannelHandler.cs | 3 +-- ErsatzTV.Application/Channels/Commands/UpdateChannelHandler.cs | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ErsatzTV.Application/Channels/Commands/CreateChannelHandler.cs b/ErsatzTV.Application/Channels/Commands/CreateChannelHandler.cs index fa483995b..efee11ee5 100644 --- a/ErsatzTV.Application/Channels/Commands/CreateChannelHandler.cs +++ b/ErsatzTV.Application/Channels/Commands/CreateChannelHandler.cs @@ -73,13 +73,12 @@ namespace ErsatzTV.Application.Channels.Commands .Bind(_ => createChannel.NotLongerThan(50)(c => c.Name)); private Validation ValidatePreferredLanguage(CreateChannel createChannel) => - Optional(createChannel.PreferredLanguageCode) + Optional(createChannel.PreferredLanguageCode ?? string.Empty) .Filter( lc => string.IsNullOrWhiteSpace(lc) || CultureInfo.GetCultures(CultureTypes.NeutralCultures).Any( ci => string.Equals(ci.ThreeLetterISOLanguageName, lc, StringComparison.OrdinalIgnoreCase))) .ToValidation("Preferred language code is invalid"); - private async Task> ValidateNumber(CreateChannel createChannel) { Option maybeExistingChannel = await _channelRepository.GetByNumber(createChannel.Number); diff --git a/ErsatzTV.Application/Channels/Commands/UpdateChannelHandler.cs b/ErsatzTV.Application/Channels/Commands/UpdateChannelHandler.cs index 0e5154435..2a3f71bca 100644 --- a/ErsatzTV.Application/Channels/Commands/UpdateChannelHandler.cs +++ b/ErsatzTV.Application/Channels/Commands/UpdateChannelHandler.cs @@ -97,7 +97,7 @@ namespace ErsatzTV.Application.Channels.Commands } private Validation ValidatePreferredLanguage(UpdateChannel updateChannel) => - Optional(updateChannel.PreferredLanguageCode) + Optional(updateChannel.PreferredLanguageCode ?? string.Empty) .Filter( lc => string.IsNullOrWhiteSpace(lc) || CultureInfo.GetCultures(CultureTypes.NeutralCultures).Any( ci => string.Equals(ci.ThreeLetterISOLanguageName, lc, StringComparison.OrdinalIgnoreCase)))