refactor: clean up api code

checkmoney · May 11, 2020 · ba2a868 · ba2a868
1 parent 4ca8318
commit ba2a868
Show file tree

Hide file tree

Showing 21 changed files with 36 additions and 33 deletions.
diff --git a/src/app/utility/api.sagas.ts → src/app/api/api.sagas.ts b/src/app/utility/api.sagas.ts → src/app/api/api.sagas.ts
@@ -1,7 +1,7 @@
 import getConfig from 'next/config';
 import { select } from 'redux-saga/effects';
 
-import { StatisticsApi } from '&front/api/StatisticsApi';
+import { StatisticsApi } from '&front/app/api/parts/StatisticsApi';
 import { getTokenValue } from '&front/domain/user/selectors/getToken';
 
 const { publicRuntimeConfig } = getConfig();

diff --git a/src/api/types.ts → src/app/api/api.types.ts b/src/api/types.ts → src/app/api/api.types.ts
@@ -6,6 +6,7 @@ export class Interval {
 
   @Type(() => Date)
   readonly end: Date;
+
   constructor(start: Date, end: Date) {
     this.start = start;
     this.end = end;

diff --git a/src/api/utils.ts → src/app/api/api.utils.ts b/src/api/utils.ts → src/app/api/api.utils.ts
@@ -1,7 +1,11 @@
 import { AxiosRequestConfig } from 'axios';
+import { Transform } from 'class-transformer';
 import { format } from 'date-fns';
 
-import { Interval } from './types';
+import { Interval } from './api.types';
+
+export const TransformBigInt = () =>
+  Transform((value: string) => Number(value));
 
 export const intervalForQuery = ({ start, end }: Interval) => {
   const pattern = 'YYYY-MM-DD';

diff --git a/src/api/StatisticsApi.ts → src/app/api/parts/StatisticsApi.ts b/src/api/StatisticsApi.ts → src/app/api/parts/StatisticsApi.ts
@@ -6,8 +6,8 @@ import { Grow } from '&front/app/statistics/grow.types';
 import { PeriodAmount } from '&front/app/statistics/periods.types';
 import { GroupBy } from '&shared/enum/GroupBy';
 
-import { Interval } from './types';
-import { addTokenToHttpConfig, intervalForQuery } from './utils';
+import { Interval } from '../api.types';
+import { addTokenToHttpConfig, intervalForQuery } from '../api.utils';
 
 export class StatisticsApi {
   private readonly http: AxiosInstance;

diff --git a/src/app/statistics/categories.actions.ts b/src/app/statistics/categories.actions.ts
@@ -1,6 +1,6 @@
 import actionCreatorFactory from 'typescript-fsa';
 
-import { Interval } from '&front/api/types';
+import { Interval } from '&front/app/api/api.types';
 import { GroupBy } from '&shared/enum/GroupBy';
 
 import { PeriodCategories } from './categories.types';

diff --git a/src/app/statistics/categories.reducers.ts b/src/app/statistics/categories.reducers.ts
@@ -1,8 +1,8 @@
 import { uniqBy } from 'lodash';
 import { reducerWithInitialState } from 'typescript-fsa-reducers';
 
-import { Interval } from '&front/api/types';
-import { intervalIdentity } from '&front/api/utils';
+import { Interval } from '&front/app/api/api.types';
+import { intervalIdentity } from '&front/app/api/api.utils';
 import { GroupBy } from '&shared/enum/GroupBy';
 
 import { actions } from './categories.actions';

diff --git a/src/app/statistics/categories.sagas.ts b/src/app/statistics/categories.sagas.ts
@@ -1,7 +1,7 @@
 import { takeLatest, put, call, delay } from 'redux-saga/effects';
 
-import { StatisticsApi } from '&front/api/StatisticsApi';
-import { createStatisticsApi } from '&front/app/utility/api.sagas';
+import { StatisticsApi } from '&front/app/api/parts/StatisticsApi';
+import { createStatisticsApi } from '&front/app/api/api.sagas';
 import { logError } from '&front/app/utility/errors.sagas';
 
 import { actions } from './categories.actions';

diff --git a/src/app/statistics/categories.selectors.ts b/src/app/statistics/categories.selectors.ts
@@ -1,5 +1,5 @@
-import { Interval } from '&front/api/types';
-import { intervalIdentity } from '&front/api/utils';
+import { Interval } from '&front/app/api/api.types';
+import { intervalIdentity } from '&front/app/api/api.utils';
 import { State } from '&front/domain/store/State';
 import { GroupBy } from '&shared/enum/GroupBy';
 

diff --git a/src/app/statistics/categories.types.ts b/src/app/statistics/categories.types.ts
@@ -1,9 +1,9 @@
 /* eslint-disable max-classes-per-file */
 import { Type } from 'class-transformer';
 
-import { Interval } from '&front/api/types';
+import { Interval } from '&front/app/api/api.types';
 
-import { TransformBigInt } from '../utility/api.utils';
+import { TransformBigInt } from '../api/api.utils';
 
 export class CategoryData {
   @TransformBigInt()
@@ -20,8 +20,10 @@ export class CategoryData {
 export class PeriodCategories {
   @Type(() => CategoryData)
   readonly expenses: CategoryData[];
+
   @Type(() => CategoryData)
   readonly earnings: CategoryData[];
+
   @Type(() => Interval)
   readonly period: Interval;
 

diff --git a/src/app/statistics/grow.sagas.ts b/src/app/statistics/grow.sagas.ts
@@ -1,7 +1,7 @@
 import { takeLatest, put, call, delay } from 'redux-saga/effects';
 
-import { StatisticsApi } from '&front/api/StatisticsApi';
-import { createStatisticsApi } from '&front/app/utility/api.sagas';
+import { StatisticsApi } from '&front/app/api/parts/StatisticsApi';
+import { createStatisticsApi } from '&front/app/api/api.sagas';
 import { logError } from '&front/app/utility/errors.sagas';
 
 import { actions } from './grow.actions';

diff --git a/src/app/statistics/periods.actions.ts b/src/app/statistics/periods.actions.ts
@@ -1,7 +1,7 @@
 import actionCreatorFactory from 'typescript-fsa';
 
 import { GroupBy } from '&shared/enum/GroupBy';
-import { Interval } from '&front/api/types';
+import { Interval } from '&front/app/api/api.types';
 
 import { PeriodAmount } from './periods.types';
 

diff --git a/src/app/statistics/periods.reducers.ts b/src/app/statistics/periods.reducers.ts
@@ -1,12 +1,12 @@
 import { uniqBy } from 'lodash';
 import { reducerWithInitialState } from 'typescript-fsa-reducers';
 
-import { Interval } from '&front/api/types';
+import { Interval } from '&front/app/api/api.types';
+import { intervalIdentity } from '&front/app/api/api.utils';
 import { GroupBy } from '&shared/enum/GroupBy';
 
 import { actions } from './periods.actions';
 import { PeriodAmount } from './periods.types';
-import { intervalIdentity } from '&front/api/utils';
 
 type StateData = { [key in GroupBy]?: PeriodAmount[] };
 

diff --git a/src/app/statistics/periods.sagas.ts b/src/app/statistics/periods.sagas.ts
@@ -1,7 +1,7 @@
 import { takeLatest, put, call, delay } from 'redux-saga/effects';
 
-import { StatisticsApi } from '&front/api/StatisticsApi';
-import { createStatisticsApi } from '&front/app/utility/api.sagas';
+import { StatisticsApi } from '&front/app/api/parts/StatisticsApi';
+import { createStatisticsApi } from '&front/app/api/api.sagas';
 import { logError } from '&front/app/utility/errors.sagas';
 
 import { actions } from './periods.actions';

diff --git a/src/app/statistics/periods.selectors.ts b/src/app/statistics/periods.selectors.ts
@@ -1,7 +1,7 @@
 import { isWithinRange } from 'date-fns';
 
-import { Interval } from '&front/api/types';
-import { intervalIdentity } from '&front/api/utils';
+import { Interval } from '&front/app/api/api.types';
+import { intervalIdentity } from '&front/app/api/api.utils';
 import { State } from '&front/domain/store/State';
 import { GroupBy } from '&shared/enum/GroupBy';
 

diff --git a/src/app/statistics/periods.types.ts b/src/app/statistics/periods.types.ts
@@ -1,7 +1,7 @@
-import { Interval } from '&front/api/types';
 import { Type } from 'class-transformer';
 
-import { TransformBigInt } from '../utility/api.utils';
+import { Interval } from '../api/api.types';
+import { TransformBigInt } from '../api/api.utils';
 
 export class PeriodAmount {
   @TransformBigInt()

diff --git a/src/app/utility/api.utils.ts b/src/app/utility/api.utils.ts
diff --git a/src/features/statistics/features/categories/Categories.tsx b/src/features/statistics/features/categories/Categories.tsx
@@ -3,7 +3,7 @@ import React, { useMemo, useEffect } from 'react';
 import { useDispatch } from 'redux-react-hook';
 import { Option } from 'tsoption';
 
-import { Interval } from '&front/api/types';
+import { Interval } from '&front/app/api/api.types';
 import { actions } from '&front/app/statistics/categories.actions';
 import {
   selectCategories,

diff --git a/src/features/statistics/features/details/generic/Detail.tsx b/src/features/statistics/features/details/generic/Detail.tsx
@@ -3,7 +3,7 @@ import { useMappedState, useDispatch } from 'redux-react-hook';
 import { Option } from 'tsoption';
 import useMedia from 'use-media';
 
-import { Interval } from '&front/api/types';
+import { Interval } from '&front/app/api/api.types';
 import { actions } from '&front/app/statistics/categories.actions';
 import {
   selectCategories,

diff --git a/src/features/statistics/features/monthly/Monthly.tsx b/src/features/statistics/features/monthly/Monthly.tsx
@@ -4,7 +4,7 @@ import { useMappedState, useDispatch } from 'redux-react-hook';
 import { Option } from 'tsoption';
 import { useMedia } from 'use-media';
 
-import { Interval } from '&front/api/types';
+import { Interval } from '&front/app/api/api.types';
 import { actions } from '&front/app/statistics/periods.actions';
 import {
   selectPeriods,

diff --git a/src/features/statistics/features/sources/Sources.tsx b/src/features/statistics/features/sources/Sources.tsx
@@ -3,7 +3,7 @@ import React, { useMemo, useEffect } from 'react';
 import { useDispatch } from 'redux-react-hook';
 import { Option } from 'tsoption';
 
-import { Interval } from '&front/api/types';
+import { Interval } from '&front/app/api/api.types';
 import { actions } from '&front/app/statistics/categories.actions';
 import {
   selectCategories,

diff --git a/src/features/statistics/features/yearly/Yearly.tsx b/src/features/statistics/features/yearly/Yearly.tsx
@@ -4,7 +4,7 @@ import { useMappedState, useDispatch } from 'redux-react-hook';
 import { Option } from 'tsoption';
 import { useMedia } from 'use-media';
 
-import { Interval } from '&front/api/types';
+import { Interval } from '&front/app/api/api.types';
 import { actions } from '&front/app/statistics/periods.actions';
 import {
   selectPeriods,