tweaked getting dependencies from db

fgsfds · Jun 16, 2024 · ffdc5a2 · ffdc5a2
1 parent 24ed3da
commit ffdc5a2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/Web.Server/DbEntities/DependenciesDbEntity.cs b/Web.Server/DbEntities/DependenciesDbEntity.cs
@@ -17,13 +17,16 @@ public sealed class DependenciesDbEntity
         [Column("version_id")]
         public required int AddonVersionId { get; set; }
 
-        [ForeignKey(nameof(VersionsTable2))]
-        [Column("dependency_version_id")]
-        public required int DependencyVersionId { get; set; }
+        [ForeignKey(nameof(AddonsTable))]
+        [Column("dependency_id")]
+        public required string DependencyId { get; set; }
+
+        [Column("dependency_version")]
+        public required string? DependencyVersion { get; set; }
 
 
         public VersionsDbEntity VersionsTable { get; set; }
-        public VersionsDbEntity VersionsTable2 { get; set; }
+        public AddonsDbEntity AddonsTable { get; set; }
 
     }
 }
diff --git a/Web.Server/Providers/AddonsProvider.cs b/Web.Server/Providers/AddonsProvider.cs
@@ -9,13 +9,13 @@ namespace Web.Server.Providers
 {
     public sealed class AddonsProvider
     {
-        private readonly ILogger<AppReleasesProvider> _logger;
+        private readonly ILogger<AddonsProvider> _logger;
         private readonly DatabaseContextFactory _dbContextFactory;
 
         public GeneralReleaseEntity? AppRelease { get; private set; }
 
         public AddonsProvider(
-            ILogger<AppReleasesProvider> logger,
+            ILogger<AddonsProvider> logger,
             DatabaseContextFactory dbContextFactory)
         {
             _logger = logger;
@@ -62,10 +62,9 @@ internal List<DownloadableAddonEntity> GetAddons(GameEnum gameEnum)
                 {
                     depsResult ??= [];
 
-                    var depVersion = versions[dep.DependencyVersionId];
-                    var depAddon = addons[depVersion.AddonId];
+                    var depAddon = addons[dep.DependencyId];
 
-                    depsResult.Add(depAddon.Title);
+                    depsResult.Add(depAddon.Title + $"{(dep.DependencyVersion is not null ? $", {dep.DependencyVersion}" : string.Empty)}");
                 }
 
                 var hasInstalls = installs.TryGetValue(addon.Id, out var installsNumber);