Fetch keys flags individually instead of filtering (#245)

Fetch variable, feature, and env keys flags individually

Author: emmawillis

src/commands/environments/get.ts

@@ -1,8 +1,9 @@
 import { Flags } from '@oclif/core'
 import inquirer from '../../ui/autocomplete'
-import { fetchEnvironments } from '../../api/environments'
+import { fetchEnvironments,fetchEnvironmentByKey } from '../../api/environments'
 import { EnvironmentPromptResult, environmentPrompt } from '../../ui/prompts'
 import Base from '../base'
+import { batchRequests } from '../../utils/batchRequests'
 
 export default class DetailedEnvironments extends Base {
     static hidden = false
@@ -21,34 +22,35 @@ export default class DetailedEnvironments extends Base {
 
     public async run(): Promise<void> {
         const { flags } = await this.parse(DetailedEnvironments)
-        const keys = flags['keys']?.split(',') || []
+        const keys = flags['keys']?.split(',')
         const { headless, project } = flags
         await this.requireProject(project, headless)
 
-        let environments = await fetchEnvironments(this.authToken, this.projectKey)
-        if (keys.length) {
-            environments = environments.filter((environment) => 
-                keys.includes(environment.key) || keys.includes(environment._id))
+        if (keys) {
+            const environments = await batchRequests(
+                keys, 
+                (key) => fetchEnvironmentByKey(this.authToken, this.projectKey, key)
+            )
             this.writer.showResults(environments)
             return
-        } 
+        }
 
         // show all environments if no keys flag provided in headless mode
         if (flags.headless) {
+            const environments = await fetchEnvironments(this.authToken, this.projectKey)
             this.writer.showResults(environments)
             return
         }
 
-        // prompt for keys in interactive mode 
+        // prompt for key in interactive mode 
         const responses = await inquirer.prompt<EnvironmentPromptResult>(
             [environmentPrompt],
             {
                 token: this.authToken,
                 projectKey: this.projectKey
             }
         )
-        const environment = environments.find((environment) => environment._id === responses.environment._id)
-        this.writer.showResults(environment)
+        this.writer.showResults(responses.environment)
 
     }
 }

src/commands/features/get.ts

@@ -1,6 +1,7 @@
 import { Flags } from '@oclif/core'
-import { fetchFeatures } from '../../api/features'
+import { fetchFeatures, fetchFeatureByKey } from '../../api/features'
 import Base from '../base'
+import { batchRequests } from '../../utils/batchRequests'
 
 export default class DetailedFeatures extends Base {
     static hidden = false
@@ -22,10 +23,16 @@ export default class DetailedFeatures extends Base {
         const keys = flags['keys']?.split(',') || []
         const { project, headless } = flags
         await this.requireProject(project, headless)
-        let features = await fetchFeatures(this.authToken, this.projectKey)
-        if (keys.length) {
-            features = features.filter((feature) => keys.includes(feature.key) || keys.includes(feature._id))
+        let features
+        if (keys) {
+            features = await batchRequests(
+                keys, 
+                (key) => fetchFeatureByKey(this.authToken, this.projectKey, key)
+            )
+        } else {
+            features = await fetchFeatures(this.authToken, this.projectKey)
         }
+
         this.writer.showResults(features)
     }
 }

src/commands/variables/get.ts

@@ -1,6 +1,7 @@
 import { Flags } from '@oclif/core'
-import { fetchVariables } from '../../api/variables'
+import { fetchVariables, fetchVariableByKey } from '../../api/variables'
 import Base from '../base'
+import { batchRequests } from '../../utils/batchRequests'
 
 export default class DetailedVariables extends Base {
     static hidden = false
@@ -18,9 +19,15 @@ export default class DetailedVariables extends Base {
         const { project, headless } = flags
         await this.requireProject(project, headless)
 
-        let variables = await fetchVariables(this.authToken, this.projectKey)
+        let variables
         if (keys) {
-            variables = variables.filter((variable) => keys.includes(variable.key))
+            variables = await batchRequests(
+                keys, 
+                (key) => fetchVariableByKey(this.authToken, this.projectKey, key)
+            )
+
+        } else {
+            variables = await fetchVariables(this.authToken, this.projectKey)
         }
         this.writer.showResults(variables)
     }

src/utils/batchRequests.ts

@@ -0,0 +1,16 @@
+import { chunk } from 'lodash'
+
+export const batchRequests = async (
+    values: string[], 
+    mapFunction: (value: string) => Promise<unknown>
+) => {
+    const result = []
+    const batches = chunk(values, 10)
+    for (const batch of batches) {
+        const batchResults = await Promise.all(
+            batch.map(mapFunction)
+        )
+        result.push(...batchResults.filter(Boolean))
+    }
+    return result
+}