Image Upload suggestions

SyncUp.Data/Models/Tenancy/Tenant.cs

@@ -1,6 +1,7 @@
 using IntelliTect.SyncUp.Data.Services;
 using SyncUp.Data.Models;
 using System.ComponentModel;
+using File = IntelliTect.Coalesce.Models.File;
 
 namespace IntelliTect.SyncUp.Data.Models;
 
@@ -24,7 +25,41 @@
     [ForeignKey(nameof(BannerImageId))]
     public Image? BannerImage { get; set; }
 
+    [Coalesce]
+    public async Task<ItemResult<Image>> UploadImageFile(AppDbContext db, [Inject] ImageService imageService, File file)
+    {
+        try
+        {
+            Image image = await imageService.AddImage(file);
+
+            BannerImageId = image.ImageId;
+            await db.SaveChangesAsync();
+
+            return image;
+        }
+        catch(Exception ex)
+        {
+            return ex.Message;
+        }
+    }
 
+    [Coalesce]
+    public async Task<ItemResult<Image>> UploadImageUrl(AppDbContext db, [Inject] ImageService imageService, string url)
+    {
+        try
+        {
+            Image image = await imageService.AddImage(url);
+
+            BannerImageId = image.ImageId;
+            await db.SaveChangesAsync();
+
+            return image;
+        }
+        catch (Exception ex)
+        {
+            return ex.Message;
+        }
+    }
 
     [DefaultDataSource]
     public class DefaultSource(CrudContext<AppDbContext> context) : AppDataSource<Tenant>(context)
@@ -70,7 +105,7 @@
     }
 
     [Coalesce]
     public static async Task<ItemResult<bool>> IsMemberOf(
         AppDbContext db,
         ClaimsPrincipal user,
         string tenantId
@@ -86,13 +121,13 @@
         db.ForceSetTenant(tenant.TenantId);
 
         var isMember = db.TenantMemberships.Any(tm => tm.UserId == user.GetUserId());
         db.ForceSetTenant(currentTenantId);
 
         return new ItemResult<bool>(isMember, null);
     }
 
     [Coalesce]
     public static async Task<ItemResult> ToggleMembership(
         AppDbContext db,
         ClaimsPrincipal user,
         string tenantId
@@ -116,7 +151,7 @@
 
             db.TenantMemberships.Add(new()
             {
                 UserId = user.GetUserId()
             });
         }
         else

SyncUp.Data/Services/ImageService.cs

@@ -6,28 +6,25 @@
 using IntelliTect.SyncUp.Data;
 using SyncUp.Data.Models;
 using System.Net;
+using File = IntelliTect.Coalesce.Models.File;
 
 namespace IntelliTect.SyncUp.Data.Services;
-[Coalesce, Service]
 public class ImageService(AppDbContext db, IOptions<AzureBlobStorageOptions> options)
 {
-    [Coalesce]
-    [Execute(SecurityPermissionLevels.AllowAuthenticated, HttpMethod = IntelliTect.Coalesce.DataAnnotations.HttpMethod.Post)]
-    public async Task<ItemResult<Image>> Upload(byte[] content)
+    public async Task<Image> AddImage(string url)
     {
-        try
-        {
-            return await AddImage(content);
-        }
-        catch (Exception ex)
+        byte[] bytes = [];
+        using (var client = new HttpClient())
         {
-            return ex.Message;
+            bytes = await client.GetByteArrayAsync(url);
         }
+
+        return await AddImage(new File(bytes));
     }
 
-    public async Task<Image> AddImage(byte[] content)
+    public async Task<Image> AddImage(File file)
     {
-        if (content.Length == 0) throw new Exception("No image provided");
+        if (file.Length == 0 || file.Content is null) throw new Exception("No image provided");
         try
         {
             var imageId = Guid.NewGuid().ToString().Replace("-", "");
@@ -36,7 +33,7 @@ public async Task<Image> AddImage(byte[] content)
 
             try
             {
-                await cloudBlob.UploadAsync(new MemoryStream(content), new BlobUploadOptions
+                await cloudBlob.UploadAsync(file.Content, new BlobUploadOptions
                 {
                     Conditions = new() { IfNoneMatch = Azure.ETag.All }
                 });
@@ -46,7 +43,11 @@ public async Task<Image> AddImage(byte[] content)
                 throw new Exception("An Error occurred while trying to save the specified image to blob storage", ex);
 
             }
-            var imageScan = new MagickImage(content);
+
+            // Reset stream position to 0 before reusing
+            file.Content.Position = 0;
+
+            var imageScan = new MagickImage(file.Content);
             var colors = imageScan.Histogram();
 
             string dominantColor = colors.MaxBy(kvp => kvp.Value).Key.ToHexString();
@@ -69,31 +70,6 @@ public async Task<Image> AddImage(byte[] content)
         }
     }
 
-    [Coalesce]
-    [Execute(SecurityPermissionLevels.AllowAuthenticated, HttpMethod = IntelliTect.Coalesce.DataAnnotations.HttpMethod.Post)]
-    public async Task<ItemResult<Image>> UploadFromUrl(string url)
-    {
-        // Download the file get a byte array
-        try
-        {
-            return await AddImage(url);
-        }
-        catch
-        {
-            // TODO: Log this
-            return $"An Error occurred while trying to download the specified image.";
-        }
-    }
-
-    public async Task<Image> AddImage(string url)
-    {
-        using (var client = new HttpClient())
-        {
-            var bytes = await client.GetByteArrayAsync(url);
-            return await AddImage(bytes);
-        }
-    }
-
     private BlobClient GetBlobClient(string relativeLocation)
     {
         var connectionString = options.Value.ConnectionString;