From 90ac1fe6113bdfeae70135d7926826903fd03b56 Mon Sep 17 00:00:00 2001
From: Fedor Katurov <gotham48@gmail.com>
Date: Tue, 2 Mar 2021 15:49:57 +0700
Subject: [PATCH] boris: refactored sagas

---
 src/redux/boris/api.ts   | 11 ++++-------
 src/redux/boris/sagas.ts | 10 ++++++----
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/redux/boris/api.ts b/src/redux/boris/api.ts
index 3a8bd25f..c1bd5a72 100644
--- a/src/redux/boris/api.ts
+++ b/src/redux/boris/api.ts
@@ -1,13 +1,10 @@
 import git from '~/stats/git.json';
 import { API } from '~/constants/api';
-import { api, resultMiddleware, errorMiddleware } from '~/utils/api';
+import { api, resultMiddleware, errorMiddleware, cleanResult } from '~/utils/api';
 import { IBorisState, IStatBackend } from './reducer';
 import { IResultWithStatus } from '../types';
 
-export const getBorisGitStats = (): Promise<IBorisState['stats']['git']> => Promise.resolve(git);
+export const getBorisGitStats = () => Promise.resolve<IBorisState['stats']['git']>(git);
 
-export const getBorisBackendStats = (): Promise<IResultWithStatus<IStatBackend>> =>
-  api
-    .get(API.BORIS.GET_BACKEND_STATS)
-    .then(resultMiddleware)
-    .catch(errorMiddleware);
+export const getBorisBackendStats = () =>
+  api.get<IStatBackend>(API.BORIS.GET_BACKEND_STATS).then(cleanResult);
diff --git a/src/redux/boris/sagas.ts b/src/redux/boris/sagas.ts
index cacb77f4..a0b1d003 100644
--- a/src/redux/boris/sagas.ts
+++ b/src/redux/boris/sagas.ts
@@ -5,15 +5,17 @@ import { getBorisGitStats, getBorisBackendStats } from './api';
 import { Unwrap } from '../types';
 
 function* loadStats() {
-  yield put(borisSetStats({ is_loading: true }));
-
   try {
+    yield put(borisSetStats({ is_loading: true }));
+
     const git: Unwrap<typeof getBorisGitStats> = yield call(getBorisGitStats);
     const backend: Unwrap<typeof getBorisBackendStats> = yield call(getBorisBackendStats);
 
-    yield put(borisSetStats({ git, backend: backend.data, is_loading: false }));
+    yield put(borisSetStats({ git, backend }));
   } catch (e) {
-    yield put(borisSetStats({ git: [], backend: null, is_loading: false }));
+    yield put(borisSetStats({ git: [], backend: undefined }));
+  } finally {
+    yield put(borisSetStats({ is_loading: false }));
   }
 }