Merge pull request #76 from Macro-Deck-App/remove-include-downloads

Remove Include Downloads on Extensions query
Macro-Deck-App · Feb 17, 2024 · 090e1e5 · 090e1e5
2 parents f714b17 + 299b54f
commit 090e1e5
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 11 deletions.
diff --git a/src/ExtensionStoreAPI.Core/DataAccess/Entities/ExtensionEntity.cs b/src/ExtensionStoreAPI.Core/DataAccess/Entities/ExtensionEntity.cs
@@ -13,5 +13,4 @@ public class ExtensionEntity : BaseCreatedUpdatedEntity
     public string GitHubRepository { get; set; } = string.Empty;
     public ulong? DSupportUserId { get; set; }
     public ICollection<ExtensionFileEntity>? ExtensionFiles { get; set; }
-    public ICollection<ExtensionDownloadInfoEntity>? Downloads { get; set; }
 }
diff --git a/...tensionStoreAPI.Core/DataAccess/EntityConfigurations/ExtensionDownloadInfoEntityConfig.cs b/...tensionStoreAPI.Core/DataAccess/EntityConfigurations/ExtensionDownloadInfoEntityConfig.cs
@@ -29,6 +29,6 @@ public override void Configure(EntityTypeBuilder<ExtensionDownloadInfoEntity> bu
             .IsRequired();
 
         builder.Property(p => p.ExtensionId)
-            .HasColumnName("e_ref");
+            .HasColumnName(ColumnPrefix + "e_ref");
     }
 }
diff --git a/src/ExtensionStoreAPI.Core/DataAccess/EntityConfigurations/ExtensionEntityConfig.cs b/src/ExtensionStoreAPI.Core/DataAccess/EntityConfigurations/ExtensionEntityConfig.cs
@@ -64,10 +64,5 @@ public override void Configure(EntityTypeBuilder<ExtensionEntity> builder)
             .WithOne(e => e.ExtensionEntity)
             .HasForeignKey(e => e.ExtensionId)
             .OnDelete(DeleteBehavior.Cascade);
-
-        builder.HasMany(p => p.Downloads)
-            .WithOne(e => e.ExtensionEntity)
-            .HasForeignKey(e => e.ExtensionId)
-            .OnDelete(DeleteBehavior.Cascade);
     }
 }
diff --git a/src/ExtensionStoreAPI.Core/DataAccess/EntityConfigurations/ExtensionFileEntityConfig.cs b/src/ExtensionStoreAPI.Core/DataAccess/EntityConfigurations/ExtensionFileEntityConfig.cs
@@ -54,6 +54,6 @@ public override void Configure(EntityTypeBuilder<ExtensionFileEntity> builder)
             .IsRequired();
 
         builder.Property(p => p.ExtensionId)
-            .HasColumnName("e_ref");
+            .HasColumnName(ColumnPrefix + "e_ref");
     }
 }
diff --git a/src/ExtensionStoreAPI.Core/DataAccess/Repositories/ExtensionRepository.cs b/src/ExtensionStoreAPI.Core/DataAccess/Repositories/ExtensionRepository.cs
@@ -40,7 +40,6 @@ public async ValueTask<string[]> GetCategoriesAsync(Filter filter)
     {
         return await _context.GetNoTrackingSet<ExtensionEntity>()
             .Include(x => x.ExtensionFiles)
-            .Include(x => x.Downloads)
             .FirstOrDefaultAsync(x => x.PackageId == packageId);
     }
 

diff --git a/src/ExtensionStoreAPI/AutoMapper/ExtensionProfile.cs b/src/ExtensionStoreAPI/AutoMapper/ExtensionProfile.cs
@@ -14,8 +14,7 @@ public ExtensionProfile()
     {
         CreateMap<ExtensionEntity, Extension>();
 
-        CreateMap<Extension, ExtensionEntity>()
-            .ForMember(dest => dest.Downloads, opt => opt.Ignore());
+        CreateMap<Extension, ExtensionEntity>();
 
         CreateMap(typeof(PagedList<>), typeof(PagedList<>));
 

diff --git a/src/ExtensionStoreAPI/Migrations/V3_0_0_0__Rename_Downloads_Extension_Ref.sql b/src/ExtensionStoreAPI/Migrations/V3_0_0_0__Rename_Downloads_Extension_Ref.sql
@@ -0,0 +1,10 @@
+alter table extension_store.downloads
+    rename column e_ref to d_e_ref;
+
+alter index extension_store.downloads_e_ref_index rename to downloads_d_e_ref_index;
+
+alter table extension_store.files
+    rename column e_ref to f_e_ref;
+
+alter index extension_store.files_e_ref_index rename to files_f_e_ref_index;
+