From 5b35d4faf8227c63992a7a12f6a678bfd3187da0 Mon Sep 17 00:00:00 2001 From: vchikalkin Date: Tue, 7 Feb 2023 15:11:56 +0300 Subject: [PATCH] clean code --- .../leasing-without-kasko/reactions/common.ts | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/apps/web/process/leasing-without-kasko/reactions/common.ts b/apps/web/process/leasing-without-kasko/reactions/common.ts index e117eff..cd735b6 100644 --- a/apps/web/process/leasing-without-kasko/reactions/common.ts +++ b/apps/web/process/leasing-without-kasko/reactions/common.ts @@ -112,25 +112,27 @@ export default function commonReactions({ store, apolloClient }: ReactionsContex }, }); + const price = plPriceRub - discountRub - importProgramSum + addEquipmentPrice; const options = evo_addproduct_types?.filter( (x) => - // eslint-disable-next-line @typescript-eslint/prefer-optional-chain x && Boolean(x.evo_max_period !== null && x.evo_max_period >= leasingPeriod) && Boolean(x.evo_min_period !== null && x.evo_min_period <= leasingPeriod) && - x.evo_max_price !== null && - x.evo_max_price >= plPriceRub - discountRub - importProgramSum + addEquipmentPrice && - x.evo_min_price !== null && - x.evo_min_price <= plPriceRub - discountRub - importProgramSum + addEquipmentPrice && + Boolean(x.evo_max_price !== null && x.evo_max_price >= price) && + Boolean(x.evo_min_price !== null && x.evo_min_price <= price) && x.evo_leasingobject_types?.find( (evo_leasingobject_type) => evo_leasingobject_type?.evo_leasingobject_typeid === leaseObjectType ) && x.evo_visible_calc && - x.evo_min_first_payment_perc !== null && - x.evo_min_first_payment_perc <= firstPaymentPerc && - x.evo_max_first_payment_perc !== null && - x.evo_max_first_payment_perc >= firstPaymentPerc && + Boolean( + x.evo_min_first_payment_perc !== null && + x.evo_min_first_payment_perc <= firstPaymentPerc + ) && + Boolean( + x.evo_max_first_payment_perc !== null && + x.evo_max_first_payment_perc >= firstPaymentPerc + ) && !x.evo_models?.map((evo_model) => evo_model?.evo_modelid).includes(modelId) );