diff --git a/Roadie.Api.Library/Factories/ArtistFactory.cs b/Roadie.Api.Library/Factories/ArtistFactory.cs index a5b6362..9170337 100644 --- a/Roadie.Api.Library/Factories/ArtistFactory.cs +++ b/Roadie.Api.Library/Factories/ArtistFactory.cs @@ -165,7 +165,7 @@ namespace Roadie.Library.Factories await this.DbContext.Database.ExecuteSqlCommandAsync(sql); sql = "UPDATE `image` set artistId = " + artistToMergeInto.Id + " WHERE artistId = " + ArtistToMerge.Id + ";"; await this.DbContext.Database.ExecuteSqlCommandAsync(sql); - sql = "UPDATE `userArtist` set artistId = " + artistToMergeInto.Id + " WHERE artistId = " + ArtistToMerge.Id + ";"; + sql = "UPDATE `userartist` set artistId = " + artistToMergeInto.Id + " WHERE artistId = " + ArtistToMerge.Id + ";"; await this.DbContext.Database.ExecuteSqlCommandAsync(sql); sql = "UPDATE `track` set artistId = " + artistToMergeInto.Id + " WHERE artistId = " + ArtistToMerge.Id + ";"; await this.DbContext.Database.ExecuteSqlCommandAsync(sql); diff --git a/Roadie.Api.Services/ArtistService.cs b/Roadie.Api.Services/ArtistService.cs index e1fe3e3..a101bca 100644 --- a/Roadie.Api.Services/ArtistService.cs +++ b/Roadie.Api.Services/ArtistService.cs @@ -550,13 +550,19 @@ namespace Roadie.Api.Services sw.Start(); var errors = new List(); - var artistToMerge = this.GetArtist(artistToMergeId); + var artistToMerge = this.DbContext.Artists + .Include(x => x.Genres) + .Include("Genres.Genre") + .FirstOrDefault(x => x.RoadieId == artistToMergeId); if (artistToMerge == null) { this.Logger.LogWarning("MergeArtists Unknown Artist [{0}]", artistToMergeId); return new OperationResult(true, string.Format("Artist Not Found [{0}]", artistToMergeId)); } - var mergeIntoArtist = this.GetArtist(artistToMergeIntoId); + var mergeIntoArtist = this.DbContext.Artists + .Include(x => x.Genres) + .Include("Genres.Genre") + .FirstOrDefault(x => x.RoadieId == artistToMergeIntoId); if (mergeIntoArtist == null) { this.Logger.LogWarning("MergeArtists Unknown Artist [{0}]", artistToMergeIntoId); diff --git a/Roadie.Api.Services/ReleaseService.cs b/Roadie.Api.Services/ReleaseService.cs index ff822e0..e3a446e 100644 --- a/Roadie.Api.Services/ReleaseService.cs +++ b/Roadie.Api.Services/ReleaseService.cs @@ -684,13 +684,27 @@ namespace Roadie.Api.Services sw.Start(); var errors = new List(); - var releaseToMerge = this.GetRelease(releaseToMergeId); + var releaseToMerge = this.DbContext.Releases + .Include(x => x.Artist) + .Include(x => x.Genres) + .Include("Genres.Genre") + .Include(x => x.Medias) + .Include("Medias.Tracks") + .Include("Medias.Tracks.TrackArtist") + .FirstOrDefault(x => x.RoadieId == releaseToMergeId); if (releaseToMerge == null) { this.Logger.LogWarning("MergeReleases Unknown Release [{0}]", releaseToMergeId); return new OperationResult(true, string.Format("Release Not Found [{0}]", releaseToMergeId)); } - var releaseToMergeInfo = this.GetRelease(releaseToMergeIntoId); + var releaseToMergeInfo = this.DbContext.Releases + .Include(x => x.Artist) + .Include(x => x.Genres) + .Include("Genres.Genre") + .Include(x => x.Medias) + .Include("Medias.Tracks") + .Include("Medias.Tracks.TrackArtist") + .FirstOrDefault(x => x.RoadieId == releaseToMergeIntoId); if (releaseToMergeInfo == null) { this.Logger.LogWarning("MergeReleases Unknown Release [{0}]", releaseToMergeIntoId);