fix: deployment test, sorting

tradle · Jul 16, 2018 · d4827a0 · d4827a0
1 parent d1a3f10
commit d4827a0
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/src/in-house-bot/deployment.ts b/src/in-house-bot/deployment.ts
@@ -1183,6 +1183,10 @@ ${this.genUsageInstructions(links)}`
     if (tag === 'latest') return this.getLatestVersionInfo()
 
     return await this.bot.db.findOne({
+      orderBy: {
+        property: '_time',
+        desc: true
+      },
       filter: {
         EQ: {
           [TYPE]: VERSION_INFO,
@@ -1194,7 +1198,7 @@ ${this.genUsageInstructions(links)}`
   }
 
   public getLatestVersionInfo = async ():Promise<VersionInfo> => {
-    return await this.bot.db.findOne({
+    const { items } = await this.bot.db.find({
       orderBy: {
         property: 'sortableTag',
         desc: true
@@ -1206,6 +1210,8 @@ ${this.genUsageInstructions(links)}`
         }
       }
     })
+
+    return _.maxBy(items, '_time')
   }
 
   public saveVersionInfo = async (versionInfo: VersionInfo) => {
@@ -1350,7 +1356,7 @@ ${this.genUsageInstructions(links)}`
       }
     })
 
-    return items
+    return sortVersions(items)
   }
 
   public listDownloadedUpdates = async (providerPermalink?: string) => {
@@ -1374,7 +1380,7 @@ ${this.genUsageInstructions(links)}`
       }
     })
 
-    return items
+    return sortVersions(items)
   }
 
   private saveMyDeploymentVersionInfo = async () => {
@@ -1557,3 +1563,5 @@ const shouldSendVersionAlert = (versionInfo: VersionInfo) => {
 
   return ALERT_BRANCHES.includes(versionInfo.branch)
 }
+
+const sortVersions = (items: any[]) => _.sortBy(items, ['sortableTag', '_time'])
diff --git a/src/test/in-house-bot/deployment.test.ts b/src/test/in-house-bot/deployment.test.ts
@@ -397,14 +397,18 @@ test('deployment by referral', loudAsync(async (t) => {
     return {
       templateUrl: 'original.template.url',
       tag,
+      sortableTag: utils.toSortableTag(tag)
     }
   })
 
   sandbox.stub(parentDeployment, '_getTemplateByUrl').resolves(parentTemplate)
 
   let updateResponse
   const { templateUrl } = await parentDeployment.handleUpdateRequest({
-    from: childIdentity,
+    from: {
+      id: buildResource.permalink(childIdentity),
+      identity: childIdentity
+    },
     req: updateReq
   })