fix: Fix support metadata query array (#583)

Author: congminh1254

src/commands/metadata-query.js

@@ -4,6 +4,13 @@ const BoxCommand = require('../box-command');
 const { Flags, Args } = require('@oclif/core');
 const { omit, mapKeys, snakeCase } = require('lodash');
 
+const parseQueryValue = (value) => {
+	if (value.endsWith('f') && !isNaN(parseFloat(value))) {
+		return parseFloat(value);
+	}
+	return value;
+};
+
 class MetadataQueryCommand extends BoxCommand {
 	async run() {
 		const { flags, args } = await this.parse(MetadataQueryCommand);
@@ -22,13 +29,13 @@ class MetadataQueryCommand extends BoxCommand {
 		if (queryParam) {
 			combinedQueryParams = {
 				...combinedQueryParams,
-				...queryParam,
+				...queryParam.reduce((acc, curr) => ({ ...acc, ...curr }), {}),
 			};
 		}
 		if (queryParamArray) {
 			combinedQueryParams = {
 				...combinedQueryParams,
-				...queryParamArray,
+				...queryParamArray.reduce((acc, curr) => ({ ...acc, ...curr }), {}),
 			};
 		}
 
@@ -69,9 +76,7 @@ MetadataQueryCommand.flags = {
 					/* eslint-disable multiline-ternary */
 					return {
 						[key]:
-							value.endsWith('f') && !isNaN(parseFloat(value))
-								? parseFloat(value)
-								: value,
+							parseQueryValue(value),
 					};
 					/* eslint-enable multiline-ternary */
 				}),
@@ -81,23 +86,25 @@ MetadataQueryCommand.flags = {
 	'query-param': Flags.string({
 		description: 'One query param key-value pair, i.e. key=value. If this key duplicates with query-params, this flag will take precedence.',
 		dependsOn: ['query'],
+		multiple: true,
 		parse(input) {
 			const key = input.split('=')[0];
 			const value = input.substring(key.length + 1);
 			return {
-				[key]: value,
+				[key]: parseQueryValue(value),
 			};
 		},
 	}),
 	'query-param-array': Flags.string({
 		description:
 			'One query param key-multiple-value pair, use for multiple-values fields, i.e. key=value1,value2,value3. If this key duplicates with query-params or query-param, this flag will take precedence.',
 		dependsOn: ['query'],
+		multiple: true,
 		parse(input) {
 			const key = input.split('=')[0];
 			const value = input.substring(key.length + 1).split(',');
 			return {
-				[key]: value,
+				[key]: value.map(x => parseQueryValue(x)),
 			};
 		},
 	}),

test/commands/metadata-query.test.js

@@ -27,10 +27,52 @@ describe('Metadata Query', () => {
 				limit: 100,
 			},
 			requestWithMultipleValues = {
+				from: 'enterprise_123456.contractTemplate',
+				query: 'name = :customerName',
+				query_params: {
+					value: 100,
+					value2: 'String',
+				},
+				fields: [
+					'created_at',
+					'metadata.enterprise_123456.contractTemplate.amount',
+					'metadata.enterprise_123456.contractTemplate.customerName',
+				],
+				ancestor_folder_id: '5555',
+				order_by: [
+					{
+						field_key: 'amount',
+						direction: 'asc',
+					},
+				],
+				limit: 100,
+			},
+			requestWithMultipleArrayValues = {
+				from: 'enterprise_123456.contractTemplate',
+				query: 'name = :customerName',
+				query_params: {
+					customerName: ['John Doe', 'Jane Doe'],
+				},
+				fields: [
+					'created_at',
+					'metadata.enterprise_123456.contractTemplate.amount',
+					'metadata.enterprise_123456.contractTemplate.customerName',
+				],
+				ancestor_folder_id: '5555',
+				order_by: [
+					{
+						field_key: 'amount',
+						direction: 'asc',
+					},
+				],
+				limit: 100,
+			},
+			requestWithMultipleArrayQueryParams = {
 				from: 'enterprise_123456.contractTemplate',
 				query: 'name = :customerName',
 				query_params: {
 					customerName: ['John Doe', 'Jane Doe'],
+					customerName2: ['Doe John', 'Doe Jane'],
 				},
 				fields: [
 					'created_at',
@@ -81,15 +123,61 @@ describe('Metadata Query', () => {
 				requestWithMultipleValues.from,
 				requestWithMultipleValues.ancestor_folder_id,
 				`--query=${requestWithMultipleValues.query}`,
-				`--query-param-array=customerName=${requestWithMultipleValues.query_params.customerName.join(',')}`,
+				`--query-param=value=${requestWithMultipleValues.query_params.value}f`,
+				`--query-param=value2=${requestWithMultipleValues.query_params.value2}`,
 				`--extra-fields=${requestWithMultipleValues.fields.join(',')}`,
 				`--order-by=${requestWithMultipleValues.order_by[0].field_key}=${requestWithMultipleValues.order_by[0].direction}`,
 				`--limit=${requestWithMultipleValues.limit}`,
 				'--json',
 				'--token=test',
 			])
+			.it('should query metadata with multiple query-param', ctx => {
+				assert.equal(ctx.stdout, fixture);
+			});
+
+		test
+			.nock(TEST_API_ROOT, api => api
+				.post('/2.0/metadata_queries/execute_read', requestWithMultipleArrayValues)
+				.reply(200, fixture)
+			)
+			.stdout()
+			.command([
+				'metadata-query',
+				requestWithMultipleArrayValues.from,
+				requestWithMultipleArrayValues.ancestor_folder_id,
+				`--query=${requestWithMultipleArrayValues.query}`,
+				`--query-param-array=customerName=${requestWithMultipleArrayValues.query_params.customerName.join(',')}`,
+				`--extra-fields=${requestWithMultipleArrayValues.fields.join(',')}`,
+				`--order-by=${requestWithMultipleArrayValues.order_by[0].field_key}=${requestWithMultipleArrayValues.order_by[0].direction}`,
+				`--limit=${requestWithMultipleArrayValues.limit}`,
+				'--json',
+				'--token=test',
+			])
 			.it('should query metadata with query-param', ctx => {
 				assert.equal(ctx.stdout, fixture);
 			});
+
+		test
+			.nock(TEST_API_ROOT, api => api
+				.post('/2.0/metadata_queries/execute_read', requestWithMultipleArrayQueryParams)
+				.reply(200, fixture)
+			)
+			.stdout()
+			.command([
+				'metadata-query',
+				requestWithMultipleArrayQueryParams.from,
+				requestWithMultipleArrayQueryParams.ancestor_folder_id,
+				`--query=${requestWithMultipleArrayQueryParams.query}`,
+				`--query-param-array=customerName=${requestWithMultipleArrayQueryParams.query_params.customerName.join(',')}`,
+				`--query-param-array=customerName2=${requestWithMultipleArrayQueryParams.query_params.customerName2.join(',')}`,
+				`--extra-fields=${requestWithMultipleArrayQueryParams.fields.join(',')}`,
+				`--order-by=${requestWithMultipleArrayQueryParams.order_by[0].field_key}=${requestWithMultipleArrayQueryParams.order_by[0].direction}`,
+				`--limit=${requestWithMultipleArrayQueryParams.limit}`,
+				'--json',
+				'--token=test',
+			])
+			.it('should query metadata with multiple query-params-array', ctx => {
+				assert.equal(ctx.stdout, fixture);
+			});
 	});
 });