Extract query parts onto builder functions

elastic · Jul 1, 2020 · 62884e0 · 62884e0
1 parent 8261fa4
commit 62884e0
Showing 1 changed file with 39 additions and 31 deletions.
diff --git a/x-pack/plugins/infra/public/utils/logs_overview_fetchers.ts b/x-pack/plugins/infra/public/utils/logs_overview_fetchers.ts
@@ -83,37 +83,8 @@ async function fetchLogsOverview(
           index: logParams.index,
           body: {
             size: 0,
-            query: {
-              range: {
-                [logParams.timestampField]: {
-                  gt: params.startTime,
-                  lte: params.endTime,
-                  format: 'strict_date_optional_time',
-                },
-              },
-            },
-            aggs: {
-              stats: {
-                terms: {
-                  field: 'event.dataset',
-                  size: 4,
-                },
-              },
-              series: {
-                date_histogram: {
-                  field: logParams.timestampField,
-                  fixed_interval: params.bucketSize,
-                },
-                aggs: {
-                  dataset: {
-                    terms: {
-                      field: 'event.dataset',
-                      size: 4,
-                    },
-                  },
-                },
-              },
-            },
+            query: buildLogOverviewQuery(logParams, params),
+            aggs: buildLogOverviewAggregations(logParams, params),
           },
         },
       })
@@ -130,6 +101,43 @@ async function fetchLogsOverview(
   });
 }
 
+function buildLogOverviewQuery(logParams: LogParams, params: FetchDataParams) {
+  return {
+    range: {
+      [logParams.timestampField]: {
+        gt: params.startTime,
+        lte: params.endTime,
+        format: 'strict_date_optional_time',
+      },
+    },
+  };
+}
+
+function buildLogOverviewAggregations(logParams: LogParams, params: FetchDataParams) {
+  return {
+    stats: {
+      terms: {
+        field: 'event.dataset',
+        size: 4,
+      },
+    },
+    series: {
+      date_histogram: {
+        field: logParams.timestampField,
+        fixed_interval: params.bucketSize,
+      },
+      aggs: {
+        dataset: {
+          terms: {
+            field: 'event.dataset',
+            size: 4,
+          },
+        },
+      },
+    },
+  };
+}
+
 function processLogsOverviewAggregations(aggregations: {
   stats: StatsAggregation;
   series: SeriesAggregation;