Upgrade common server dependencies

2 files changed, 3 insertions, 5 deletions

diff --git a/server/models/pod/pod-interface.ts b/server/models/pod/pod-interface.ts
index 8b0b72167..fc763acac 100644
--- a/server/models/pod/pod-interface.ts
+++ b/server/models/pod/pod-interface.ts
@@ -42,6 +42,7 @@ export interface PodClass {
 }
 
 export interface PodAttributes {
+  id?: number
   host?: string
   publicKey?: string
   score?: number | Sequelize.literal // Sequelize literal for 'score +' + value
@@ -49,7 +50,6 @@ export interface PodAttributes {
 }
 
 export interface PodInstance extends PodClass, PodAttributes, Sequelize.Instance<PodAttributes> {
-  id: number
   createdAt: Date
   updatedAt: Date
 
diff --git a/server/models/pod/pod.ts b/server/models/pod/pod.ts
index 56918e358..df6412721 100644
--- a/server/models/pod/pod.ts
+++ b/server/models/pod/pod.ts
@@ -143,7 +143,7 @@ list = function () {
 }
 
 listAllIds = function (transaction: Sequelize.Transaction) {
-  const query: Sequelize.FindOptions = {
+  const query = {
     attributes: [ 'id' ],
     transaction
   }
@@ -170,9 +170,7 @@ listRandomPodIdsWithRequest = function (limit: number, tableWithPods: string, ta
       limit: limit,
       where: {
         id: {
-          $in: [
-            Sequelize.literal(`SELECT DISTINCT "${tableWithPods}"."podId" FROM "${tableWithPods}" ${tableWithPodsJoins}`)
-          ]
+          $in: Sequelize.literal(`(SELECT DISTINCT "${tableWithPods}"."podId" FROM "${tableWithPods}" ${tableWithPodsJoins})`)
         }
       }
     }