diff --git a/src/Yavsc.Blogs/Controllers/TestApiController.cs b/src/Yavsc.Blogs/Controllers/TestApiController.cs deleted file mode 100644 index 69088a79..00000000 --- a/src/Yavsc.Blogs/Controllers/TestApiController.cs +++ /dev/null @@ -1,15 +0,0 @@ -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Mvc; - -namespace Yavsc.ApiControllers -{ - using System.ComponentModel.DataAnnotations; - using Yavsc.Attributes.Validation; - - [Authorize,Route("~/api/test")] - public class TestApiController : Controller - { - - } - -} diff --git a/src/Yavsc.Server/Helpers/FileSystemHelpers.cs b/src/Yavsc.Server/Helpers/FileSystemHelpers.cs index d3929a50..89c76af7 100644 --- a/src/Yavsc.Server/Helpers/FileSystemHelpers.cs +++ b/src/Yavsc.Server/Helpers/FileSystemHelpers.cs @@ -171,6 +171,25 @@ namespace Yavsc.Server.Helpers return ReceiveUserFile(user, root, f.OpenReadStream(), destFileName ?? ParseFileNameFromDisposition(f.ContentDisposition), f.ContentType, CancellationToken.None); } + /// + /// Modifies the user's disk usage + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// public static FileReceivedInfo ReceiveUserFile(this ApplicationUser user, string root, Stream inputStream, string destFileName, string contentType, CancellationToken token) { // TODO lock user's disk usage for this scope, diff --git a/src/Yavsc.Server/Models/ApplicationDbContext.cs b/src/Yavsc.Server/Models/ApplicationDbContext.cs index 99bc2bbf..d1d53336 100644 --- a/src/Yavsc.Server/Models/ApplicationDbContext.cs +++ b/src/Yavsc.Server/Models/ApplicationDbContext.cs @@ -76,7 +76,7 @@ namespace Yavsc.Models builder.Entity().Property(n => n.icon).HasDefaultValue("exclam"); builder.Entity().HasKey(p => new { room = p.ChannelName, user = p.UserId }); builder.Entity().HasAlternateKey(i => new { Instrument = i.InstrumentId, owner = i.OwnerId }); - builder.Entity().HasKey(i => new { i.FileId, i.PostId}); + foreach (var et in builder.Model.GetEntityTypes()) { if (et.ClrType.GetInterface("IBaseTrackedEntity") != null) @@ -283,8 +283,6 @@ namespace Yavsc.Models public DbSet ApiResourceProperties { get; set; } public DbSet ApiScopeClaims { get; set; } public DbSet ApiScopeProperties { get; set; } - public DbSet blogAttachedFiles { get; set; } - public DbSet UploadedFiles { get; set; } } }