Develop (#71)

* Update workflows * Fix file version filter * Remove extension manifest from upload result (#68) * Remove ExtensionManifest from UploadResult * Fix Discord author support (#70)
Macro-Deck-App · Oct 14, 2023 · f026cee · f026cee
1 parent db5b32b
commit f026cee
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 3 deletions.
diff --git a/src/ExtensionStoreAPI.Core/DataAccess/Entities/ExtensionEntity.cs b/src/ExtensionStoreAPI.Core/DataAccess/Entities/ExtensionEntity.cs
@@ -11,7 +11,7 @@ public class ExtensionEntity : BaseCreatedUpdatedEntity
     public string Author { get; set; } = string.Empty;
     public string? Description { get; set; }
     public string GitHubRepository { get; set; } = string.Empty;
-    public string? DSupportUserId { get; set; }
+    public ulong? DSupportUserId { get; set; }
     public ICollection<ExtensionFileEntity>? ExtensionFiles { get; set; }
     public ICollection<ExtensionDownloadInfoEntity>? Downloads { get; set; }
 }
diff --git a/src/ExtensionStoreAPI.Core/DataAccess/Repositories/ExtensionRepository.cs b/src/ExtensionStoreAPI.Core/DataAccess/Repositories/ExtensionRepository.cs
@@ -125,4 +125,16 @@ public async ValueTask UpdateDescription(string packageId, string description)
 
         await _context.UpdateAsync(extensionEntity);
     }
+
+    public async Task UpdateAuthorDiscordUserId(string packageId, ulong? extensionManifestAuthorDiscordUserId)
+    {
+        if (!extensionManifestAuthorDiscordUserId.HasValue)
+        {
+            return;
+        }
+
+        await _context.Set<ExtensionEntity>()
+            .Where(x => x.PackageId == packageId)
+            .ExecuteUpdateAsync(x => x.SetProperty(e => e.DSupportUserId, extensionManifestAuthorDiscordUserId.Value));
+    }
 }
diff --git a/src/ExtensionStoreAPI.Core/DataAccess/RepositoryInterfaces/IExtensionRepository.cs b/src/ExtensionStoreAPI.Core/DataAccess/RepositoryInterfaces/IExtensionRepository.cs
@@ -14,4 +14,5 @@ public interface IExtensionRepository
     public ValueTask DeleteExtensionAsync(string packageId);
     public ValueTask<ExtensionEntity> UpdateExtensionAsync(ExtensionEntity extensionEntity);
     public ValueTask UpdateDescription(string packageId, string description);
+    public Task UpdateAuthorDiscordUserId(string extensionManifestPackageId, ulong? extensionManifestAuthorDiscordUserId);
 }
diff --git a/src/ExtensionStoreAPI.Core/DataTypes/ExtensionStore/Extension.cs b/src/ExtensionStoreAPI.Core/DataTypes/ExtensionStore/Extension.cs
@@ -11,6 +11,6 @@ public class Extension
     public string? Description { get; set; }
     public string? Category { get; set; }
     public string? GitHubRepository { get; set; }
-    public string? DSupportUserId { get; set; }
+    public ulong? DSupportUserId { get; set; }
     public IList<ExtensionFile>? ExtensionFiles { get; set; }
 }
diff --git a/src/ExtensionStoreAPI.Core/DataTypes/MacroDeck/ExtensionManifest.cs b/src/ExtensionStoreAPI.Core/DataTypes/MacroDeck/ExtensionManifest.cs
@@ -21,7 +21,7 @@ public class ExtensionManifest
      public string? Category { get; set; }
 
      [JsonPropertyName("author-discord-userid")]
-     public string? AuthorDiscordUserId { get; set; }
+     public ulong? AuthorDiscordUserId { get; set; }
 
      [JsonPropertyName("repository")]
      public string? Repository { get; set; } = "";

diff --git a/src/ExtensionStoreAPI.Core/Managers/ExtensionFileManager.cs b/src/ExtensionStoreAPI.Core/Managers/ExtensionFileManager.cs
@@ -192,6 +192,8 @@ public async Task<ExtensionFileUploadResult> CreateFileAsync(Stream packageStrea
         }
 
         await _extensionRepository.UpdateDescription(extensionManifest.PackageId!, description);
+        await _extensionRepository.UpdateAuthorDiscordUserId(extensionManifest.PackageId!,
+            extensionManifest.AuthorDiscordUserId);
         return result;
     }