refactor(botonic-cli): getBots returns all bots using internally the …

…getMoreBots function
hubtype · Aug 26, 2024 · e0e6ce4 · e0e6ce4
1 parent b852566
commit e0e6ce4
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/packages/botonic-cli/src/botonic-api-service.ts b/packages/botonic-cli/src/botonic-api-service.ts
@@ -279,10 +279,16 @@ export class BotonicAPIService {
   }
 
   async getBots(): AxiosPromise<BotsList> {
-    return this.apiGet({ apiVersion: 'v2', path: 'bots/' })
+    const botsResponse = await this.apiGet({ apiVersion: 'v2', path: 'bots/' })
+
+    if (botsResponse.data.next) {
+      this.getMoreBots(botsResponse.data.results, botsResponse.data.next)
+    }
+
+    return botsResponse
   }
 
-  async getMoreBots(bots: BotListItem[], nextBots?: string) {
+  private async getMoreBots(bots: BotListItem[], nextBots?: string) {
     if (!nextBots) {
       return bots
     }

diff --git a/packages/botonic-cli/src/commands/deploy.ts b/packages/botonic-cli/src/commands/deploy.ts
@@ -102,11 +102,8 @@ Deploying to AWS...
 
   async deployBotFromFlag(botName: string): Promise<void | undefined> {
     const resp = await this.botonicApiService.getBots()
-    const nextBots = resp.data.next
     const bots = resp.data.results
-    if (nextBots) {
-      await this.botonicApiService.getMoreBots(bots, nextBots)
-    }
+
     const bot = bots.filter(b => b.name === botName)[0]
     if (bot === undefined && !botName) {
       console.log(colors.red(`Bot ${botName} doesn't exist.`))
@@ -189,9 +186,8 @@ Deploying to AWS...
       return this.newBotFlow()
     else {
       const resp = await this.botonicApiService.getBots()
-      const nextBots = resp.data.next
       const bots = resp.data.results
-      if (nextBots) await this.botonicApiService.getMoreBots(bots, nextBots)
+
       // Show the current bot in credentials at top of the list
       const firstId = this.botonicApiService.bot.id
       bots.sort((x, y) => (x.id === firstId ? -1 : y.id === firstId ? 1 : 0))
@@ -247,10 +243,8 @@ Deploying to AWS...
 
   async getAvailableBots(): Promise<any> {
     const resp = await this.botonicApiService.getBots()
-    const nextBots = resp.data.next
-    const bots = resp.data.results
-    if (nextBots) await this.botonicApiService.getMoreBots(bots, nextBots)
-    return bots
+
+    return resp.data.results
   }
 
   async newBotFlow(): Promise<void> {