Merge pull request #50 from igorkamyshev/prefetch

Prefetch

front/pages/_app.tsx

@@ -7,11 +7,10 @@ import { StoreContext } from 'redux-react-hook'
 import { Option } from 'tsoption'
 
 import { AppContext } from '@front/domain/AppContext'
-import { WithReduxProps } from '@front/domain/store/WithReduxProps'
-import { withReduxStore } from '@front/domain/store/withReduxStore'
+import { WithReduxProps, withReduxStore } from '@front/domain/store'
 import { actions } from '@front/domain/user/reducer/data'
 import { getToken } from '@front/domain/user/selectors/getToken'
-import { pushRoute } from '@front/pushRoute'
+import { pushRoute } from '@front/features/routing'
 
 class CheckmoneyWeb extends App<WithReduxProps> {
   public static async getInitialProps(appContext: NextAppContext) {

front/src/domain/AppContext.ts

@@ -1,6 +1,6 @@
 import { IncomingMessage, OutgoingMessage } from 'http'
 
-import { Store } from './store/Store'
+import { Store } from './store'
 
 interface Params {
   [key: string]: string

front/src/domain/api/index.ts

@@ -0,0 +1,2 @@
+export { Api } from './Api'
+export { createApi } from './createApi'

front/src/domain/store/fetchingRedux/fetchOrFail.ts → front/src/domain/fetching-redux/fetchOrFail.ts

@@ -1,19 +1,19 @@
-import { AnyAction, Dispatch } from 'redux'
+import { AnyAction } from 'redux'
+import { ThunkDispatch } from 'redux-thunk'
 import { Option } from 'tsoption'
 
-import { Api } from '@front/domain/api/Api'
+import { Api } from '@front/domain/api'
+import { ExtraArg, State } from '@front/domain/store'
 import { getToken } from '@front/domain/user/selectors/getToken'
 
-import { State } from '../State'
-
 interface FetchActions {
   request: () => AnyAction
   success: () => AnyAction
   failure: (error: string) => AnyAction
 }
 
 type Execute = (
-  dispatch: Dispatch,
+  dispatch: ThunkDispatch<State, ExtraArg, AnyAction>,
   getApi: () => Api,
   getState: () => State,
 ) => Promise<void | any>
@@ -28,7 +28,7 @@ export const fetchOrFail = (
   fetchActions: FetchActions = defaultActions,
   execute: Execute,
 ) => async (
-  dispatch: Dispatch<AnyAction>,
+  dispatch: ThunkDispatch<State, ExtraArg, AnyAction>,
   getState: () => State,
   createApi: (token: Option<string>) => Api,
 ) => {

front/src/domain/fetching-redux/index.ts

@@ -0,0 +1,3 @@
+export { createFetchingStore } from './createFetchingRedux'
+export { FetchingState } from './FetchingState'
+export { fetchOrFail } from './fetchOrFail'

front/src/domain/money/actions/createIncome.ts

@@ -1,7 +1,6 @@
+import { fetchOrFail } from '@front/domain/fetching-redux'
 import { IncomeModel } from '@shared/models/money/IncomeModel'
 
-import { fetchOrFail } from '@front/domain/store/fetchingRedux/fetchOrFail'
-
 import { createIncomeRequest } from '../api/createIncomeRequest'
 import { actions as incomeFetchingActions } from '../reducer/createIncomeFetching'
 import { refetchData } from './refetchData'
@@ -10,5 +9,5 @@ export const createIncome = (incomeFields: IncomeModel) =>
   fetchOrFail(incomeFetchingActions, async (dispatch, getApi) => {
     await createIncomeRequest(getApi())(incomeFields)
 
-    await dispatch(refetchData() as any)
+    await dispatch(refetchData())
   })

front/src/domain/money/actions/createOutcome.ts

@@ -1,7 +1,6 @@
+import { fetchOrFail } from '@front/domain/fetching-redux'
 import { OutcomeModel } from '@shared/models/money/OutcomeModel'
 
-import { fetchOrFail } from '@front/domain/store/fetchingRedux/fetchOrFail'
-
 import { createOutcomeRequest } from '../api/createOutcomeRequest'
 import { actions as outcomeFetchingActions } from '../reducer/createOutcomeFetching'
 import { refetchData } from './refetchData'
@@ -10,5 +9,5 @@ export const createOutcome = (outcomeFields: OutcomeModel) =>
   fetchOrFail(outcomeFetchingActions, async (dispatch, getApi) => {
     await createOutcomeRequest(getApi())(outcomeFields)
 
-    await dispatch(refetchData() as any)
+    await dispatch(refetchData())
   })

front/src/domain/money/actions/fetchFirstTransactionDate.ts

@@ -1,4 +1,4 @@
-import { fetchOrFail } from '@front/domain/store/fetchingRedux/fetchOrFail'
+import { fetchOrFail } from '@front/domain/fetching-redux'
 
 import { fetchFirstTransactionDateRequest } from '../api/fetchFirstTransactionDateRequest'
 import { actions as dataActions } from '../reducer/firstTransactionDate'

front/src/domain/money/actions/fetchHistory.ts

@@ -1,4 +1,4 @@
-import { fetchOrFail } from '@front/domain/store/fetchingRedux/fetchOrFail'
+import { fetchOrFail } from '@front/domain/fetching-redux'
 import { GroupBy } from '@shared/enum/GroupBy'
 
 import { fetchHistoryRequest } from '../api/fetchHistoryRequest'

front/src/domain/money/actions/fetchStats.ts

@@ -1,4 +1,4 @@
-import { fetchOrFail } from '@front/domain/store/fetchingRedux/fetchOrFail'
+import { fetchOrFail } from '@front/domain/fetching-redux'
 import { Currency } from '@shared/enum/Currency'
 import { GroupBy } from '@shared/enum/GroupBy'
 

front/src/domain/money/actions/forceFetchHistory.ts

@@ -1,4 +1,4 @@
-import { fetchOrFail } from '@front/domain/store/fetchingRedux/fetchOrFail'
+import { fetchOrFail } from '@front/domain/fetching-redux'
 import { GroupBy } from '@shared/enum/GroupBy'
 
 import { fetchHistoryRequest } from '../api/fetchHistoryRequest'

front/src/domain/money/actions/forceFetchStats.ts

@@ -1,4 +1,4 @@
-import { fetchOrFail } from '@front/domain/store/fetchingRedux/fetchOrFail'
+import { fetchOrFail } from '@front/domain/fetching-redux'
 import { Currency } from '@shared/enum/Currency'
 import { GroupBy } from '@shared/enum/GroupBy'
 

front/src/domain/money/actions/refetchData.ts

@@ -1,4 +1,4 @@
-import { fetchOrFail } from '@front/domain/store/fetchingRedux/fetchOrFail'
+import { fetchOrFail } from '@front/domain/fetching-redux'
 
 import { getHistoryCachedPeriods } from '../selectors/getHistoryCachedPeriods'
 import { getStatsCachedPeriods } from '../selectors/getStatsCachedPeriods'
@@ -12,12 +12,12 @@ export const refetchData = () =>
     const statsCachedPeriods = getStatsCachedPeriods(getState())
 
     await Promise.all([
-      dispatch(fetchFirstTransactionDate() as any),
+      dispatch(fetchFirstTransactionDate()),
       ...historyCachedPeriods.map(({ from, to, groupBy }) =>
-        dispatch(forceFetchHistory(from, to, groupBy) as any),
+        dispatch(forceFetchHistory(from, to, groupBy)),
       ),
       ...statsCachedPeriods.map(({ from, to, groupBy, currency }) =>
-        dispatch(forceFetchStats(from, to, groupBy, currency) as any),
+        dispatch(forceFetchStats(from, to, groupBy, currency)),
       ),
     ])
   })

front/src/domain/money/api/createIncomeRequest.ts

@@ -1,6 +1,6 @@
 import { IncomeModel } from '@shared/models/money/IncomeModel'
 
-import { Api } from '@front/domain/api/Api'
+import { Api } from '@front/domain/api'
 
 export const createIncomeRequest = (api: Api) => (
   income: IncomeModel,

front/src/domain/money/api/createOutcomeRequest.ts

@@ -1,6 +1,6 @@
 import { OutcomeModel } from '@shared/models/money/OutcomeModel'
 
-import { Api } from '@front/domain/api/Api'
+import { Api } from '@front/domain/api'
 
 export const createOutcomeRequest = (api: Api) => (
   income: OutcomeModel,

front/src/domain/money/api/fetchFirstTransactionDateRequest.ts

@@ -1,4 +1,4 @@
-import { Api } from '@front/domain/api/Api'
+import { Api } from '@front/domain/api'
 import { actualizeStore } from '@front/domain/store/utils/actualizeStore'
 
 export const fetchFirstTransactionDateRequest = (api: Api) => (): Promise<

front/src/domain/money/api/fetchHistoryRequest.ts

@@ -1,4 +1,4 @@
-import { Api } from '@front/domain/api/Api'
+import { Api } from '@front/domain/api'
 import { actualizeStore } from '@front/domain/store/utils/actualizeStore'
 import { GroupBy } from '@shared/enum/GroupBy'
 import { HistoryGroupModel } from '@shared/models/money/HistoryGroupModel'

front/src/domain/money/api/fetchStatsRequest.ts

@@ -1,4 +1,4 @@
-import { Api } from '@front/domain/api/Api'
+import { Api } from '@front/domain/api'
 import { actualizeStore } from '@front/domain/store/utils/actualizeStore'
 import { Currency } from '@shared/enum/Currency'
 import { GroupBy } from '@shared/enum/GroupBy'

front/src/domain/money/reducer/createIncomeFetching.ts

@@ -1,5 +1,7 @@
-import { createFetchingStore } from '@front/domain/store/fetchingRedux/createFetchingRedux'
-import { FetchingState } from '@front/domain/store/fetchingRedux/FetchingState'
+import {
+  createFetchingStore,
+  FetchingState,
+} from '@front/domain/fetching-redux'
 
 type State = FetchingState
 

front/src/domain/money/reducer/createOutcomeFetching.ts

@@ -1,5 +1,7 @@
-import { createFetchingStore } from '@front/domain/store/fetchingRedux/createFetchingRedux'
-import { FetchingState } from '@front/domain/store/fetchingRedux/FetchingState'
+import {
+  createFetchingStore,
+  FetchingState,
+} from '@front/domain/fetching-redux'
 
 type State = FetchingState
 

front/src/domain/money/reducer/historyFetching.ts

@@ -1,5 +1,7 @@
-import { createFetchingStore } from '@front/domain/store/fetchingRedux/createFetchingRedux'
-import { FetchingState } from '@front/domain/store/fetchingRedux/FetchingState'
+import {
+  createFetchingStore,
+  FetchingState,
+} from '@front/domain/fetching-redux'
 
 type State = FetchingState
 

front/src/domain/money/reducer/statsFetching.ts

@@ -1,5 +1,7 @@
-import { createFetchingStore } from '@front/domain/store/fetchingRedux/createFetchingRedux'
-import { FetchingState } from '@front/domain/store/fetchingRedux/FetchingState'
+import {
+  createFetchingStore,
+  FetchingState,
+} from '@front/domain/fetching-redux'
 
 type State = FetchingState
 

front/src/domain/money/selectors/getCreateIncomeFetching.ts

@@ -1,4 +1,4 @@
-import { State } from '@front/domain/store/State'
+import { State } from '@front/domain/store'
 
 export const getCreateIncomeFetching = (state: State) =>
   state.money.createIncomeFetching

front/src/domain/money/selectors/getCreateOutcomeFetching.ts

@@ -1,4 +1,4 @@
-import { State } from '@front/domain/store/State'
+import { State } from '@front/domain/store'
 
 export const getCreateOutcomeFetching = (state: State) =>
   state.money.createOutcomeFetching

front/src/domain/money/selectors/getFirstTransactionDate.ts

@@ -1,4 +1,4 @@
-import { State } from '@front/domain/store/State'
+import { State } from '@front/domain/store'
 
 export const getFirstTransactionDate = (state: State) =>
   state.money.firstTransactionDate

front/src/domain/money/selectors/getHistory.ts

@@ -1,6 +1,6 @@
 import { Option } from 'tsoption'
 
-import { State } from '@front/domain/store/State'
+import { State } from '@front/domain/store'
 import { GroupBy } from '@shared/enum/GroupBy'
 
 import { createHistoryKey } from '../helpers/createHistoryKey'

front/src/domain/money/selectors/getHistoryCachedPeriods.ts

@@ -1,4 +1,4 @@
-import { State } from '@front/domain/store/State'
+import { State } from '@front/domain/store'
 
 export const getHistoryCachedPeriods = (state: State) =>
   state.money.history.cachedPeriods

front/src/domain/money/selectors/getHistoryFetchingStatus.ts

@@ -1,4 +1,4 @@
-import { State } from '@front/domain/store/State'
+import { State } from '@front/domain/store'
 
 export const getHistoryFetchingStatus = (state: State) =>
   state.money.historyFetching

front/src/domain/money/selectors/getStats.ts

@@ -1,6 +1,6 @@
 import { Option } from 'tsoption'
 
-import { State } from '@front/domain/store/State'
+import { State } from '@front/domain/store'
 import { Currency } from '@shared/enum/Currency'
 import { GroupBy } from '@shared/enum/GroupBy'
 import { createStatsKey } from '../helpers/createStatsKey'

front/src/domain/money/selectors/getStatsCachedPeriods.ts

@@ -1,4 +1,4 @@
-import { State } from '@front/domain/store/State'
+import { State } from '@front/domain/store'
 
 export const getStatsCachedPeriods = (state: State) =>
   state.money.stats.cachedPeriods

front/src/domain/money/selectors/getStatsFetchingStatus.ts

@@ -1,4 +1,4 @@
-import { State } from '@front/domain/store/State'
+import { State } from '@front/domain/store'
 
 export const getStatsFetchingStatus = (state: State) =>
   state.money.statsFetching

front/src/domain/store/ExtraArg.ts

@@ -0,0 +1,5 @@
+import { Option } from 'tsoption'
+
+import { Api } from '../api'
+
+export type ExtraArg = (token: Option<string>) => Api

front/src/domain/store/index.ts

@@ -0,0 +1,6 @@
+export { State } from './State'
+export { Store } from './Store'
+export { WithReduxProps } from './WithReduxProps'
+export { withReduxStore } from './withReduxStore'
+export { useThunk } from './useThunk'
+export { ExtraArg } from './ExtraArg'

front/src/domain/store/initializeStore.ts

@@ -2,7 +2,7 @@ import { applyMiddleware, createStore } from 'redux'
 import { composeWithDevTools } from 'redux-devtools-extension'
 import thunk from 'redux-thunk'
 
-import { createApi } from '@front/domain/api/createApi'
+import { createApi } from '@front/domain/api'
 
 import { reducer } from './reducer'
 import { State } from './State'

front/src/domain/store/useThunk.ts

@@ -0,0 +1,14 @@
+import { AnyAction } from 'redux'
+import { useDispatch } from 'redux-react-hook'
+import { ThunkAction } from 'redux-thunk'
+
+import { ExtraArg } from './ExtraArg'
+import { State } from './State'
+
+export const useThunk = () => {
+  const dispatch = useDispatch()
+
+  return <Result = Promise<void>>(
+    action: ThunkAction<Result, State, ExtraArg, AnyAction>,
+  ) => dispatch(action as any)
+}

front/src/domain/user/actions/signIn.ts

@@ -1,9 +1,9 @@
-import { fetchOrFail } from '@front/domain/store/fetchingRedux/fetchOrFail'
+import { fetchOrFail } from '@front/domain/fetching-redux'
 
 import { signIn as signInRequest } from '../api/signIn'
+import { setCookie } from '../helpers/setCookie'
 import { actions as dataActions } from '../reducer/data'
 import { actions as signInActions } from '../reducer/signIn'
-import { setCookie } from '../setCookie'
 
 const { setToken } = dataActions
 

front/src/domain/user/actions/signUp.ts

@@ -1,9 +1,9 @@
-import { fetchOrFail } from '@front/domain/store/fetchingRedux/fetchOrFail'
+import { fetchOrFail } from '@front/domain/fetching-redux'
 
 import { signUp as signUpRequest } from '../api/signUp'
+import { setCookie } from '../helpers/setCookie'
 import { actions as dataActions } from '../reducer/data'
 import { actions as signUpActions } from '../reducer/signUp'
-import { setCookie } from '../setCookie'
 
 const { setToken } = dataActions
 

front/src/domain/user/api/signIn.ts

@@ -1,6 +1,6 @@
 import { TokenModel } from '@shared/models/user/TokenModel'
 
-import { Api } from '@front/domain/api/Api'
+import { Api } from '@front/domain/api'
 
 export const signIn = (api: Api) => (
   email: string,

front/src/domain/user/api/signUp.ts

@@ -1,6 +1,6 @@
 import { TokenModel } from '@shared/models/user/TokenModel'
 
-import { Api } from '@front/domain/api/Api'
+import { Api } from '@front/domain/api'
 
 export const signUp = (api: Api) => (
   email: string,