From 54b45943db9369c1af79e3ebf29fbb16ed18c8bd Mon Sep 17 00:00:00 2001
From: Shaun Walker <shaun.walker@siliqon.com>
Date: Wed, 26 Oct 2022 17:42:26 -0400
Subject: [PATCH] remove IDeletable fields from Folder and File entities as
 they are never set and not used

---
 ...020201_RemoveFolderFileDeletableColumns.cs | 35 +++++++++++++++++++
 Oqtane.Shared/Models/File.cs                  |  8 -----
 Oqtane.Shared/Models/Folder.cs                |  8 -----
 3 files changed, 35 insertions(+), 16 deletions(-)
 create mode 100644 Oqtane.Server/Migrations/Tenant/03020201_RemoveFolderFileDeletableColumns.cs

diff --git a/Oqtane.Server/Migrations/Tenant/03020201_RemoveFolderFileDeletableColumns.cs b/Oqtane.Server/Migrations/Tenant/03020201_RemoveFolderFileDeletableColumns.cs
new file mode 100644
index 00000000..f17cda4b
--- /dev/null
+++ b/Oqtane.Server/Migrations/Tenant/03020201_RemoveFolderFileDeletableColumns.cs
@@ -0,0 +1,35 @@
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Oqtane.Databases.Interfaces;
+using Oqtane.Migrations.EntityBuilders;
+using Oqtane.Repository;
+
+namespace Oqtane.Migrations.Tenant
+{
+    [DbContext(typeof(TenantDBContext))]
+    [Migration("Tenant.03.02.02.01")]
+    public class RemoveFolderFileDeletableColumns : MultiDatabaseMigration
+    {
+        public RemoveFolderFileDeletableColumns(IDatabase database) : base(database)
+        {
+        }
+
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            var folderEntityBuilder = new FolderEntityBuilder(migrationBuilder, ActiveDatabase);
+            folderEntityBuilder.DropColumn("DeletedBy");
+            folderEntityBuilder.DropColumn("DeletedOn");
+            folderEntityBuilder.DropColumn("IsDeleted");
+
+            var fileEntityBuilder = new FileEntityBuilder(migrationBuilder, ActiveDatabase);
+            fileEntityBuilder.DropColumn("DeletedBy");
+            fileEntityBuilder.DropColumn("DeletedOn");
+            fileEntityBuilder.DropColumn("IsDeleted");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            // not implemented
+        }
+    }
+}
diff --git a/Oqtane.Shared/Models/File.cs b/Oqtane.Shared/Models/File.cs
index bf393091..2e240403 100644
--- a/Oqtane.Shared/Models/File.cs
+++ b/Oqtane.Shared/Models/File.cs
@@ -55,14 +55,6 @@ namespace Oqtane.Models
         /// </summary>
         public string Description { get; set; }
 
-        #region IDeletable Properties
-
-        public string DeletedBy { get; set; }
-        public DateTime? DeletedOn { get; set; }
-        public bool IsDeleted { get; set; }
-
-        #endregion
-
         /// <summary>
         /// Object reference to the <see cref="Folder"/> object.
         /// Use this if you need to determine what <see cref="Site"/> the file belongs to. 
diff --git a/Oqtane.Shared/Models/Folder.cs b/Oqtane.Shared/Models/Folder.cs
index 328ec71b..c7627714 100644
--- a/Oqtane.Shared/Models/Folder.cs
+++ b/Oqtane.Shared/Models/Folder.cs
@@ -59,14 +59,6 @@ namespace Oqtane.Models
         /// </summary>
         public bool IsSystem { get; set; }
 
-        #region IDeletable Properties
-
-        public string DeletedBy { get; set; }
-        public DateTime? DeletedOn { get; set; }
-        public bool IsDeleted { get; set; }
-        
-        #endregion
-
         /// <summary>
         /// TODO: todoc what would this contain?
         /// </summary>