1.0.69

fix cart types and functions

lib/model/cart.ts

@@ -7,7 +7,6 @@ export type PrivilegeCartData = {
     description: string;
     price: number;
     amount: number;
-    appliedPrivilegeDiscount: Discount | null;
 };
 
 export type TariffCartData = {
@@ -29,8 +28,8 @@ export type CartData = {
     services: ServiceCartData[];
     priceBeforeDiscounts: number;
     priceAfterDiscounts: number;
-    itemCount: number;
     appliedCartPurchasesDiscount: Discount | null;
     appliedLoyaltyDiscount: Discount | null;
     allAppliedDiscounts: Discount[];
+    appliedDiscountsByPrivilegeId: Map<string, Set<Discount>>;
 }; 

lib/model/discount.ts

@@ -11,20 +11,20 @@ export interface Discount {
         User: string;
         UserType: string;
         Coupon: string;
-        PurchasesAmount: number;
+        PurchasesAmount: string;
-        CartPurchasesAmount: number;
+        CartPurchasesAmount: string;
         Product: string;
         Term: string;
         Usage: string;
-        PriceFrom: number;
+        PriceFrom: string;
         Group: string;
     };
     Target: {
-        Products: [{
+        Products: {
             ID: string;
             Factor: number;
             Overhelm: boolean;
-        }];
+        }[];
         Factor: number;
         TargetScope: string;
         TargetGroup: string;
@@ -37,4 +37,4 @@ export interface Discount {
         Deleted: boolean;
     };
     Deprecated: boolean;
-};
+}

lib/utils/cart/cartDiscount.ts

@@ -1,19 +1,6 @@
-import { CartData, Discount } from "../../model";
+import { Discount } from "../../model";
-import { findDiscountFactor } from "./findDiscountFactor";
 
 
-export function applyCartDiscount(
-    cartData: CartData,
-    discounts: Discount[],
-) {
-    const cartDiscount = findCartDiscount(cartData.priceAfterDiscounts, discounts);
-    if (!cartDiscount) return;
-
-    cartData.priceAfterDiscounts *= findDiscountFactor(cartDiscount);
-    cartData.allAppliedDiscounts.push(cartDiscount);
-    cartData.appliedCartPurchasesDiscount = cartDiscount;
-}
-
 export function findCartDiscount(
     cartPurchasesAmount: number,
     discounts: Discount[],
@@ -21,14 +8,14 @@ export function findCartDiscount(
     const applicableDiscounts = discounts.filter(discount => {
         return (
             discount.Layer === 3 &&
-            cartPurchasesAmount >= discount.Condition.CartPurchasesAmount
+            cartPurchasesAmount >= Number(discount.Condition.CartPurchasesAmount)
         );
     });
 
     if (!applicableDiscounts.length) return null;
 
     const maxValueDiscount = applicableDiscounts.reduce((prev, current) => {
-        return current.Condition.CartPurchasesAmount > prev.Condition.CartPurchasesAmount ? current : prev;
+        return Number(current.Condition.CartPurchasesAmount) > Number(prev.Condition.CartPurchasesAmount) ? current : prev;
     });
 
     return maxValueDiscount;

lib/utils/cart/index.ts

@@ -1,5 +1,6 @@
 export * from "./cartDiscount";
 export * from "./findDiscountFactor";
 export * from "./loyaltyDiscount";
+export * from "./nkoDiscount";
 export * from "./privilegeDiscount";
 export * from "./serviceDiscount";

lib/utils/cart/loyaltyDiscount.ts

@@ -1,20 +1,6 @@
-import { CartData, Discount } from "../../model";
+import { Discount } from "../../model";
-import { findDiscountFactor } from "./findDiscountFactor";
 
 
-export function applyLoyaltyDiscount(
-    cartData: CartData,
-    discounts: Discount[],
-    purchasesAmount: number,
-) {
-    const loyalDiscount = findLoyaltyDiscount(purchasesAmount, discounts);
-    if (!loyalDiscount) return;
-
-    cartData.priceAfterDiscounts *= findDiscountFactor(loyalDiscount);
-    cartData.allAppliedDiscounts.push(loyalDiscount);
-    cartData.appliedLoyaltyDiscount = loyalDiscount;
-}
-
 export function findLoyaltyDiscount(
     purchasesAmount: number,
     discounts: Discount[],
@@ -23,14 +9,14 @@ export function findLoyaltyDiscount(
         return (
             discount.Layer === 4 &&
             discount.Condition.UserType !== "nko" &&
-            purchasesAmount >= discount.Condition.PurchasesAmount
+            purchasesAmount >= Number(discount.Condition.PurchasesAmount)
         );
     });
 
     if (!applicableDiscounts.length) return null;
 
     const maxValueDiscount = applicableDiscounts.reduce((prev, current) => {
-        return current.Condition.PurchasesAmount > prev.Condition.PurchasesAmount ? current : prev;
+        return Number(current.Condition.PurchasesAmount) > Number(prev.Condition.PurchasesAmount) ? current : prev;
     });
 
     return maxValueDiscount;

lib/utils/cart/nkoDiscount.ts

@@ -0,0 +1,14 @@
+import { Discount } from "../../model/discount";
+
+
+export function findNkoDiscount(discounts: Discount[]): Discount | null {
+    const applicableDiscounts = discounts.filter(discount => discount.Condition.UserType === "nko");
+
+    if (!applicableDiscounts.length) return null;
+
+    const maxValueDiscount = applicableDiscounts.reduce((prev, current) => {
+        return Number(current.Condition.CartPurchasesAmount) > Number(prev.Condition.CartPurchasesAmount) ? current : prev;
+    });
+
+    return maxValueDiscount;
+}

lib/utils/cart/privilegeDiscount.ts

@@ -1,36 +1,15 @@
-import { CartData, Discount } from "../../model";
+import { Discount } from "../../model";
-import { findDiscountFactor } from "./findDiscountFactor";
 
 
-export function applyPrivilegeDiscounts(
-    cartData: CartData,
-    discounts: Discount[],
-) {
-    cartData.services.forEach(service => {
-        service.tariffs.forEach(tariff => {
-            tariff.privileges.forEach(privilege => {
-                const privilegeDiscount = findPrivilegeDiscount(privilege.privilegeId, privilege.amount, discounts);
-                if (!privilegeDiscount) return;
-
-                const discountAmount = privilege.price * (1 - findDiscountFactor(privilegeDiscount));
-                privilege.price -= discountAmount;
-                cartData.allAppliedDiscounts.push(privilegeDiscount);
-                privilege.appliedPrivilegeDiscount = privilegeDiscount;
-
-                tariff.price -= discountAmount;
-                service.price -= discountAmount;
-                cartData.priceAfterDiscounts -= discountAmount;
-            });
-        });
-    });
-}
-
 export function findPrivilegeDiscount(
     privilegeId: string,
     privilegePrice: number,
     discounts: Discount[],
+    userId: string,
 ): Discount | null {
     const applicableDiscounts = discounts.filter(discount => {
+        if (discount.Condition.User !== "" && discount.Condition.User === userId) return true;
+
         const conditionMinPrice = parseFloat(discount.Condition.Term);
         if (!isFinite(conditionMinPrice)) throw new Error(`Couldn't parse Discount.Condition.Term: ${discount.Condition.Term}`);
 
@@ -43,9 +22,17 @@ export function findPrivilegeDiscount(
 
     if (!applicableDiscounts.length) return null;
 
-    const maxValueDiscount = applicableDiscounts.reduce((prev, current) =>
+    let maxValueDiscount: Discount = applicableDiscounts[0];
-        parseFloat(current.Condition.Term) > parseFloat(prev.Condition.Term) ? current : prev
+    for (const discount of applicableDiscounts) {
-    );
+        if (discount.Condition.User !== "" && discount.Condition.User === userId) {
+            maxValueDiscount = discount;
+            break;
+        }
+
+        if (Number(discount.Condition.Term) > Number(maxValueDiscount.Condition.Term)) {
+            maxValueDiscount = discount;
+        }
+    }
 
     return maxValueDiscount;
 }

lib/utils/cart/serviceDiscount.ts

@@ -1,48 +1,35 @@
-import { CartData, Discount } from "../../model";
+import { Discount } from "../../model";
-import { findDiscountFactor } from "./findDiscountFactor";
 
 
-export function applyServiceDiscounts(
-    cartData: CartData,
-    discounts: Discount[],
-) {
-    cartData.services.forEach(service => {
-        service.tariffs.map(tariff => {
-            tariff.privileges.forEach(privilege => {
-                const privilegeDiscount = findServiceDiscount(privilege.serviceKey, privilege.price, discounts);
-                if (!privilegeDiscount) return;
-
-                const discountAmount = privilege.price * (1 - findDiscountFactor(privilegeDiscount));
-                privilege.price -= discountAmount;
-                cartData.allAppliedDiscounts.push(privilegeDiscount);
-                service.appliedServiceDiscount = privilegeDiscount;
-
-                tariff.price -= discountAmount;
-                service.price -= discountAmount;
-                cartData.priceAfterDiscounts -= discountAmount;
-            });
-        });
-    });
-}
-
 export function findServiceDiscount(
     serviceKey: string,
     currentPrice: number,
     discounts: Discount[],
+    userId: string,
 ): Discount | null {
     const applicableDiscounts = discounts.filter(discount => {
+        if (discount.Condition.User !== "" && discount.Condition.User === userId) return true;
+
         return (
             discount.Layer === 2 &&
             discount.Condition.Group === serviceKey &&
-            currentPrice >= discount.Condition.PriceFrom
+            currentPrice >= Number(discount.Condition.PriceFrom)
         );
     });
 
     if (!applicableDiscounts.length) return null;
 
-    const maxValueDiscount = applicableDiscounts.reduce((prev, current) => {
+    let maxValueDiscount: Discount = applicableDiscounts[0];
-        return current.Condition.PriceFrom > prev.Condition.PriceFrom ? current : prev;
+    for (const discount of applicableDiscounts) {
-    });
+        if (discount.Condition.User !== "" && discount.Condition.User === userId) {
+            maxValueDiscount = discount;
+            break;
+        }
+
+        if (Number(discount.Condition.PriceFrom) > Number(maxValueDiscount.Condition.PriceFrom)) {
+            maxValueDiscount = discount;
+        }
+    }
 
     return maxValueDiscount;
 }

package.json

@@ -1,6 +1,6 @@
 {
     "name": "@frontend/kitui",
-    "version": "1.0.68",
+    "version": "1.0.69",
     "description": "test",
     "main": "./dist/index.js",
     "module": "./dist/index.js",