From bf3ced4d54e842f5258b4812b0852ba7373f2e8c Mon Sep 17 00:00:00 2001
From: xx-TheDoctor-xx <guilhermesuicida123654@gmail.com>
Date: Tue, 21 Apr 2020 12:35:20 +0100
Subject: [PATCH] Changed sdkVersion type to string, renamed package with pkg
 since "package" means something else

---
 PMF/src/Config.cs        |  2 +-
 PMF/src/Package/Asset.cs |  3 +--
 server/app.js            | 12 ++++++------
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/PMF/src/Config.cs b/PMF/src/Config.cs
index d667ec0..4510afb 100644
--- a/PMF/src/Config.cs
+++ b/PMF/src/Config.cs
@@ -13,7 +13,7 @@ namespace PMF
 
         public static string RepositoryEndpoint { get; set; }
 
-        public static Version CurrentSdkVersion { get; set; }
+        public static string CurrentSdkVersion { get; set; }
 
         public static bool IsDebugging { get; set; }
 
diff --git a/PMF/src/Package/Asset.cs b/PMF/src/Package/Asset.cs
index 54eccf9..5f163ea 100644
--- a/PMF/src/Package/Asset.cs
+++ b/PMF/src/Package/Asset.cs
@@ -13,8 +13,7 @@ namespace PMF
         [JsonConverter(typeof(VersionConverter))]
         public Version Version { get; set; }
 
-        [JsonConverter(typeof(VersionConverter))]
-        public Version SdkVersion { get; set; }
+        public string SdkVersion { get; set; }
 
         public string Checksum { get; set; }
 
diff --git a/server/app.js b/server/app.js
index 3768461..c6dd8ba 100644
--- a/server/app.js
+++ b/server/app.js
@@ -11,14 +11,14 @@ app.use(express.static('public'))
 app.get('/package/:id', async (req, res) =>
 {
     var con = await pool.getConnection()
-    var package = (await con.query("SELECT id_package, ID, Type, Name, Description FROM package WHERE BINARY ID = BINARY ? LIMIT 1", [req.params.id]))
-    if (package.length === 1)
+    var pkg = (await con.query("SELECT id_package, ID, Type, Name, Description FROM package WHERE BINARY ID = BINARY ? LIMIT 1", [req.params.id]))
+    if (pkg.length === 1)
     {
-        package = package[0]
+        pkg = pkg[0]
         var assets = await con.query("SELECT id_asset, Version, SdkVersion, Checksum, FileName, Url FROM asset_table WHERE id_package = ?", [package["id_package"]])
 
         // don't need this anymore
-        delete package["id_package"]
+        delete pkg["id_package"]
 
         if (assets.length > 0)
         {
@@ -32,11 +32,11 @@ app.get('/package/:id', async (req, res) =>
                 assets[i]["Dependencies"] = dependencies
             }
 
-            package["Assets"] = assets
+            pkg["Assets"] = assets
         }
     }
 
-    res.json(package)
+    res.json(pkg)
 });
 
 app.listen(port, () => console.log(`http://localhost:${port}`));
\ No newline at end of file