From bb6ff077fa4426340f7a65cc88cb9507ca5b362a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=92=D0=BB=D0=B0=D0=B4=D0=B8=D1=81=D0=BB=D0=B0=D0=B2=20?=
 =?UTF-8?q?=D0=A7=D0=B8=D0=BA=D0=B0=D0=BB=D0=BA=D0=B8=D0=BD?=
 <vchikalkin@evoleasing.ru>
Date: Tue, 22 Sep 2020 18:53:36 +0300
Subject: [PATCH] move calculationservice to single file

---
 src/client/Containers/Calculation/index.jsx   |  4 +--
 .../Components.ts => CalculationService.ts}   |  4 +--
 .../services/CalculationService/Entity.ts     | 35 -------------------
 .../services/CalculationService/index.ts      |  4 ---
 .../fakeData/{entity.ts => entityFakes.ts}    |  0
 .../controllers/CalculationController.ts      |  2 +-
 6 files changed, 5 insertions(+), 44 deletions(-)
 rename src/client/services/{CalculationService/Components.ts => CalculationService.ts} (94%)
 delete mode 100644 src/client/services/CalculationService/Entity.ts
 delete mode 100644 src/client/services/CalculationService/index.ts
 rename src/core/fakeData/{entity.ts => entityFakes.ts} (100%)

diff --git a/src/client/Containers/Calculation/index.jsx b/src/client/Containers/Calculation/index.jsx
index 575b835..52b9e56 100644
--- a/src/client/Containers/Calculation/index.jsx
+++ b/src/client/Containers/Calculation/index.jsx
@@ -1,5 +1,5 @@
 import { useStores } from 'client/hooks/useStores';
-import { ComponentsService } from 'client/services/CalculationService';
+import CalculationService from 'client/services/CalculationService';
 import { Box, Flex } from 'client/UIKit/grid';
 import React, { useEffect } from 'react';
 import Results from './Results';
@@ -8,7 +8,7 @@ import Sections from './Sections';
 const Calculation = () => {
   const { calculationStore } = useStores();
   useEffect(() => {
-    ComponentsService.getEntityOptions({
+    CalculationService.getEntityOptions({
       entityName: 'lead',
       fields: undefined,
       where: undefined,
diff --git a/src/client/services/CalculationService/Components.ts b/src/client/services/CalculationService.ts
similarity index 94%
rename from src/client/services/CalculationService/Components.ts
rename to src/client/services/CalculationService.ts
index bdf44b0..d2e6f21 100644
--- a/src/client/services/CalculationService/Components.ts
+++ b/src/client/services/CalculationService.ts
@@ -6,7 +6,7 @@ import {
   IGetInitialDataResponse,
 } from 'core/types/Requests/Calculation';
 
-class ComponentsService {
+class CalculationService {
   static _getInitialData = ({
     username,
   }: IGetInitialData): Promise<IGetInitialDataResponse> =>
@@ -45,4 +45,4 @@ class ComponentsService {
     });
 }
 
-export default ComponentsService;
+export default CalculationService;
diff --git a/src/client/services/CalculationService/Entity.ts b/src/client/services/CalculationService/Entity.ts
deleted file mode 100644
index 58afe71..0000000
--- a/src/client/services/CalculationService/Entity.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import axios from 'axios';
-import {
-  IGetEntity,
-  IGetEntityOptionsResponse,
-} from 'core/types/Requests/Calculation';
-
-class EntityService {
-  static getEntityOptions = ({
-    entityName,
-    fields,
-    where,
-    ...props
-  }: IGetEntity): Promise<IGetEntityOptionsResponse> =>
-    new Promise((resolve, reject) => {
-      axios({
-        url: '/api/calculation/getEntityOptions',
-        method: 'POST',
-        data: {
-          entityName,
-          fields,
-          where,
-          ...props,
-        },
-      })
-        .then(res => {
-          const { entityOptions }: IGetEntityOptionsResponse = res.data;
-          resolve({ entityOptions });
-        })
-        .catch(err => {
-          reject(err);
-        });
-    });
-}
-
-export default EntityService;
diff --git a/src/client/services/CalculationService/index.ts b/src/client/services/CalculationService/index.ts
deleted file mode 100644
index bbf07dc..0000000
--- a/src/client/services/CalculationService/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import ComponentsService from './Components';
-import EntityService from './Entity';
-
-export { ComponentsService, EntityService };
diff --git a/src/core/fakeData/entity.ts b/src/core/fakeData/entityFakes.ts
similarity index 100%
rename from src/core/fakeData/entity.ts
rename to src/core/fakeData/entityFakes.ts
diff --git a/src/server/controllers/CalculationController.ts b/src/server/controllers/CalculationController.ts
index 875cf5b..8305b9c 100644
--- a/src/server/controllers/CalculationController.ts
+++ b/src/server/controllers/CalculationController.ts
@@ -5,7 +5,7 @@ import {
   IGetInitialDataResponse,
 } from 'core/types/Requests/Calculation';
 import { Request, Response } from 'express';
-import entityFakeData from '../../core/fakeData/entity';
+import entityFakeData from '../../core/fakeData/entityFakes';
 import { EntityNames } from 'core/types/Entities/entityNames';
 
 function _getFakeEntities(entityName, fields, where) {