Added validation to Update image upload

CoviDok/BLL/Storage/IStorageProvider.cs

@@ -13,5 +13,6 @@ namespace CoviDok.BLL.Storage
         public Task CreateNamespace(string ns);
         public Task Upload(string ns, string objectname, Stream data, long size);
         public Task Download(string ns, string objectname, Action<Stream> callback);
+        public Task<bool> ObjectExists(string ns, string objectname);
     }
 }

CoviDok/BLL/Storage/StorageHandler.cs

@@ -43,5 +43,10 @@ namespace CoviDok.BLL.Storage
         {
             await storageProvider.Download(bucketName, ImageId, callback);
         }
+
+        public async Task<bool> ImageExists(string bucketName, string ImageId)
+        {
+            return await storageProvider.ObjectExists(bucketName, ImageId);
+        }
     }
 }

CoviDok/BLL/User/Managers/CaseManager.cs

@@ -1,8 +1,10 @@
 using CoviDok.Api.Request;
 using CoviDok.BLL.Sessions;
+using CoviDok.BLL.Storage;
 using CoviDok.BLL.User.Handlers;
 using CoviDok.Data.Model;
 using CoviDok.Data.MySQL;
+using CoviDok.Data.StorageProviders;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -15,6 +17,8 @@ namespace CoviDok.BLL.User.Managers
     {
         private readonly ICaseHandler handler = new MySqlCaseHandler();
 
+        private readonly StorageHandler storage = new StorageHandler(new MinioProvider());
+
         public async Task<List<Case>> FilterCases(Session s, CaseFilter filter)
         {
             // TODO: Jogosultságkezelés            
@@ -132,6 +136,10 @@ namespace CoviDok.BLL.User.Managers
             if (c == null) throw new KeyNotFoundException("Case Id not found: " + id);
             if (handler.IsAuthorized(s.Id, c))
             {
+                foreach (string ImageId in Images)
+                {
+                    if (!await storage.ImageExists("test1", ImageId)) throw new InvalidOperationException(ImageId + " not found in storage!");
+                }
                 if (c.CaseStatus == CaseStatus.Certified) throw new ArgumentException("Can't modify closed Case!");
 
                 if (s.Id == c.ParentId) c.Assignee = c.DoctorId; // Ha szülő updatel, az assignee az orvos lesz

CoviDok/Controllers/CaseController.cs

@@ -62,6 +62,10 @@ namespace CoviDok.Controllers
             catch (KeyNotFoundException) {
                 return NotFound();
             }
+            catch (InvalidOperationException)
+            {
+                return BadRequest();
+            }
             
         }
 

CoviDok/Controllers/ImagesController.cs

@@ -23,16 +23,11 @@ namespace CoviDok.Controllers
     [ApiController]
     public class ImagesController : ControllerBase
     {
-        private StorageHandler MinioHandler;
+        private StorageHandler MinioHandler = new StorageHandler(new MinioProvider());
         private readonly string BucketName = "test1";
 
         private readonly SessionHandler Handler = new SessionHandler();
 
-        public ImagesController(IOptions<MinioSettings>  config)
-        {
-            MinioHandler = new StorageHandler(new MinioProvider(config));
-        }
-
         private static Stream MakeStream(string s)
         {
             var stream = new MemoryStream();

CoviDok/Data/MySQL/MySqlCaseHandler.cs

@@ -27,6 +27,7 @@ namespace CoviDok.Data.MySQL
             message.CaseId = c.Id;
             context.Updates.Add(message);
             c.CaseStatus = status;
+            c.LastModificationDate = DateTime.Now;
             c.Updates.Add(message);
             await context.SaveChangesAsync();
         }

CoviDok/Data/StorageProviders/MinioProvider.cs

@@ -12,9 +12,11 @@ namespace CoviDok.Data.StorageProviders
     public class MinioProvider : IStorageProvider
     {
         private readonly MinioClient Client = null;
-        public MinioProvider(IOptions<MinioSettings> options)
+
+        public static MinioSettings _settings;
+        public MinioProvider()
         {
-            var _settings = options.Value;
+            //var _settings = options.Value;
             Client = new MinioClient(_settings.HostName, _settings.AccessKey, _settings.SecretKey);
         }
  
@@ -37,5 +39,18 @@ namespace CoviDok.Data.StorageProviders
         {
             await Client.PutObjectAsync(ns, objectname, data, size);
         }
+
+        public async Task<bool> ObjectExists(string ns, string objectname)
+        {
+            try {
+                await Client.StatObjectAsync(ns, objectname);
+                return true;
+            }
+            catch (Exception)
+            {
+                return false;
+            }
+            
+        }
     }
 }

CoviDok/Startup.cs

@@ -30,10 +30,13 @@ namespace CoviDok
         {
             services.AddMvc(options => options.EnableEndpointRouting = false).SetCompatibilityVersion(CompatibilityVersion.Version_3_0);
             services.AddSingleton<IConfiguration>(_configuration);
-            var minioSection = _configuration.GetSection("MinioSettings");
-            services.Configure<MinioSettings>(minioSection);
             MySqlContext.MySqlString = _configuration.GetConnectionString("MySQLDatabase");
             RedisProvider.Host = _configuration.GetConnectionString("RedisHost");
+            MinioProvider._settings = new MinioSettings { 
+                HostName = _configuration["MinioSettings:HostName"],
+                AccessKey = _configuration["MinioSettings:AccessKey"],
+                SecretKey = _configuration["MinioSettings:SecretKey"]
+            };
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.