From 699096ebeecbc7256fd7686b84f7370a14329ec7 Mon Sep 17 00:00:00 2001
From: Chika <djchikalkin@gmail.com>
Date: Wed, 26 May 2021 16:14:07 +0300
Subject: [PATCH] new params to selectRegistration filter

---
 .../lib/fetchData/queries/optionsQuery.ts     |  3 +++
 .../Effects/reactions/gibddReactions.ts       | 23 +++++++++++++------
 src/core/types/Entities/crmEntities.ts        |  1 +
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/client/Containers/Calculation/lib/fetchData/queries/optionsQuery.ts b/src/client/Containers/Calculation/lib/fetchData/queries/optionsQuery.ts
index 8602bcc..d1a90e2 100644
--- a/src/client/Containers/Calculation/lib/fetchData/queries/optionsQuery.ts
+++ b/src/client/Containers/Calculation/lib/fetchData/queries/optionsQuery.ts
@@ -277,6 +277,9 @@ const query = gql`
       evo_fias_id
       evo_businessunit_evolution
       evo_oktmo
+      accounts {
+        accountid
+      }
     }
   }
 `;
diff --git a/src/client/stores/CalculationStore/Effects/reactions/gibddReactions.ts b/src/client/stores/CalculationStore/Effects/reactions/gibddReactions.ts
index d62fec5..9156f00 100644
--- a/src/client/stores/CalculationStore/Effects/reactions/gibddReactions.ts
+++ b/src/client/stores/CalculationStore/Effects/reactions/gibddReactions.ts
@@ -332,12 +332,18 @@ const gibddReactions: IReactionEffect[] = [
 
   calculationStore => ({
     expression: () => {
-      return calculationStore.getValues([
-        'objectRegistration',
-        'objectRegionRegistration',
-        'regionRegistration',
-        'typePTS',
-      ]);
+      const objectRegionRegistration = calculationStore.getOption(
+        'selectObjectRegionRegistration',
+      );
+
+      return {
+        objectRegionRegistration,
+        ...calculationStore.getValues([
+          'objectRegistration',
+          'regionRegistration',
+          'typePTS',
+        ]),
+      };
     },
     effect: ({
       objectRegistration,
@@ -352,7 +358,10 @@ const gibddReactions: IReactionEffect[] = [
             x.evo_pts_type &&
             x.evo_pts_type.includes(typePTS) &&
             x.evo_gibdd_region ===
-              (objectRegionRegistration === regionRegistration),
+              (objectRegionRegistration.evo_regionid === regionRegistration) &&
+            objectRegionRegistration.accounts
+              .map(x => x.accountid)
+              .includes(x.evo_accountid),
         ),
       );
     },
diff --git a/src/core/types/Entities/crmEntities.ts b/src/core/types/Entities/crmEntities.ts
index 0dda14c..b659e15 100644
--- a/src/core/types/Entities/crmEntities.ts
+++ b/src/core/types/Entities/crmEntities.ts
@@ -207,6 +207,7 @@ export interface IEvoRegion {
   statecode?: number;
   evo_businessunit_evolution?: boolean;
   evo_oktmo?: string;
+  accounts?: IAccount[];
 }
 export interface IEvoTown {
   evo_name?: string;