@eohjsc/react-native-smart-city 0.3.8 → 0.3.11

package/src/commons/Unit/__test__/SharedUnit.test.js

@@ -1,8 +1,8 @@
-import axios from 'axios';
 import React from 'react';
 import { create, act } from 'react-test-renderer';
 import moment from 'moment';
 import { useNavigation } from '@react-navigation/native';
+import MockAdapter from 'axios-mock-adapter';
 
 import SharedUnit from '../SharedUnit';
 import { TESTID } from '../../../configs/Constants';
@@ -10,8 +10,9 @@ import { API } from '../../../configs';
 import Routes from '../../../utils/Route';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
+import api from '../../../utils/Apis/axios';
 
-jest.mock('axios');
+const mock = new MockAdapter(api.axiosInstance);
 
 const mockNavigate = jest.fn();
 jest.mock('@react-navigation/native', () => {
@@ -38,8 +39,6 @@ describe('Test SharedUnit', () => {
   let tree, item, unit;
 
   beforeEach(() => {
-    axios.post.mockClear();
-
     unit = {
       background: '',
       icon: '',
@@ -61,6 +60,12 @@ describe('Test SharedUnit', () => {
 
   test('test create SharedUnit unit is not pin, not star', async () => {
     const navigation = useNavigation();
+    const mockedRenewItem = jest.fn();
+    await act(async () => {
+      tree = await create(
+        wrapComponent(item, navigation, true, mockedRenewItem)
+      );
+    });
 
     await act(async () => {
       tree = await create(wrapComponent(item, navigation));
@@ -72,34 +77,39 @@ describe('Test SharedUnit', () => {
     act(() => {
       touchSharedUnit.props.onPress();
     });
-    expect(mockNavigate).toHaveBeenCalledWith(Routes.UnitStack, {
-      screen: Routes.UnitDetail,
-      params: {
-        unitId: 3,
-        unitData: unit,
-      },
-    });
-
     const iconRemovePinSharedUnit = instance.findAll(
       (el) => el.props.testID === TESTID.ICON_REMOVE_PIN_SHARED_UNIT + '-69'
     );
-    expect(iconRemovePinSharedUnit).toHaveLength(0);
-
     const iconAddPinSharedUnit = instance.find(
       (el) => el.props.testID === TESTID.ICON_ADD_PIN_SHARED_UNIT + '-69'
     );
+    mock.onPost(API.UNIT.PIN_UNIT(3)).reply(200);
+    act(() => {
+      iconAddPinSharedUnit.props.onPress();
+    });
+    mock.onPost(API.UNIT.PIN_UNIT(3)).reply(400);
     act(() => {
       iconAddPinSharedUnit.props.onPress();
     });
-    expect(axios.post).toHaveBeenCalledWith(API.UNIT.PIN_UNIT(3));
-
     const iconAddStarSharedUnit = instance.find(
       (el) => el.props.testID === TESTID.ICON_ADD_STAR_SHARED_UNIT + '-69'
     );
+    mock.onPost(API.UNIT.STAR_UNIT(3)).reply(200);
     act(() => {
       iconAddStarSharedUnit.props.onPress();
     });
-    expect(axios.post).toHaveBeenCalledWith(API.UNIT.STAR_UNIT(3));
+    mock.onPost(API.UNIT.STAR_UNIT(3)).reply(400);
+    act(() => {
+      iconAddStarSharedUnit.props.onPress();
+    });
+    expect(iconRemovePinSharedUnit).toHaveLength(0);
+    expect(mockNavigate).toHaveBeenCalledWith(Routes.UnitStack, {
+      screen: Routes.UnitDetail,
+      params: {
+        unitId: 3,
+        unitData: unit,
+      },
+    });
   });
 
   test('test create SharedUnit unit without unit owner', async () => {
@@ -148,183 +158,28 @@ describe('Test SharedUnit', () => {
     const iconRemovePinSharedUnit = instance.find(
       (el) => el.props.testID === TESTID.ICON_REMOVE_PIN_SHARED_UNIT + '-69'
     );
+    mock.onPost(API.UNIT.UNPIN_UNIT(3)).reply(200);
+    act(() => {
+      iconRemovePinSharedUnit.props.onPress();
+    });
+    mock.onPost(API.UNIT.UNPIN_UNIT(3)).reply(400);
     act(() => {
       iconRemovePinSharedUnit.props.onPress();
     });
-    expect(axios.post).toHaveBeenCalledWith(API.UNIT.UNPIN_UNIT(3));
-
     const iconRemoveStarSharedUnit = instance.find(
       (el) => el.props.testID === TESTID.ICON_REMOVE_STAR_SHARED_UNIT + '-69'
     );
+    mock.onPost(API.UNIT.UNSTAR_UNIT(3)).reply(200);
     act(() => {
       iconRemoveStarSharedUnit.props.onPress();
     });
-    expect(axios.post).toHaveBeenCalledWith(API.UNIT.UNSTAR_UNIT(3));
-  });
-
-  test('test pin SharedUnit success', async () => {
-    const navigation = useNavigation();
-    const mockedRenewItem = jest.fn();
-    await act(async () => {
-      tree = await create(
-        wrapComponent(item, navigation, true, mockedRenewItem)
-      );
-    });
-    const instance = tree.root;
-
-    const response = {
-      success: true,
-      status: 200,
-    };
-
-    jest.spyOn(axios, 'post').mockImplementation(() => {
-      return response;
-    });
-
-    const iconAddPinSharedUnit = instance.find(
-      (el) => el.props.testID === TESTID.ICON_ADD_PIN_SHARED_UNIT + '-69'
-    );
-
-    const iconStarUnit = instance.find(
-      (el) => el.props.testID === TESTID.ICON_ADD_STAR_SHARED_UNIT + '-69'
-    );
-
-    await act(async () => {
-      await iconAddPinSharedUnit.props.onPress();
-      await iconStarUnit.props.onPress();
-    });
-
-    expect(mockedRenewItem).toHaveBeenCalledTimes(2);
-  });
-
-  test('test pin SharedUnit unsuccess', async () => {
-    const navigation = useNavigation();
-    const mockedRenewItem = jest.fn();
-    await act(async () => {
-      tree = await create(
-        wrapComponent(item, navigation, true, mockedRenewItem)
-      );
-    });
-    const instance = tree.root;
-
-    const response = {
-      success: false,
-      status: 500,
-    };
-
-    jest.spyOn(axios, 'post').mockImplementation(() => {
-      return response;
-    });
-
-    const iconAddPinSharedUnit = instance.find(
-      (el) => el.props.testID === TESTID.ICON_ADD_PIN_SHARED_UNIT + '-69'
-    );
-
-    const iconStarUnit = instance.find(
-      (el) => el.props.testID === TESTID.ICON_ADD_STAR_SHARED_UNIT + '-69'
-    );
-
-    await act(async () => {
-      await iconAddPinSharedUnit.props.onPress();
-      await iconStarUnit.props.onPress();
-    });
-
-    const iconRemovePinSharedUnit = instance.findAll(
-      (el) => el.props.testID === TESTID.ICON_REMOVE_PIN_SHARED_UNIT + '-69'
-    );
-
-    const iconRemoveStartUnit = instance.findAll(
-      (el) => el.props.testID === TESTID.ICON_REMOVE_STAR_SHARED_UNIT + '-69'
-    );
-
-    expect(mockedRenewItem).toHaveBeenCalledTimes(0);
-    expect(iconRemovePinSharedUnit).toHaveLength(0);
-    expect(iconRemoveStartUnit).toHaveLength(0);
-  });
-
-  test('test unpin SharedUnit success', async () => {
-    const navigation = useNavigation();
-    item.is_pin = true;
-    item.is_star = true;
-    const mockedRenewItem = jest.fn();
-
-    await act(async () => {
-      tree = await create(
-        wrapComponent(item, navigation, true, mockedRenewItem)
-      );
-    });
-    const instance = tree.root;
-
-    const response = {
-      success: true,
-      status: 200,
-    };
-
-    jest.spyOn(axios, 'post').mockImplementation(() => {
-      return response;
-    });
-
-    const iconRemovePinSharedUnit = instance.find(
-      (el) => el.props.testID === TESTID.ICON_REMOVE_PIN_SHARED_UNIT + '-69'
-    );
-
-    const iconRemoveStartUnit = instance.find(
-      (el) => el.props.testID === TESTID.ICON_REMOVE_STAR_SHARED_UNIT + '-69'
-    );
-
-    await act(async () => {
-      await iconRemovePinSharedUnit.props.onPress();
-      await iconRemoveStartUnit.props.onPress();
-    });
-
-    expect(mockedRenewItem).toHaveBeenCalledTimes(2);
-  });
-
-  test('test unpin SharedUnit unsuccess', async () => {
-    const navigation = useNavigation();
-    item.is_pin = true;
-    item.is_star = true;
-    const mockedRenewItem = jest.fn();
-
-    await act(async () => {
-      tree = await create(
-        wrapComponent(item, navigation, true, mockedRenewItem)
-      );
-    });
-    const instance = tree.root;
-
-    const response = {
-      success: false,
-      status: 500,
-    };
-
-    jest.spyOn(axios, 'post').mockImplementation(() => {
-      return response;
+    mock.onPost(API.UNIT.UNSTAR_UNIT(3)).reply(400);
+    act(() => {
+      iconRemoveStarSharedUnit.props.onPress();
     });
-
-    const iconRemovePinSharedUnit = instance.find(
-      (el) => el.props.testID === TESTID.ICON_REMOVE_PIN_SHARED_UNIT + '-69'
-    );
-
-    const iconRemoveStartUnit = instance.find(
+    const iconRemoveStar = instance.findAll(
       (el) => el.props.testID === TESTID.ICON_REMOVE_STAR_SHARED_UNIT + '-69'
     );
-
-    await act(async () => {
-      await iconRemovePinSharedUnit.props.onPress();
-      await iconRemoveStartUnit.props.onPress();
-    });
-
-    const iconAddPinSharedUnit = instance.findAll(
-      (el) => el.props.testID === TESTID.ICON_ADD_PIN_SHARED_UNIT + '-69'
-    );
-
-    const iconStarUnit = instance.findAll(
-      (el) => el.props.testID === TESTID.ICON_ADD_STAR_SHARED_UNIT + '-69'
-    );
-
-    expect(mockedRenewItem).toHaveBeenCalledTimes(0);
-    expect(iconAddPinSharedUnit).toHaveLength(0);
-    expect(iconStarUnit).toHaveLength(0);
+    expect(iconRemoveStar).toHaveLength(3);
   });
 });

package/src/commons/UnitSummary/ConfigHistoryChart/__test__/ConfigHistoryChart.test.js

@@ -4,8 +4,13 @@ import ConfigHistoryChart from '../';
 import { SCProvider } from '../../../../context';
 import { mockSCStore } from '../../../../context/mockStore';
 import HistoryChart from '../../../../commons/Device/HistoryChart';
+import MockAdapter from 'axios-mock-adapter';
+import { API } from '../../../../configs';
+import api from '../../../../utils/Apis/axios';
 
-const wrapComponent = (configs = []) => (
+const mock = new MockAdapter(api.axiosInstance);
+
+const wrapComponent = (configs = [1]) => (
   <SCProvider initState={mockSCStore({})}>
     <ConfigHistoryChart configs={configs} />
   </SCProvider>
@@ -16,6 +21,28 @@ describe('Test HistoryChart', () => {
 
   beforeAll(() => {
     jest.useFakeTimers();
+    mock.onGet(API.CONFIG.DISPLAY_HISTORY()).reply(200, [
+      {
+        config: 1,
+        data: [
+          {
+            url: 'https://valuelog-history/test',
+          },
+          {
+            x: '2022-06-16T00:00:00Z',
+            y: 5.0,
+          },
+        ],
+      },
+    ]);
+    mock.onGet('https://valuelog-history/test').reply(200, [
+      {
+        config_id: 1,
+        start_time: '2022-07-04T02:00:06.151765Z',
+        value_log: 0.0,
+        converted_value_log: 0.0,
+      },
+    ]);
   });
 
   it('Test render', async () => {

package/src/commons/UnitSummary/ConfigHistoryChart/index.js

@@ -4,6 +4,7 @@ import moment from 'moment';
 import { API } from '../../../configs';
 import HistoryChart from '../../../commons/Device/HistoryChart';
 import { axiosGet } from '../../../utils/Apis/axios';
+import { updateConfigChart } from '../ConfigHistoryChart';
 
 export const dateTimeType = {
   date: 'date',
@@ -30,19 +31,7 @@ const ConfigHistoryChart = memo(({ configs }) => {
       const { success, data } = await axiosGet(API.CONFIG.DISPLAY_HISTORY(), {
         params,
       });
-      if (success) {
-        for (let i = 0; i < data.length; i++) {
-          for (let j = 0; j < data[i].data.length; j++) {
-            data[i].data[j].x = moment(data[i].data[j].x).toDate();
-          }
-        }
-        setChartData(
-          configuration.map((config) => {
-            config.data = data.find((k) => k.config === config.id).data;
-            return config;
-          })
-        );
-      }
+      updateConfigChart(success, data, configuration, setChartData);
     };
     fetchData();
   }, [startDate, endDate, configs]);

package/src/commons/UnitSummary/ConfigHistoryChart.js

@@ -17,29 +17,71 @@ const ConfigHistoryChart = memo(({ configs }) => {
   const [endDate, setEndDate] = useState(moment());
 
   useEffect(() => {
+    const fetchDataS3 = (url) => {
+      return (
+        axiosGet(url, {
+          transformRequest: (rq, headers) => {
+            delete headers.Authorization;
+            return rq;
+          },
+        })
+          // eslint-disable-next-line promise/prefer-await-to-then
+          .then((response) => {
+            return response.data;
+          })
+          // eslint-disable-next-line promise/prefer-await-to-callbacks
+          .catch((error) => {})
+      );
+    };
+
     const fetchData = async () => {
       let params = new URLSearchParams();
       let configuration = configs.filter((item) => item.id);
       configuration.map((item) => {
         params.append('config', item.id);
       });
-      params.append('date_from', startDate.valueOf() / 1000);
-      params.append('date_to', endDate.valueOf() / 1000);
+      params.append('date_from', startDate.unix());
+      params.append('date_to', endDate.unix());
+
       const { success, data } = await axiosGet(API.CONFIG.DISPLAY_HISTORY(), {
         params,
       });
       if (success) {
-        for (let i = 0; i < data.length; i++) {
-          for (let j = 0; j < data[i].data.length; j++) {
-            data[i].data[j].x = moment(data[i].data[j].x).toDate();
-          }
-        }
-        setChartData(
-          configuration.map((config) => {
-            config.data = data.find((k) => k.config === config.id).data;
-            return config;
-          })
-        );
+        let urls = [];
+        data.forEach((config) => {
+          config.data.forEach((value_log) => {
+            if (value_log.url) {
+              urls.push(value_log.url);
+            } else {
+              value_log.x = moment(value_log.x).toDate();
+            }
+          });
+        });
+
+        // eslint-disable-next-line promise/prefer-await-to-then
+        Promise.all(urls.map(fetchDataS3)).then((result) => {
+          let s3_data = [].concat.apply(
+            [],
+            result.filter((r) => r.length > 0)
+          );
+          s3_data.forEach((value_log) => {
+            value_log.x = moment(value_log.start_time).toDate();
+            value_log.y = value_log.converted_value_log;
+          });
+          setChartData(
+            configuration.map((config) => {
+              let s3_config_data = [].concat.apply(
+                [],
+                s3_data.filter((x) => x.config_id === config.id)
+              );
+              let config_data = data.find((k) => k.config === config.id).data;
+              config_data = config_data.filter((k) => !('url' in k));
+              config.data = [...s3_config_data, ...config_data];
+              config.data = config.data.sort((a, b) => a.x > b.x);
+              return config;
+            })
+          );
+        });
       }
     };
     fetchData();

package/src/commons/WheelDateTimePicker/index.js

@@ -40,12 +40,12 @@ const WheelDateTimePicker = ({
       const date = moment(defaultValue);
       const maximumDate = moment(date).add(15, 'days');
       const minimumDate = moment(date).add(-15, 'days');
-      const [dateData, indexDate] =
+      const [newDateData, indexDate] =
         mode === 'datetime'
           ? getDateData(date, maximumDate, minimumDate)
           : [[{ value: date }], 0];
       return {
-        dateData: dateData,
+        dateData: newDateData,
         indexInitialDate: indexDate,
         indexInitialHour: date.hour(),
         indexInitialMinute: date.minute(),
@@ -104,6 +104,7 @@ const WheelDateTimePicker = ({
 
   return (
     <BottomSheet
+      testID={TESTID.WHEEL_DATE_TIME_PICKER}
       isVisible={isVisible}
       onBackdropPress={onPickerCancel}
       onHide={onHide}
@@ -173,7 +174,7 @@ const WheelDateTimePicker = ({
         onLeftClick={onPickerCancel}
         rightTitle={t('done')}
         onRightClick={onDone}
-        testIDPrefix={TESTID.WHEEL_DATE_TIME_PICKER}
+        testIDPrefix={TESTID.WHEEL_DATE_TIME_PICKER_BUTTON}
       />
     </BottomSheet>
   );