Changes

backend/Musify.Application/Tracks/CreateTrack.cs

@@ -32,7 +32,7 @@ namespace Musify.Application.Tracks
     {
         public async ValueTask<ErrorOr<TrackApplicationResponse>> Handle(CreateTrackCommand request, CancellationToken cancellationToken)
         {
-            var user = await database.Users.AsNoTracking()
+            var user = await database.Users
                 .SingleOrDefaultAsync(u => u.Id == request.UserId, cancellationToken);
             if (user is null)
             {
@@ -59,13 +59,12 @@ namespace Musify.Application.Tracks
             var finalAudioKey = trackConfiguration.Routes.BuildOriginalAudioPath(request.UserId, audioIntent.ObjectName);
             var audioProcessedFolderKey = trackConfiguration.Routes.BuildProcessedAudioPath(Guid.NewGuid().ToString());
 
-            var artist = await GetOrCreateUserArtistAsync(user, cancellationToken);
-
-            var trackEntity = new Track
+            var trackEntity = new LocalTrack
             {
                 Title = request.Title,
                 NormalizedTitle = request.Title.ToUpperInvariant(),
                 OwnerUserId = user.Id,
+                Owner = user,
                 Pictures = new TrackPictures
                 {
                     OriginalName = pictureIntent.ObjectName,
@@ -81,14 +80,7 @@ namespace Musify.Application.Tracks
                 }
             };
 
-            await database.Tracks.AddAsync(trackEntity, cancellationToken);
-
-            await database.TrackArtists.AddAsync(new TrackArtist
-            {
-                TrackId = trackEntity.Id,
-                ArtistId = artist.Id,
-                Position = 0
-            }, cancellationToken);
+            await database.LocalTracks.AddAsync(trackEntity, cancellationToken);
 
             await database.UserHasTracks.AddAsync(new UserHasTrack
             {
@@ -141,32 +133,5 @@ namespace Musify.Application.Tracks
 
             return TrackApplicationResponse.FromEntity(trackEntity, listensCount: 0);
         }
-
-        private async Task<Artist> GetOrCreateUserArtistAsync(User user, CancellationToken cancellationToken)
-        {
-            var existing = await database.Artists.SingleOrDefaultAsync(a => a.UserId == user.Id, cancellationToken);
-            if (existing is not null)
-                return existing;
-
-            var artist = new Artist
-            {
-                Name = user.Name,
-                NormalizedName = user.NormalizedName,
-                UserId = user.Id
-            };
-
-            await database.Artists.AddAsync(artist, cancellationToken);
-
-            try
-            {
-                await database.SaveChangesAsync(cancellationToken);
-                return artist;
-            }
-            catch (DbUpdateException)
-            {
-                database.Artists.Remove(artist);
-                return await database.Artists.SingleAsync(a => a.UserId == user.Id, cancellationToken);
-            }
-        }
     }
 }