From be8fbbbcdc120d6b82c14ea3eac01079d03d521d Mon Sep 17 00:00:00 2001
From: XShine555 <xshine555@gmail.com>
Date: Mon, 1 Jun 2026 22:48:42 +0200
Subject: [PATCH] Fix bugs

---
 .../Activities/Pictures/UpdateTrackPictureActivity.cs       | 5 +++--
 Infrastructure/Services/StorageService.cs                   | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Infrastructure/MassTransit/Activities/Pictures/UpdateTrackPictureActivity.cs b/Infrastructure/MassTransit/Activities/Pictures/UpdateTrackPictureActivity.cs
index 55e9150..7b16eaf 100644
--- a/Infrastructure/MassTransit/Activities/Pictures/UpdateTrackPictureActivity.cs
+++ b/Infrastructure/MassTransit/Activities/Pictures/UpdateTrackPictureActivity.cs
@@ -1,6 +1,7 @@
 using MassTransit;
 using Microsoft.Extensions.Logging;
 using Musify.Application.Contracts;
+using Musify.Domain.ValueObjects;
 using Musify.Infrastructure.MassTransit.Arguments;
 using Musify.Infrastructure.MassTransit.Logs;
 
@@ -46,6 +47,7 @@ namespace Musify.Infrastructure.MassTransit.Activities
                 track.SmallPictureName = Path.GetFileName(smallResizedVariable);
                 track.MediumPictureName = Path.GetFileName(mediumResizedVariable);
                 track.LargePictureName = Path.GetFileName(largeResizedVariable);
+                track.PicturesProcessingStatus = ProcessingStatus.Completed;
 
                 database.Tracks.Update(track);
                 await database.SaveChangesAsync(executeContext.CancellationToken);
@@ -72,14 +74,13 @@ namespace Musify.Infrastructure.MassTransit.Activities
                     cancellationToken: compensateContext.CancellationToken);
 
                 if (track is null)
-                {
                     return compensateContext.Compensated();
-                }
 
                 track.OriginalPictureName = compensateContext.Log.PreviousOriginalPictureKey;
                 track.SmallPictureName = compensateContext.Log.PreviousSmallPictureKey;
                 track.MediumPictureName = compensateContext.Log.PreviousMediumPictureKey;
                 track.LargePictureName = compensateContext.Log.PreviousLargePictureKey;
+                track.PicturesProcessingStatus = ProcessingStatus.Failed;
 
                 database.Tracks.Update(track);
                 await database.SaveChangesAsync(compensateContext.CancellationToken);
diff --git a/Infrastructure/Services/StorageService.cs b/Infrastructure/Services/StorageService.cs
index 76bbb5e..3a97ee5 100644
--- a/Infrastructure/Services/StorageService.cs
+++ b/Infrastructure/Services/StorageService.cs
@@ -241,8 +241,8 @@ namespace Musify.Infrastructure.Services
             do
             {
                 listResponse = await amazonS3.ListObjectsV2Async(listRequest, cancellationToken);
-                foreach (var obj in listResponse.S3Objects)
-                    yield return new StorageObject(obj.Key, (obj.LastModified ?? DateTime.UtcNow).ToUniversalTime());
+                foreach (var s3Object in listResponse.S3Objects ?? [] )
+                    yield return new StorageObject(s3Object.Key, (s3Object.LastModified ?? DateTime.UtcNow).ToUniversalTime());
 
                 listRequest.ContinuationToken = listResponse.NextContinuationToken;
             }
@@ -263,7 +263,7 @@ namespace Musify.Infrastructure.Services
             {
                 listResponse = await amazonS3.ListObjectsV2Async(listRequest, cancellationToken);
 
-                if (listResponse.S3Objects.Count == 0)
+                if (listResponse.S3Objects is null or { Count: 0 })
                     break;
 
                 var deleteRequest = new DeleteObjectsRequest