Refactor build request to pass unit tests

Signed-off-by: Huy Nguyen <[email protected]>
opensearch-project · Apr 9, 2024 · eecfd89 · eecfd89
1 parent 19c17f9
commit eecfd89
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/plugins/vis_type_timeline/server/series_functions/opensearch/index.js b/src/plugins/vis_type_timeline/server/series_functions/opensearch/index.js
@@ -34,6 +34,7 @@ import { OPENSEARCH_SEARCH_STRATEGY } from '../../../../data/server';
 import Datasource from '../../lib/classes/datasource';
 import buildRequest from './lib/build_request';
 import toSeriesList from './lib/agg_response_to_series_list';
+import { fetchDataSourceIdByName } from '../../lib/fetch_data_source_id';
 
 export default new Datasource('es', {
   args: [
@@ -156,7 +157,15 @@ export default new Datasource('es', {
 
     const opensearchShardTimeout = tlConfig.opensearchShardTimeout;
 
-    const body = await buildRequest(config, tlConfig, scriptedFields, opensearchShardTimeout);
+    const dataSourceId = await fetchDataSourceIdByName(config, tlConfig.savedObjectsClient);
+
+    const body = buildRequest(
+      config,
+      tlConfig,
+      scriptedFields,
+      opensearchShardTimeout,
+      dataSourceId
+    );
 
     const deps = (await tlConfig.getStartServices())[1];
 

diff --git a/src/plugins/vis_type_timeline/server/series_functions/opensearch/lib/build_request.js b/src/plugins/vis_type_timeline/server/series_functions/opensearch/lib/build_request.js
@@ -33,9 +33,8 @@ import moment from 'moment';
 import { buildAggBody } from './agg_body';
 import createDateAgg from './create_date_agg';
 import { UI_SETTINGS } from '../../../../../data/server';
-import { fetchDataSourceIdByName } from '../../../lib/fetch_data_source_id';
 
-export default async function buildRequest(config, tlConfig, scriptedFields, timeout) {
+export default function buildRequest(config, tlConfig, scriptedFields, timeout, dataSourceId) {
   const bool = { must: [] };
 
   const timeFilter = {
@@ -49,8 +48,6 @@ export default async function buildRequest(config, tlConfig, scriptedFields, tim
   };
   bool.must.push(timeFilter);
 
-  const dataSourceId = await fetchDataSourceIdByName(config, tlConfig.savedObjectsClient);
-
   // Use the opensearchDashboards and kibana filter bar filters
   if (config.opensearchDashboards && config.kibana) {
     bool.filter = _.get(tlConfig, 'request.body.extended.es.filter');