Merge pull request #1227 from xieliuduo/dev37-datefilter

refactor:  board handle  rangeDateFilter to 2 DateFilter

Author: scottsut

frontend/src/app/pages/DashBoardPage/utils/index.ts

@@ -35,7 +35,7 @@ import { ChartDetailConfigDTO } from 'app/types/ChartConfigDTO';
 import { ChartDataRequestFilter } from 'app/types/ChartDataRequest';
 import ChartDataView from 'app/types/ChartDataView';
 import { convertToChartConfigDTO } from 'app/utils/ChartDtoHelper';
-import { getTime } from 'app/utils/time';
+import { getTime, splitRangerDateFilters } from 'app/utils/time';
 import { FilterSqlOperator, TIME_FORMATTER } from 'globalConstants';
 import i18next from 'i18next';
 import moment from 'moment';
@@ -428,6 +428,9 @@ export const getChartWidgetRequestParams = (obj: {
 
   // filter 去重
   requestParams.filters = getDistinctFiltersByColumn(requestParams.filters);
+  // splitRangerDateFilters
+  requestParams.filters = splitRangerDateFilters(requestParams.filters);
+
   // 变量
   if (variableParams) {
     requestParams.params = variableParams;

frontend/src/app/utils/__tests__/time.test.ts

@@ -0,0 +1,109 @@
+/**
+ * Datart
+ *
+ * Copyright 2021
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { splitRangerDateFilters } from '../time';
+
+describe('test splitRangerDateFilters', () => {
+  const rangerDateFilter = {
+    aggOperator: null,
+    column: '日期',
+    sqlOperator: 'BETWEEN',
+    values: [
+      {
+        value: '2004-01-01 00:00:00',
+        valueType: 'DATE',
+      },
+      {
+        value: '2013-01-01 00:00:00',
+        valueType: 'DATE',
+      },
+    ],
+  };
+  const badRangerDateFilter = {
+    aggOperator: null,
+    column: '日期',
+    sqlOperator: 'BETWEEN',
+    values: [
+      {
+        value: '2004-01-01 00:00:00',
+        valueType: 'DATE',
+      },
+    ],
+  };
+  const otherFilter1 = {
+    aggOperator: null,
+    column: '日期',
+    sqlOperator: 'LT',
+    values: [
+      {
+        value: '2011-01-01 00:00:00',
+        valueType: 'DATE',
+      },
+    ],
+  };
+
+  const splittedDateFilters = [
+    {
+      aggOperator: null,
+      column: '日期',
+      sqlOperator: 'GTE',
+      values: [
+        {
+          value: '2004-01-01 00:00:00',
+          valueType: 'DATE',
+        },
+      ],
+    },
+    {
+      aggOperator: null,
+      column: '日期',
+      sqlOperator: 'LT',
+      values: [
+        {
+          value: '2013-01-01 00:00:00',
+          valueType: 'DATE',
+        },
+      ],
+    },
+  ];
+
+  test('should splitRangerDateFilters to 2 filter', () => {
+    const res1 = splitRangerDateFilters([rangerDateFilter, otherFilter1]);
+    expect(res1).toEqual([...splittedDateFilters, otherFilter1]);
+    const res2 = splitRangerDateFilters([rangerDateFilter]);
+    expect(res2).toEqual([...splittedDateFilters]);
+    const res3 = splitRangerDateFilters([otherFilter1]);
+    expect(res3).toEqual([otherFilter1]);
+  });
+  test('should splitRangerDateFilters del bad rangeDateFilter', () => {
+    const res4 = splitRangerDateFilters([badRangerDateFilter]);
+    expect(res4).toEqual([]);
+    const res5 = splitRangerDateFilters([badRangerDateFilter, otherFilter1]);
+    expect(res5).toEqual([otherFilter1]);
+  });
+  test('should splitRangerDateFilters not arr to []', () => {
+    const res1 = splitRangerDateFilters(null as any);
+    expect(res1).toEqual([]);
+    const res2 = splitRangerDateFilters(undefined as any);
+    expect(res2).toEqual([]);
+    const res4 = splitRangerDateFilters({} as any);
+    expect(res4).toEqual([]);
+    const res5 = splitRangerDateFilters('string' as any);
+    expect(res5).toEqual([]);
+  });
+});

frontend/src/app/utils/time.ts

@@ -16,7 +16,13 @@
  * limitations under the License.
  */
 
-import { RECOMMEND_TIME, TIME_FORMATTER } from 'globalConstants';
+import { DataViewFieldType } from 'app/constants';
+import { ChartDataRequestFilter } from 'app/types/ChartDataRequest';
+import {
+  FilterSqlOperator,
+  RECOMMEND_TIME,
+  TIME_FORMATTER,
+} from 'globalConstants';
 import moment, { Moment, unitOfTime } from 'moment';
 
 export function getTimeRange(
@@ -75,3 +81,36 @@ export function recommendTimeRangeConverter(relativeTimeRange) {
   }
   return timeRange;
 }
+
+export const splitRangerDateFilters = (filters: ChartDataRequestFilter[]) => {
+  if (!Array.isArray(filters)) return [];
+  const newFilter = [] as ChartDataRequestFilter[];
+  filters.forEach(filter => {
+    let isTargetFilter = false;
+    if (
+      filter.sqlOperator === FilterSqlOperator.Between &&
+      filter.values?.[0].valueType === DataViewFieldType.DATE
+    ) {
+      isTargetFilter = true;
+    }
+    if (!isTargetFilter) {
+      newFilter.push(filter);
+      return;
+    }
+    // split date range filters
+    if (filter.values?.[0] && filter.values?.[1]) {
+      const start: ChartDataRequestFilter = {
+        ...filter,
+        sqlOperator: FilterSqlOperator.GreaterThanOrEqual,
+        values: [filter.values?.[0]],
+      };
+      const end: ChartDataRequestFilter = {
+        ...filter,
+        sqlOperator: FilterSqlOperator.LessThan,
+        values: [filter.values?.[1]],
+      };
+      newFilter.push(start, end);
+    }
+  });
+  return newFilter;
+};