From 681bd8a38e87955d3282b4f3bf23e80d26ba0727 Mon Sep 17 00:00:00 2001
From: vchikalkin <djchikalkin@gmail.com>
Date: Wed, 19 Apr 2023 18:39:22 +0300
Subject: [PATCH] fix prepared-values pt.3

---
 .../server/routers/calculate/lib/request.ts   | 48 ++++++++++++-------
 1 file changed, 32 insertions(+), 16 deletions(-)

diff --git a/apps/web/server/routers/calculate/lib/request.ts b/apps/web/server/routers/calculate/lib/request.ts
index 7ccc1eb..15c7afb 100644
--- a/apps/web/server/routers/calculate/lib/request.ts
+++ b/apps/web/server/routers/calculate/lib/request.ts
@@ -195,8 +195,10 @@ export async function createRequestData({
         (x) =>
           x?.evo_job_titleid === systemuser?.evo_job_titleid &&
           x?.evo_sot_coefficient_typeidData?.evo_id === 'BONUS_FIX' &&
-          Boolean(values.product) &&
-          x.evo_baseproducts?.some((evo_baseproduct) => evo_baseproduct?.evo_id === values.product)
+          values.product &&
+          x.evo_baseproducts?.some(
+            (evo_baseproduct) => evo_baseproduct?.evo_baseproductid === values.product
+          )
       );
 
       return evo_coefficient?.evo_sot_coefficient || 0;
@@ -352,8 +354,10 @@ export async function createRequestData({
       const evo_coefficient = evo_coefficients?.find(
         (x) =>
           x?.evo_sot_coefficient_typeidData?.evo_id === 'DIRECTOR_BONUS' &&
-          Boolean(values.product) &&
-          x.evo_baseproducts?.some((evo_baseproduct) => evo_baseproduct?.evo_id === values.product)
+          values.product &&
+          x.evo_baseproducts?.some(
+            (evo_baseproduct) => evo_baseproduct?.evo_baseproductid === values.product
+          )
       );
 
       return evo_coefficient?.evo_sot_coefficient || 0;
@@ -371,8 +375,10 @@ export async function createRequestData({
       const evo_coefficient = evo_coefficients?.find(
         (x) =>
           x?.evo_sot_coefficient_typeidData?.evo_id === 'DIRECTOR_BONUS_FIX' &&
-          Boolean(values.product) &&
-          x.evo_baseproducts?.some((evo_baseproduct) => evo_baseproduct?.evo_id === values.product)
+          values.product &&
+          x.evo_baseproducts?.some(
+            (evo_baseproduct) => evo_baseproduct?.evo_baseproductid === values.product
+          )
       );
 
       return evo_coefficient?.evo_sot_coefficient || 0;
@@ -390,8 +396,10 @@ export async function createRequestData({
       const evo_coefficient = evo_coefficients?.find(
         (x) =>
           x?.evo_sot_coefficient_typeidData?.evo_id === 'DIRECTOR_EXTRA_BONUS' &&
-          Boolean(values.product) &&
-          x.evo_baseproducts?.some((evo_baseproduct) => evo_baseproduct?.evo_id === values.product)
+          values.product &&
+          x.evo_baseproducts?.some(
+            (evo_baseproduct) => evo_baseproduct?.evo_baseproductid === values.product
+          )
       );
 
       return evo_coefficient?.evo_sot_coefficient || 0;
@@ -459,8 +467,10 @@ export async function createRequestData({
         (x) =>
           x?.evo_job_titleid === systemuser?.evo_job_titleid &&
           x?.evo_sot_coefficient_typeidData?.evo_id === 'EXTRA_BONUS' &&
-          Boolean(values.product) &&
-          x.evo_baseproducts?.some((evo_baseproduct) => evo_baseproduct?.evo_id === values.product)
+          values.product &&
+          x.evo_baseproducts?.some(
+            (evo_baseproduct) => evo_baseproduct?.evo_baseproductid === values.product
+          )
       );
 
       return evo_coefficient?.evo_sot_coefficient || 0;
@@ -1029,8 +1039,10 @@ export async function createRequestData({
       const evo_coefficient = evo_coefficients?.find(
         (x) =>
           x?.evo_sot_coefficient_typeidData?.evo_id === 'REGIONAL_DIRECTOR_BONUS' &&
-          Boolean(values.product) &&
-          x.evo_baseproducts?.some((evo_baseproduct) => evo_baseproduct?.evo_id === values.product)
+          values.product &&
+          x.evo_baseproducts?.some(
+            (evo_baseproduct) => evo_baseproduct?.evo_baseproductid === values.product
+          )
       );
 
       return evo_coefficient?.evo_sot_coefficient || 0;
@@ -1048,8 +1060,10 @@ export async function createRequestData({
       const evo_coefficient = evo_coefficients?.find(
         (x) =>
           x?.evo_sot_coefficient_typeidData?.evo_id === 'REGIONAL_DIRECTOR_BONUS_FIX' &&
-          Boolean(values.product) &&
-          x.evo_baseproducts?.some((evo_baseproduct) => evo_baseproduct?.evo_id === values.product)
+          values.product &&
+          x.evo_baseproducts?.some(
+            (evo_baseproduct) => evo_baseproduct?.evo_baseproductid === values.product
+          )
       );
 
       return evo_coefficient?.evo_sot_coefficient || 0;
@@ -1068,8 +1082,10 @@ export async function createRequestData({
       const evo_coefficient = evo_coefficients?.find(
         (x) =>
           x?.evo_sot_coefficient_typeidData?.evo_id === 'REGIONAL_DIRECTOR_EXTRA_BONUS' &&
-          Boolean(values.product) &&
-          x.evo_baseproducts?.some((evo_baseproduct) => evo_baseproduct?.evo_id === values.product)
+          values.product &&
+          x.evo_baseproducts?.some(
+            (evo_baseproduct) => evo_baseproduct?.evo_baseproductid === values.product
+          )
       );
 
       return evo_coefficient?.evo_sot_coefficient || 0;