diff --git a/Inspector/Inspector.csproj b/Inspector/Inspector.csproj index ffc0152..c4105d1 100644 --- a/Inspector/Inspector.csproj +++ b/Inspector/Inspector.csproj @@ -21,10 +21,10 @@ - - - - + + + + diff --git a/Roadie.Api.Library.Tests/Roadie.Library.Tests.csproj b/Roadie.Api.Library.Tests/Roadie.Library.Tests.csproj index f651be8..a1c07ca 100644 --- a/Roadie.Api.Library.Tests/Roadie.Library.Tests.csproj +++ b/Roadie.Api.Library.Tests/Roadie.Library.Tests.csproj @@ -20,9 +20,9 @@ - - - + + + all diff --git a/Roadie.Api.Library/Roadie.Library.csproj b/Roadie.Api.Library/Roadie.Library.csproj index a5a11b2..7c2e10b 100644 --- a/Roadie.Api.Library/Roadie.Library.csproj +++ b/Roadie.Api.Library/Roadie.Library.csproj @@ -12,41 +12,41 @@ - - - + + + - + - - - + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - + - + - + diff --git a/Roadie.Api.Services/ArtistService.cs b/Roadie.Api.Services/ArtistService.cs index ad347b9..8f78147 100644 --- a/Roadie.Api.Services/ArtistService.cs +++ b/Roadie.Api.Services/ArtistService.cs @@ -470,7 +470,7 @@ namespace Roadie.Api.Services } sw.Stop(); - Logger.LogInformation($"ByIdAction: Artist `{ artist }`: includes [{includes.ToCSV() }], timings: [{ timings.ToTimings() }]"); + Logger.LogInformation($"ByIdAction: Artist `{artist}`: includes [{includes.ToCSV()}], timings: [{timings.ToTimings()}]"); return new OperationResult { Data = result, @@ -582,9 +582,9 @@ namespace Roadie.Api.Services } var userArtists = await DbContext.UserArtists.Where(x => x.ArtistId == artistToMerge.Id).ToArrayAsync().ConfigureAwait(false); - if(userArtists != null) + if (userArtists != null) { - foreach(var userArtist in userArtists) + foreach (var userArtist in userArtists) { userArtist.ArtistId = artistToMergeInto.Id; userArtist.LastUpdated = now; @@ -755,7 +755,7 @@ namespace Roadie.Api.Services } sw.Stop(); - Logger.LogInformation($"ById Artist: `{ result?.Data }`, includes [{ includes.ToCSV() }], timings [{ timings.ToTimings() }]"); + Logger.LogInformation($"ById Artist: `{result?.Data}`, includes [{includes.ToCSV()}], timings [{timings.ToTimings()}]"); return new OperationResult(result.Messages) { Data = result?.Data, @@ -901,12 +901,12 @@ namespace Roadie.Api.Services a.Name.ToLower().Contains(normalizedFilterValue) || a.SortName.ToLower().Contains(normalizedFilterValue) || a.RealName.ToLower().Contains(normalizedFilterValue) || - a.AlternateNames.Contains(normalizedFilterValue) + (a.AlternateNames.Contains(normalizedFilterValue) || a.AlternateNames.Contains(request.FilterValue)) where !isEqualFilter || a.Name.ToLower().Equals(normalizedFilterValue) || a.SortName.ToLower().Equals(normalizedFilterValue) || a.RealName.ToLower().Equals(normalizedFilterValue) || - a.AlternateNames.ToLower().Equals(normalizedFilterValue) + (a.AlternateNames.Contains(normalizedFilterValue) || a.AlternateNames.Contains(request.FilterValue)) where !request.FilterFavoriteOnly || favoriteArtistIds.Contains(a.Id) where request.FilterToLabelId == null || labelArtistIds.Contains(a.Id) where !isFilteredToGenre || genreArtistIds.Contains(a.Id) diff --git a/Roadie.Api.Services/Roadie.Api.Services.csproj b/Roadie.Api.Services/Roadie.Api.Services.csproj index 2080b53..a3b8200 100644 --- a/Roadie.Api.Services/Roadie.Api.Services.csproj +++ b/Roadie.Api.Services/Roadie.Api.Services.csproj @@ -10,10 +10,10 @@ - + - - + + diff --git a/Roadie.Api/Roadie.Api.csproj b/Roadie.Api/Roadie.Api.csproj index aa91f49..b4b77f8 100644 --- a/Roadie.Api/Roadie.Api.csproj +++ b/Roadie.Api/Roadie.Api.csproj @@ -32,28 +32,28 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + - - - + + + - - + +