Review changes, fixed failing integration test.

Author: THardy98

packages/client/src/helpers.ts

@@ -89,7 +89,7 @@ export async function executionInfoFromRaw<T>(
   };
 }
 
-export function countWorkflowExecutionFromRaw(raw: RawCountWorkflowExecutions): CountWorkflowExecution {
+export function decodeCountWorkflowExecutionsResponse(raw: RawCountWorkflowExecutions): CountWorkflowExecution {
   return {
     // Note: lossy conversion of Long to number
     count: raw.count!.toNumber(),
@@ -103,7 +103,7 @@ export function executionCountAggregationGroupFromRaw(
   return {
     // Note: lossy conversion of Long to number
     count: raw.count!.toNumber(),
-    group_values: raw.groupValues!.map((group_value) => searchAttributePayloadConverter.fromPayload(group_value)),
+    groupValues: raw.groupValues!.map((group_value) => searchAttributePayloadConverter.fromPayload(group_value)),
   };
 }
 

packages/client/src/types.ts

@@ -62,7 +62,7 @@ export interface CountWorkflowExecution {
 
 export interface CountWorkflowExecutionsAggregationGroup {
   count: number;
-  group_values: SearchAttributeValue[];
+  groupValues: SearchAttributeValue[];
 }
 
 export type WorkflowExecutionDescription = Replace<

packages/client/src/workflow-client.ts

@@ -78,7 +78,7 @@ import {
   WorkflowStartOptions,
   WorkflowUpdateOptions,
 } from './workflow-options';
-import { countWorkflowExecutionFromRaw, executionInfoFromRaw, rethrowKnownErrorTypes } from './helpers';
+import { decodeCountWorkflowExecutionsResponse, executionInfoFromRaw, rethrowKnownErrorTypes } from './helpers';
 import {
   BaseClient,
   BaseClientOptions,
@@ -1325,10 +1325,10 @@ export class WorkflowClient extends BaseClient {
         query,
       });
     } catch (e) {
-      this.rethrowGrpcError(e, 'Failed to count workflows', undefined);
+      this.rethrowGrpcError(e, 'Failed to count workflows');
     }
 
-    return countWorkflowExecutionFromRaw(response);
+    return decodeCountWorkflowExecutionsResponse(response);
   }
 
   protected getOrMakeInterceptors(workflowId: string, runId?: string): WorkflowClientInterceptor[] {

packages/test/src/test-integration-workflows.ts

@@ -15,7 +15,8 @@ import { activityStartedSignal } from './workflows/definitions';
 import * as workflows from './workflows';
 import { Context, helpers, makeTestFunction } from './helpers-integration';
 import { overrideSdkInternalFlag } from './mock-internal-flags';
-import { asSdkLoggerSink, loadHistory, RUN_TIME_SKIPPING_TESTS } from './helpers';
+import { asSdkLoggerSink, loadHistory, RUN_TIME_SKIPPING_TESTS, waitUntil } from './helpers';
+import asyncRetry from 'async-retry';
 
 const test = makeTestFunction({
   workflowsPath: __filename,
@@ -1274,27 +1275,36 @@ test('Count workflow executions', async (t) => {
   const worker = await createWorker();
   const client = t.context.env.client;
 
-  await worker.runUntil(async () => {
-    // Run 3 workflows that complete.
-    for (let i = 0; i < 3; i++) {
-      await executeWorkflow(completableWorkflow, { args: [true] });
-    }
-  });
-
   // Run 2 workflows that don't complete
   // (use startWorkflow to avoid waiting for workflows to complete, which they never will)
   for (let i = 0; i < 2; i++) {
     await startWorkflow(completableWorkflow, { args: [false] });
   }
 
-  const actual = await client.workflow.count(`TaskQueue = '${taskQueue}' GROUP BY ExecutionStatus`);
-  const expected: CountWorkflowExecution = {
+  await worker.runUntil(async () => {
+    try {
+      // Run 3 workflows that complete.
+      await Promise.all([
+        executeWorkflow(completableWorkflow, { args: [true] }),
+        executeWorkflow(completableWorkflow, { args: [true] }),
+        executeWorkflow(completableWorkflow, { args: [true] })
+      ])
+    } catch (err) {
+      throw new Error('executing workflow unexpectedly failed')
+    };
+  });
+
+  const actualTotal = await client.workflow.count(`TaskQueue = '${taskQueue}'`);
+  t.deepEqual(actualTotal, { count: 5, groups: [] });
+
+  const expectedByExecutionStatus: CountWorkflowExecution = {
     count: 5,
     groups: [
-      { count: 2, group_values: [['Runningggg']] },
-      { count: 3, group_values: [['Completedddd']] },
+      { count: 2, groupValues: [['Running']] },
+      { count: 3, groupValues: [['Completed']] },
     ],
   };
-
-  t.deepEqual(expected, actual);
+  
+  const actualByExecutionStatus = await client.workflow.count(`TaskQueue = '${taskQueue}' GROUP BY ExecutionStatus`);
+  t.deepEqual(actualByExecutionStatus, expectedByExecutionStatus);
 });