Initial database and MinIO storage setup for image uploading

src/Backend/Services/Polls/Polls.Application/Common/Interfaces/ICityRepository.cs

@@ -14,4 +14,8 @@ Task<PagedList<City>> GetFilteredAsync(
         Guid id,
         PollStatus? status,
         CancellationToken cancellationToken = default);
+
+    Task<City?> GetByIdWithImagesAsync(
+        Guid id,
+        CancellationToken cancellationToken = default);
 }

src/Backend/Services/Polls/Polls.Application/Common/Interfaces/IDeletedImageRepository.cs

@@ -0,0 +1,13 @@
+using Polls.Domain.Images;
+
+namespace Polls.Application.Common.Interfaces;
+
+public interface IDeletedImageRepository
+{
+    Task<IReadOnlyList<DeletedImage>> GetBatchAsync(
+        int batchSize, 
+        CancellationToken cancellationToken = default);
+
+    void AddRange(IEnumerable<DeletedImage> images);
+    void RemoveRange(IEnumerable<DeletedImage> images);
+}

src/Backend/Services/Polls/Polls.Application/Common/Interfaces/IIdeaRepository.cs

@@ -13,6 +13,10 @@ Task<PagedList<Idea>> GetFilteredAsync(
     Task<Idea?> GetWithPollAsync(
         Guid id,
         CancellationToken cancellationToken = default);
+
+    Task<Idea?> GetByIdWithImagesAsync(
+        Guid id,
+        CancellationToken cancellationToken = default);
 
     Task UpdateStatusByCityAsync(
         Guid cityId,

src/Backend/Services/Polls/Polls.Application/Common/Interfaces/IImageRepository.cs

@@ -0,0 +1,10 @@
+using Polls.Domain.Images;
+
+namespace Polls.Application.Common.Interfaces;
+
+public interface IImageRepository<TImage> where TImage : Image
+{
+    Task<IReadOnlyList<TImage>> GetByIdsAsync(IEnumerable<Guid> ids, CancellationToken ct = default);
+    void AddRange(IEnumerable<TImage> images);
+    void RemoveRange(IEnumerable<TImage> images);
+}

src/Backend/Services/Polls/Polls.Application/Common/Interfaces/IImageStorageService.cs

@@ -0,0 +1,16 @@
+using Polls.Application.Common.Models;
+
+namespace Polls.Application.Common.Interfaces;
+
+public interface IImageStorageService
+{
+    Task<IReadOnlyList<string>> UploadRangeAsync(
+        IReadOnlyList<ImageFile> files, 
+        CancellationToken cancellationToken = default);
+
+    Task DeleteByNamesAsync(
+        IEnumerable<string> objectNames,
+        CancellationToken cancellationToken = default);
+
+    string GetUrl(string fileName);
+}

src/Backend/Services/Polls/Polls.Application/Common/Interfaces/IPollRepository.cs

@@ -15,6 +15,10 @@ Task<PagedList<Poll>> GetFilteredAsync(
         Guid id,
         IdeaStatus? ideaStatus,
         CancellationToken cancellationToken = default);
+
+    Task<Poll?> GetByIdWithImagesAsync(
+        Guid id,
+        CancellationToken cancellationToken = default);
 
     Task UpdateStatusByCityAsync(
         Guid cityId,

src/Backend/Services/Polls/Polls.Application/Common/Interfaces/IUnitOfWork.cs

@@ -1,3 +1,5 @@
+using Polls.Domain.Images;
+
 namespace Polls.Application.Common.Interfaces;
 
 public interface IUnitOfWork
@@ -6,6 +8,10 @@ public interface IUnitOfWork
     IPollRepository Polls { get; }
     IIdeaRepository Ideas { get; }
     IPollScheduleJobRepository PollScheduleJobs { get; }
+    IImageRepository<CityImage> CityImages { get; }
+    IImageRepository<PollImage> PollImages { get; }
+    IImageRepository<IdeaImage> IdeaImages { get; }
+    IDeletedImageRepository DeletedImages { get; }
     Task SaveChangesAsync(CancellationToken cancellationToken = default);
     Task<IUnitOfWorkTransaction> BeginTransactionAsync(CancellationToken cancellationToken = default);
 }

src/Backend/Services/Polls/Polls.Application/Common/Models/BaseFilter.cs

@@ -8,4 +8,5 @@ public abstract class BaseFilter
     public int Page { get; set; } = DefaultPage;
     public int PageSize { get; set; } = DefaultPageSize;
     public string? SearchTerm { get; set; }
+    public bool IncludeImages { get; set; } = true;
 }

src/Backend/Services/Polls/Polls.Application/Common/Models/CityFilter.cs

@@ -5,5 +5,4 @@ namespace Polls.Application.Common.Models;
 public class CityFilter : BaseFilter
 {
     public CityStatus? Status { get; set; }
-
 }

src/Backend/Services/Polls/Polls.Application/Common/Models/ImageFile.cs

@@ -0,0 +1,8 @@
+namespace Polls.Application.Common.Models;
+
+public class ImageFile
+{
+    public required Stream Content { get; set; }
+    public required string FileName { get; set; }
+    public required string ContentType  { get; set; }
+}

src/Backend/Services/Polls/Polls.Domain/Cities/City.cs

@@ -1,5 +1,6 @@
 using Polls.Domain.Cities.Enums;
 using Polls.Domain.Common;
+using Polls.Domain.Images;
 using Polls.Domain.Polls;
 
 namespace Polls.Domain.Cities;
@@ -9,4 +10,5 @@ public class City : EntityBase
     public required Coordinates Coordinates { get; set; }
     public CityStatus Status { get; set; } = CityStatus.Undefined;
     public ICollection<Poll> Polls { get; set; } = [];
+    public ICollection<CityImage> Images { get; set; } = [];
 }

src/Backend/Services/Polls/Polls.Domain/Ideas/Idea.cs

@@ -1,5 +1,6 @@
 using Polls.Domain.Common;
 using Polls.Domain.Ideas.Enums;
+using Polls.Domain.Images;
 using Polls.Domain.Polls;
 
 namespace Polls.Domain.Ideas;
@@ -10,4 +11,5 @@ public class Idea : EntityBase
     public Guid PollId { get; set; }
     public Poll Poll { get; set; } = null!;
     public IdeaStatus Status { get; set; } = IdeaStatus.Undefined;
+    public ICollection<IdeaImage> Images { get; set; } = [];
 }

src/Backend/Services/Polls/Polls.Domain/Images/CityImage.cs

@@ -0,0 +1,6 @@
+namespace Polls.Domain.Images;
+
+public class CityImage : Image
+{
+    public Guid CityId { get; set; }
+}

src/Backend/Services/Polls/Polls.Domain/Images/DeletedImage.cs

@@ -0,0 +1,8 @@
+namespace Polls.Domain.Images;
+
+public class DeletedImage
+{
+    public Guid Id { get; set; }
+    public required string FileName { get; set; }
+    public DateTimeOffset QueuedAt { get; set; } = DateTimeOffset.UtcNow;
+}

src/Backend/Services/Polls/Polls.Domain/Images/IdeaImage.cs

@@ -0,0 +1,6 @@
+namespace Polls.Domain.Images;
+
+public class IdeaImage : Image
+{
+    public Guid IdeaId { get; set; }
+}

src/Backend/Services/Polls/Polls.Domain/Images/Image.cs

@@ -0,0 +1,8 @@
+namespace Polls.Domain.Images;
+
+public class Image
+{
+    public Guid Id { get; set; }
+    public required string FileName { get; set; }
+    public int Order { get; set; }
+}

src/Backend/Services/Polls/Polls.Domain/Images/ImageErrors.cs

@@ -0,0 +1,21 @@
+using Polls.Domain.Common;
+
+namespace Polls.Domain.Images;
+
+public static class ImageErrors
+{
+    public static Error NotFound(Guid id) =>
+        Error.NotFound($"Image with id '{id}' was not found");
+
+    public static Error NotBelongsToEntity(Guid id) =>
+        Error.Conflict($"Image with id '{id}' does not belong to this entity");
+
+    public static Error MaxImagesExceeded(int maxImagesCount) =>
+        Error.Conflict($"Maximum number of images ({maxImagesCount}) exceeded");
+
+    public static Error InvalidFormat(string[] allowedFormats) =>
+        Error.Conflict($"Invalid image format. Allowed: {string.Join(", ", allowedFormats)}");
+
+    public static  Error FileTooLarge(int maxImageSize) =>
+        Error.Conflict($"Image size exceeds {maxImageSize}MB limit");
+}

src/Backend/Services/Polls/Polls.Domain/Images/PollImage.cs

@@ -0,0 +1,6 @@
+namespace Polls.Domain.Images;
+
+public class PollImage : Image
+{
+    public Guid PollId { get; set; }
+}

src/Backend/Services/Polls/Polls.Domain/Polls/Poll.cs

@@ -1,5 +1,6 @@
 using Polls.Domain.Common;
 using Polls.Domain.Ideas;
+using Polls.Domain.Images;
 using Polls.Domain.Polls.Enums;
 
 namespace Polls.Domain.Polls;
@@ -12,4 +13,5 @@ public class Poll : EntityBase
     public decimal BudgetAmount { get; set; }
     public PollStatus Status { get; set; } = PollStatus.Undefined;
     public ICollection<Idea> Ideas { get; set; } = [];
+    public ICollection<PollImage> Images { get; set; } = [];
 }

src/Backend/Services/Polls/Polls.Infrastructure/DependencyInjection.cs

@@ -6,13 +6,16 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Options;
+using Minio;
 using Polls.Application.Common.Interfaces;
 using Polls.Application.Jobs;
+using Polls.Domain.Images;
 using Polls.Infrastructure.Jobs;
 using Polls.Infrastructure.Persistence;
 using Polls.Infrastructure.Persistence.Interceptors;
 using Polls.Infrastructure.Persistence.Options;
 using Polls.Infrastructure.Persistence.Repositories;
+using Polls.Infrastructure.Storage;
 
 namespace Polls.Infrastructure;
 
@@ -27,6 +30,11 @@ public static IServiceCollection AddInfrastructure(
             .ValidateDataAnnotations()
             .ValidateOnStart();
 
+        services.AddOptions<ImageStorageOptions>()
+            .Bind(configuration.GetSection(ImageStorageOptions.SectionName))
+            .ValidateDataAnnotations()
+            .ValidateOnStart();
+
         services.AddTransient(typeof(Lazy<>), typeof(LazyResolver<>));
 
         services
@@ -57,8 +65,29 @@ public static IServiceCollection AddInfrastructure(
             .AddScoped<IPollRepository, PollRepository>()
             .AddScoped<IIdeaRepository, IdeaRepository>()
             .AddScoped<IPollScheduleJobRepository, PollScheduleJobRepository>()
+            .AddScoped<IImageRepository<CityImage>, ImageRepository<CityImage>>()
+            .AddScoped<IImageRepository<PollImage>, ImageRepository<PollImage>>()
+            .AddScoped<IImageRepository<IdeaImage>, ImageRepository<IdeaImage>>()
+            .AddScoped<IDeletedImageRepository, DeletedImageRepository>()
+            .AddScoped<RepositoryCollection>()
             .AddScoped<IUnitOfWork, UnitOfWork>();
 
+        var storageOptions = configuration
+                                 .GetSection(ImageStorageOptions.SectionName)
+                                 .Get<ImageStorageOptions>() 
+                             ?? throw new InvalidOperationException(
+                                 $"Configuration section '{ImageStorageOptions.SectionName}' is missing or invalid.");
+
+        services.AddMinio(client =>
+        {
+            client
+                .WithEndpoint(storageOptions.Endpoint)
+                .WithCredentials(storageOptions.AccessKey, storageOptions.SecretKey)
+                .WithSSL(storageOptions.UseSsl);
+        });
+
+        services.AddScoped<IImageStorageService, MinioStorageService>();
+
         services.AddHangfire((serviceProvider, config) =>
         {
             var dbOptions = serviceProvider.GetRequiredService<IOptions<DatabaseOptions>>().Value;
@@ -75,23 +104,31 @@ public static IServiceCollection AddInfrastructure(
         services
             .AddScoped<IPollScheduler, HangfirePollScheduler>()
             .AddScoped<PollStatusJob>()
-            .AddScoped<PollCleanupJob>();
+            .AddScoped<PollCleanupJob>()
+            .AddScoped<ImageCleanupJob>(); 
 
         return services;
     }
-    
+
     public static void UseInfrastructure(this WebApplication app)
     {
         const string hangfireDashboardPath = "/hangfire";
         const string pollCleanupJobId = "poll-cleanup";
-
+        const string imageCleanupJobId = "image-cleanup";
+
         if (app.Environment.IsDevelopment())
             app.UseHangfireDashboard(hangfireDashboardPath);
-        
+
         var recurringJobManager = app.Services.GetRequiredService<IRecurringJobManager>();
+
         recurringJobManager.AddOrUpdate<PollCleanupJob>(
             pollCleanupJobId,
             job => job.ExecuteAsync(CancellationToken.None),
             Cron.Hourly);
+
+        recurringJobManager.AddOrUpdate<ImageCleanupJob>( 
+            imageCleanupJobId,
+            job => job.ExecuteAsync(CancellationToken.None),
+            Cron.Hourly);
     }
 }

src/Backend/Services/Polls/Polls.Infrastructure/Jobs/ImageCleanupJob.cs

@@ -0,0 +1,29 @@
+using Polls.Application.Common.Interfaces;
+
+namespace Polls.Infrastructure.Jobs;
+
+public class ImageCleanupJob(
+    IUnitOfWork unitOfWork,
+    IImageStorageService storageService)
+{
+    public async Task ExecuteAsync(CancellationToken cancellationToken = default)
+    {
+        const int batchSize = 100;
+        var hasMore = true;
+
+        while (hasMore)
+        {
+            var batch = await unitOfWork.DeletedImages.GetBatchAsync(batchSize, cancellationToken);
+            hasMore = batch.Count == batchSize;
+
+            if (batch.Count == 0)
+                break;
+
+            var fileNames = batch.Select(x => x.FileName).ToList();
+
+            await storageService.DeleteByNamesAsync(fileNames, cancellationToken);
+            unitOfWork.DeletedImages.RemoveRange(batch);
+            await unitOfWork.SaveChangesAsync(cancellationToken);
+        }
+    }
+}

src/Backend/Services/Polls/Polls.Infrastructure/Persistence/ApplicationDbContext.cs

@@ -1,6 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 using Polls.Domain.Cities;
 using Polls.Domain.Ideas;
+using Polls.Domain.Images;
 using Polls.Domain.Polls;
 using Polls.Domain.PollScheduleJob;
 
@@ -11,6 +12,10 @@ public class ApplicationDbContext(DbContextOptions<ApplicationDbContext> options
     public DbSet<City> Cities => Set<City>();
     public DbSet<Poll> Polls => Set<Poll>();
     public DbSet<Idea> Ideas => Set<Idea>();
+    public DbSet<CityImage> CityImages => Set<CityImage>();
+    public DbSet<PollImage> PollImages => Set<PollImage>();
+    public DbSet<IdeaImage> IdeaImages => Set<IdeaImage>();
+    public DbSet<DeletedImage> DeletedImages => Set<DeletedImage>();
     public DbSet<PollScheduleJob> PollScheduleJobs => Set<PollScheduleJob>();
 
     protected override void OnModelCreating(ModelBuilder modelBuilder)