@nimee/calculations 1.0.6 → 1.0.8

package/dist/prices.d.ts

@@ -1,9 +1,10 @@
-import { IAccountModel, IEventModel, IUserEventModel } from "@nimee/shared-types";
-export declare const getTotalTicketsAmount: (allUsersEvent: IUserEventModel[]) => number;
+import { IAccountModel, IEventModel } from "@nimee/shared-types";
+export declare const paymeFee: number;
 export declare const calculateFinalPriceWithNimiFee: (totalPriceWithoutCouponDiscount: number, event: IEventModel, account: IAccountModel, totalPriceWithCouponDiscount: number) => {
     nimiFeePercentage: number;
     nimiFee: number;
     finalPriceWithNimiFee: number;
+    marketplaceFee: number;
 };
 export declare const calculateFinalPriceWithCouponDiscount: (totalPrice: number, couponDiscount: number) => number;
-export declare const validateFreeOrder: (ticketIds: string[], couponDiscount: number, accountId: string, eventId: string) => Promise<boolean>;
+export declare const calculateFinalPriceWithEndUserSeasonTicket: (totalPrice: number, endUserSeasonTicketDiscountPrice: any) => number;

package/dist/prices.js

@@ -1,83 +1,88 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateFreeOrder = exports.calculateFinalPriceWithCouponDiscount = exports.calculateFinalPriceWithNimiFee = exports.getTotalTicketsAmount = void 0;
+exports.calculateFinalPriceWithEndUserSeasonTicket = exports.calculateFinalPriceWithCouponDiscount = exports.calculateFinalPriceWithNimiFee = exports.paymeFee = void 0;
 /* Central the prices logic so we won't repeat it */
 const shared_types_1 = require("@nimee/shared-types");
-const api_clients_1 = require("@nimee/api-clients");
+const logger_1 = __importDefault(require("@nimee/logger"));
 const error_handler_1 = require("@nimee/error-handler");
-// Support both legacy and new userEvent schema (with ticketsInfo and without.)
-const getTotalTicketsAmount = (allUsersEvent) => {
-    return allUsersEvent.reduce((acc, userEvent) => {
-        var _a;
-        // For user-event to one ticket.
-        if (!((_a = userEvent === null || userEvent === void 0 ? void 0 : userEvent.ticketsInfo) === null || _a === void 0 ? void 0 : _a.length)) {
-            return acc + 1;
-        }
-        // For user-event to many ticket.
-        return acc + userEvent.ticketsInfo.length;
-    }, 0);
-};
-exports.getTotalTicketsAmount = getTotalTicketsAmount;
+exports.paymeFee = 1.1 * 1.17;
 // we need to calculate the final price with nimi fee and return the nimi fee percentage and nimi fee
 // we need the original price becuase the fee is calculated on top of the original price
 // then we return the coupon discount and the final price with nimi fee
 // then we calculate the nimi fee percentage from the final price after discount with nimi fee
+const roundToTwoDecimals = (num) => Math.round(num * 100) / 100;
 const calculateFinalPriceWithNimiFee = (totalPriceWithoutCouponDiscount, event, account, totalPriceWithCouponDiscount) => {
     switch (event.feeCollectionType) {
         case shared_types_1.IFeeCollectionType.PERCENTAGE_FROM_TICKET:
-            return { finalPriceWithNimiFee: totalPriceWithCouponDiscount, nimiFee: 0, nimiFeePercentage: account.marketFee }; // we use here marketFee (and not  originalMarketFee) because we need to send the fee to payme without their fee
+            const marketplaceFeeOfPERCENTAGE_FROM_TICKET = (totalPriceWithCouponDiscount * (account.originalMarketFee - exports.paymeFee - account.marketFee)) / 100;
+            return {
+                finalPriceWithNimiFee: totalPriceWithCouponDiscount,
+                nimiFee: 0,
+                nimiFeePercentage: account.marketFee,
+                marketplaceFee: roundToTwoDecimals(marketplaceFeeOfPERCENTAGE_FROM_TICKET),
+            }; // we use here marketFee (and not  originalMarketFee) because we need to send the fee to payme without their fee
         case shared_types_1.IFeeCollectionType.ON_TOP_OF_TICKET:
             // check if the totalPrice with coupon discount is 0 then we return 0 for the fee and the percentage
             if (totalPriceWithCouponDiscount === 0) {
-                return { finalPriceWithNimiFee: 0, nimiFee: 0, nimiFeePercentage: 0 };
+                return { finalPriceWithNimiFee: 0, nimiFee: 0, nimiFeePercentage: 0, marketplaceFee: 0 };
             }
             // minimum 3 so we use max we totalPriceWithoutCouponDiscount because the fee is calculated on top of the original price and not the price after discount
             const unroundedFee = Math.max(3, (totalPriceWithoutCouponDiscount * account.originalMarketFee) / 100); //  here we use originalMarketFee because we need to calculate the fee on top of the original price (later we will subtract payme fee from the fee we send to payme)
-            const roundedFee = Math.round(unroundedFee);
+            let roundedFee = Math.ceil(unroundedFee * 10) / 10;
             //  nimiFeePercentage has unknown range that need to be aware of - we get error when we send to payme with range above 60 so we use max
-            const nimiFeePercentage = Math.min(59, (roundedFee / (totalPriceWithCouponDiscount + roundedFee)) * 100);
+            // const nimiFeePercentage = Math.min(59, (roundedFee / totalPriceWithCouponDiscount) * 100); // we use here totalPriceWithCouponDiscount because we send payme the price after the discount plus the nimiFee (roundedFee) so we need to know the percentage of the fee from the final price
             // we need to  make sure we  send marketFee  that is greater or equal to 0 so we use max  and we  must subtract payme fee from nimiFeePercentage because payme ask to send them the fee without their fee
-            const nimiFeePercentageMinusPaymeFee = Math.max(0, nimiFeePercentage - 1.1 * 1.17);
+            // const nimiFeePercentageMinusPaymeFee = Math.max(0, nimiFeePercentage - 1.1 * 1.17);
+            let marketplaceFeeOfON_TOP_OF_TICKET = roundedFee - ((roundedFee + totalPriceWithCouponDiscount) * (account.marketFee + exports.paymeFee)) / 100; // payme takes the percentage from the price. so we calculate payme and nimi fee from the price and we substruct the result from the roundedFee
+            if (marketplaceFeeOfON_TOP_OF_TICKET <= 0) {
+                // means the originalMarketFee is equal or close to the marketFee+paymeFee) - happens when the price of the ticket is high and the fee of payme and nimi is high.. so we want to add more money to the fee so the seller wont lose here
+                logger_1.default.debug(`marketplaceFee is less than 0 marketplaceFee: ${marketplaceFeeOfON_TOP_OF_TICKET} and nimiFee: ${roundedFee}, account: ${account._id}, event: ${event._id}`);
+                const newUnroundedFee = roundedFee + Math.abs(marketplaceFeeOfON_TOP_OF_TICKET) + 1; // so we want to add the minus fee as absolute and another small amount because the solek takes from the new value (price+new rounded fee)
+                roundedFee = Math.ceil(newUnroundedFee * 10) / 10;
+                marketplaceFeeOfON_TOP_OF_TICKET =
+                    roundedFee - ((roundedFee + totalPriceWithCouponDiscount) * (account.marketFee + exports.paymeFee)) / 100; // payme takes the percentage from the price. so we calculate payme and nimi fee from the price and we substruct the result from the roundedFee
+                logger_1.default.info(`so assign new fee: ${marketplaceFeeOfON_TOP_OF_TICKET}, nimiFee: ${roundedFee}, account: ${account._id}, event: ${event._id}`);
+            }
             return {
                 finalPriceWithNimiFee: roundedFee + totalPriceWithCouponDiscount,
                 nimiFee: roundedFee,
-                nimiFeePercentage: nimiFeePercentageMinusPaymeFee,
+                nimiFeePercentage: account.marketFee,
+                marketplaceFee: roundToTwoDecimals(marketplaceFeeOfON_TOP_OF_TICKET),
             };
         default:
-            return { finalPriceWithNimiFee: totalPriceWithCouponDiscount, nimiFee: 0, nimiFeePercentage: account.marketFee };
+            throw new error_handler_1.CustomError("fee_collection_type_not_supported", 400, `fee collection type not supported - ${event.feeCollectionType}`);
     }
 };
 exports.calculateFinalPriceWithNimiFee = calculateFinalPriceWithNimiFee;
 const calculateFinalPriceWithCouponDiscount = (totalPrice, couponDiscount) => totalPrice - couponDiscount < 0 ? 0 : totalPrice - couponDiscount;
 exports.calculateFinalPriceWithCouponDiscount = calculateFinalPriceWithCouponDiscount;
+const calculateFinalPriceWithEndUserSeasonTicket = (totalPrice, endUserSeasonTicketDiscountPrice) => totalPrice - endUserSeasonTicketDiscountPrice < 0 ? 0 : totalPrice - endUserSeasonTicketDiscountPrice;
+exports.calculateFinalPriceWithEndUserSeasonTicket = calculateFinalPriceWithEndUserSeasonTicket;
 // Validate the order is really free, rather the tickets free or with the coupon discount.
 // we do this so the client won't be able to create orders with price 0 and it won't be validated
-const validateFreeOrder = (ticketIds, couponDiscount, accountId, eventId) => __awaiter(void 0, void 0, void 0, function* () {
-    const ticketClient = new api_clients_1.TicketClient();
-    const tickets = yield ticketClient.getTicketsByIds({ token: process.env.JWT_ADMIN, ticketIds, accountId, eventId });
-    if (!(tickets === null || tickets === void 0 ? void 0 : tickets.length)) {
-        throw new error_handler_1.CustomError("tickets_not_found_validate_free_order", 400, `tickets not found when try to validate free order with ticketIds - ${ticketIds} and eventId - ${eventId}`);
-    }
-    const rawOrderPriceFromTickets = tickets.reduce((acc, ticket) => acc + ticket.price, 0);
-    if (rawOrderPriceFromTickets === 0) {
-        return true;
-    }
-    if (couponDiscount) {
-        const orderPriceAfterCoupon = (0, exports.calculateFinalPriceWithCouponDiscount)(rawOrderPriceFromTickets, couponDiscount);
-        if (orderPriceAfterCoupon === 0) {
-            return true;
-        }
-    }
-    return false;
-});
-exports.validateFreeOrder = validateFreeOrder;
+// export const validateFreeOrder = async (ticketIds: string[], couponDiscount: number, accountId: string, eventId: string) => {
+//   const ticketClient = new TicketClient();
+//   const tickets = await ticketClient.getTicketsByIds({ token: process.env.JWT_ADMIN, ticketIds, accountId, eventId });
+//   if (!tickets?.length) {
+//     throw new CustomError(
+//       "tickets_not_found_validate_free_order",
+//       400,
+//       `tickets not found when try to validate free order with ticketIds - ${ticketIds} and eventId - ${eventId}`
+//     );
+//   }
+//   const rawOrderPriceFromTickets = tickets.reduce((acc: number, ticket: { price: number }) => acc + ticket.price, 0);
+//   if (rawOrderPriceFromTickets === 0) {
+//     return true;
+//   }
+//   if (couponDiscount) {
+//     const orderPriceAfterCoupon = calculateFinalPriceWithCouponDiscount(rawOrderPriceFromTickets, couponDiscount);
+//     if (orderPriceAfterCoupon === 0) {
+//       return true;
+//     }
+//   }
+//   return false;
+// };
 //# sourceMappingURL=prices.js.map

package/dist/prices.js.map

@@ -1 +1 @@
-{"version":3,"file":"prices.js","sourceRoot":"","sources":["../src/prices.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"prices.js","sourceRoot":"","sources":["../src/prices.ts"],"names":[],"mappings":"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"}

package/jest.config.js

@@ -0,0 +1,18 @@
+const config = require("@nimee/tests");
+
+const { clearMocks, coverageDirectory, collectCoverage, coverageReporters, forceExit, transform, testTimeout } =
+  config.jestConfig;
+
+module.exports = {
+  setupFiles: ["dotenv/config"],
+  clearMocks: clearMocks,
+  coverageDirectory: coverageDirectory,
+  testEnvironment: "node",
+  collectCoverage: collectCoverage,
+  coverageReporters: coverageReporters,
+  forceExit: forceExit,
+  transform: { "^.+\\.tsx?$": "ts-jest" },
+  testTimeout: testTimeout,
+  modulePathIgnorePatterns: ["<rootDir>/test-client/", "<rootDir>/dist/"],
+  transformIgnorePatterns: ["node_modules/(?!axios)"],
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nimee/calculations",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "description": "nimi calculations like prices for back and front",
   "main": "dist/index.js",
   "author": "dan goldberg",
@@ -11,24 +11,34 @@
     "build": "npm run build-ts",
     "lint": "eslint -c ../../.eslintrc.js  --ext .ts src/**",
     "prettier-format": "prettier --config .prettierrc 'src/**/*.ts' --write",
-    "incVersionAndPublish": "npm version patch && npm run publish-it && npm run i-all-workspaces",
+    "incVersionAndPublish": "npm run test:deploy && npm version patch && npm run publish-it && npm run i-all-workspaces",
     "publish-it": "npm run build && npm publish --scope=nimee --access public",
-    "i-all-workspaces": "version=${npm_package_version} npm i @nimee/calculations@$version  --workspace=@nimee/event --workspace=@nimee/user-event --workspace=@nimee/send-notification --workspace=@nimee/user  --workspace=@nimee/payment --workspace=@nimee/analytics"
+    "i-all-workspaces": "version=${npm_package_version} npm i @nimee/calculations@$version  --workspace=@nimee/event --workspace=@nimee/user-event --workspace=@nimee/send-notification --workspace=@nimee/user  --workspace=@nimee/payment --workspace=@nimee/analytics --workspace=@nimee/crm",
+    "test": "jest --detectOpenHandles --watch",
+    "test:deploy": "jest --ci --coverage"
   },
   "devDependencies": {
+    "@nimee/tests": "^0.0.15",
+    "@types/jest": "^23.3.12",
     "@typescript-eslint/eslint-plugin": "^5.18.0",
     "@typescript-eslint/eslint-plugin-tslint": "^5.18.0",
     "@typescript-eslint/parser": "^5.18.0",
     "eslint": "8.22.0",
     "eslint-plugin-jsdoc": "^38.1.6",
     "eslint-plugin-no-null": "^1.0.2",
+    "jest": "^29.0.0",
+    "jest-junit": "^12.0.0",
+    "nock": "^13.0.5",
     "nodemon": "^1.19.1",
+    "sinon": "^9.2.1",
+    "ts-jest": "^29.0.0",
     "typescript": "^5.2.2"
   },
   "types": "dist/index.d.ts",
   "dependencies": {
     "@nimee/api-clients": "^1.1.15",
     "@nimee/error-handler": "^0.0.9",
+    "@nimee/logger": "^1.0.24",
     "axios": "1.2.1"
   }
 }

package/src/prices.ts

@@ -1,81 +1,100 @@
 /* Central the prices logic so we won't repeat it */
 import { IAccountModel, IEventModel, IFeeCollectionType, IUserEventModel } from "@nimee/shared-types";
-import { TicketClient } from "@nimee/api-clients";
+import logger from "@nimee/logger";
 import { CustomError } from "@nimee/error-handler";
-
-// Support both legacy and new userEvent schema (with ticketsInfo and without.)
-export const getTotalTicketsAmount = (allUsersEvent: IUserEventModel[]): number => {
-  return allUsersEvent.reduce((acc: number, userEvent: IUserEventModel) => {
-    // For user-event to one ticket.
-    if (!userEvent?.ticketsInfo?.length) {
-      return acc + 1;
-    }
-    // For user-event to many ticket.
-    return acc + userEvent.ticketsInfo.length;
-  }, 0);
-};
+export const paymeFee = 1.1 * 1.17;
 
 // we need to calculate the final price with nimi fee and return the nimi fee percentage and nimi fee
 // we need the original price becuase the fee is calculated on top of the original price
 // then we return the coupon discount and the final price with nimi fee
 // then we calculate the nimi fee percentage from the final price after discount with nimi fee
+const roundToTwoDecimals = (num: number) => Math.round(num * 100) / 100;
+
 export const calculateFinalPriceWithNimiFee = (
   totalPriceWithoutCouponDiscount: number,
   event: IEventModel,
   account: IAccountModel,
   totalPriceWithCouponDiscount: number
-): { nimiFeePercentage: number; nimiFee: number; finalPriceWithNimiFee: number } => {
+): { nimiFeePercentage: number; nimiFee: number; finalPriceWithNimiFee: number; marketplaceFee: number } => {
   switch (event.feeCollectionType) {
     case IFeeCollectionType.PERCENTAGE_FROM_TICKET:
-      return { finalPriceWithNimiFee: totalPriceWithCouponDiscount, nimiFee: 0, nimiFeePercentage: account.marketFee }; // we use here marketFee (and not  originalMarketFee) because we need to send the fee to payme without their fee
+      const marketplaceFeeOfPERCENTAGE_FROM_TICKET =
+        (totalPriceWithCouponDiscount * (account.originalMarketFee - paymeFee - account.marketFee)) / 100;
+      return {
+        finalPriceWithNimiFee: totalPriceWithCouponDiscount,
+        nimiFee: 0,
+        nimiFeePercentage: account.marketFee,
+        marketplaceFee: roundToTwoDecimals(marketplaceFeeOfPERCENTAGE_FROM_TICKET),
+      }; // we use here marketFee (and not  originalMarketFee) because we need to send the fee to payme without their fee
     case IFeeCollectionType.ON_TOP_OF_TICKET:
       // check if the totalPrice with coupon discount is 0 then we return 0 for the fee and the percentage
       if (totalPriceWithCouponDiscount === 0) {
-        return { finalPriceWithNimiFee: 0, nimiFee: 0, nimiFeePercentage: 0 };
+        return { finalPriceWithNimiFee: 0, nimiFee: 0, nimiFeePercentage: 0, marketplaceFee: 0 };
       }
       // minimum 3 so we use max we totalPriceWithoutCouponDiscount because the fee is calculated on top of the original price and not the price after discount
       const unroundedFee = Math.max(3, (totalPriceWithoutCouponDiscount * account.originalMarketFee) / 100); //  here we use originalMarketFee because we need to calculate the fee on top of the original price (later we will subtract payme fee from the fee we send to payme)
-      const roundedFee = Math.round(unroundedFee);
+      let roundedFee = Math.ceil(unroundedFee * 10) / 10;
       //  nimiFeePercentage has unknown range that need to be aware of - we get error when we send to payme with range above 60 so we use max
-      const nimiFeePercentage = Math.min(59, (roundedFee / (totalPriceWithCouponDiscount + roundedFee)) * 100);
+      // const nimiFeePercentage = Math.min(59, (roundedFee / totalPriceWithCouponDiscount) * 100); // we use here totalPriceWithCouponDiscount because we send payme the price after the discount plus the nimiFee (roundedFee) so we need to know the percentage of the fee from the final price
       // we need to  make sure we  send marketFee  that is greater or equal to 0 so we use max  and we  must subtract payme fee from nimiFeePercentage because payme ask to send them the fee without their fee
-      const nimiFeePercentageMinusPaymeFee = Math.max(0, nimiFeePercentage - 1.1 * 1.17);
+      // const nimiFeePercentageMinusPaymeFee = Math.max(0, nimiFeePercentage - 1.1 * 1.17);
+      let marketplaceFeeOfON_TOP_OF_TICKET =
+        roundedFee - ((roundedFee + totalPriceWithCouponDiscount) * (account.marketFee + paymeFee)) / 100; // payme takes the percentage from the price. so we calculate payme and nimi fee from the price and we substruct the result from the roundedFee
+      if (marketplaceFeeOfON_TOP_OF_TICKET <= 0) {
+        // means the originalMarketFee is equal or close to the marketFee+paymeFee) - happens when the price of the ticket is high and the fee of payme and nimi is high.. so we want to add more money to the fee so the seller wont lose here
+        logger.debug(
+          `marketplaceFee is less than 0 marketplaceFee: ${marketplaceFeeOfON_TOP_OF_TICKET} and nimiFee: ${roundedFee}, account: ${account._id}, event: ${event._id}`
+        );
+        const newUnroundedFee = roundedFee + Math.abs(marketplaceFeeOfON_TOP_OF_TICKET) + 1; // so we want to add the minus fee as absolute and another small amount because the solek takes from the new value (price+new rounded fee)
+        roundedFee = Math.ceil(newUnroundedFee * 10) / 10;
+        marketplaceFeeOfON_TOP_OF_TICKET =
+          roundedFee - ((roundedFee + totalPriceWithCouponDiscount) * (account.marketFee + paymeFee)) / 100; // payme takes the percentage from the price. so we calculate payme and nimi fee from the price and we substruct the result from the roundedFee
+        logger.info(
+          `so assign new fee: ${marketplaceFeeOfON_TOP_OF_TICKET}, nimiFee: ${roundedFee}, account: ${account._id}, event: ${event._id}`
+        );
+      }
       return {
         finalPriceWithNimiFee: roundedFee + totalPriceWithCouponDiscount,
         nimiFee: roundedFee,
-        nimiFeePercentage: nimiFeePercentageMinusPaymeFee,
+        nimiFeePercentage: account.marketFee,
+        marketplaceFee: roundToTwoDecimals(marketplaceFeeOfON_TOP_OF_TICKET),
       };
     default:
-      return { finalPriceWithNimiFee: totalPriceWithCouponDiscount, nimiFee: 0, nimiFeePercentage: account.marketFee };
+      throw new CustomError(
+        "fee_collection_type_not_supported",
+        400,
+        `fee collection type not supported - ${event.feeCollectionType}`
+      );
   }
 };
 export const calculateFinalPriceWithCouponDiscount = (totalPrice: number, couponDiscount: number): number =>
   totalPrice - couponDiscount < 0 ? 0 : totalPrice - couponDiscount;
-
+export const calculateFinalPriceWithEndUserSeasonTicket = (totalPrice: number, endUserSeasonTicketDiscountPrice: any): number =>
+  totalPrice - endUserSeasonTicketDiscountPrice < 0 ? 0 : totalPrice - endUserSeasonTicketDiscountPrice;
 // Validate the order is really free, rather the tickets free or with the coupon discount.
 // we do this so the client won't be able to create orders with price 0 and it won't be validated
-export const validateFreeOrder = async (ticketIds: string[], couponDiscount: number, accountId: string, eventId: string) => {
-  const ticketClient = new TicketClient();
-  const tickets = await ticketClient.getTicketsByIds({ token: process.env.JWT_ADMIN, ticketIds, accountId, eventId });
-  if (!tickets?.length) {
-    throw new CustomError(
-      "tickets_not_found_validate_free_order",
-      400,
-      `tickets not found when try to validate free order with ticketIds - ${ticketIds} and eventId - ${eventId}`
-    );
-  }
+// export const validateFreeOrder = async (ticketIds: string[], couponDiscount: number, accountId: string, eventId: string) => {
+//   const ticketClient = new TicketClient();
+//   const tickets = await ticketClient.getTicketsByIds({ token: process.env.JWT_ADMIN, ticketIds, accountId, eventId });
+//   if (!tickets?.length) {
+//     throw new CustomError(
+//       "tickets_not_found_validate_free_order",
+//       400,
+//       `tickets not found when try to validate free order with ticketIds - ${ticketIds} and eventId - ${eventId}`
+//     );
+//   }
 
-  const rawOrderPriceFromTickets = tickets.reduce((acc: number, ticket: { price: number }) => acc + ticket.price, 0);
-  if (rawOrderPriceFromTickets === 0) {
-    return true;
-  }
+//   const rawOrderPriceFromTickets = tickets.reduce((acc: number, ticket: { price: number }) => acc + ticket.price, 0);
+//   if (rawOrderPriceFromTickets === 0) {
+//     return true;
+//   }
 
-  if (couponDiscount) {
-    const orderPriceAfterCoupon = calculateFinalPriceWithCouponDiscount(rawOrderPriceFromTickets, couponDiscount);
-    if (orderPriceAfterCoupon === 0) {
-      return true;
-    }
-  }
+//   if (couponDiscount) {
+//     const orderPriceAfterCoupon = calculateFinalPriceWithCouponDiscount(rawOrderPriceFromTickets, couponDiscount);
+//     if (orderPriceAfterCoupon === 0) {
+//       return true;
+//     }
+//   }
 
-  return false;
-};
+//   return false;
+// };

package/tests/prices.test.ts

@@ -0,0 +1,141 @@
+import {
+  calculateFinalPriceWithNimiFee,
+  calculateFinalPriceWithCouponDiscount,
+  calculateFinalPriceWithEndUserSeasonTicket,
+  paymeFee,
+} from "../src/prices";
+
+describe("calculateFinalPriceWithNimiFee", () => {
+  it("when event fee type is PERCENTAGE_FROM_TICKET, should calculate the final price with nimi fee and return the nimi fee percentage and nimi fee and marketplaceFee", () => {
+    const totalPriceWithoutCouponDiscount = 100;
+    const accountMarketFee = 2;
+    const originalMarketFee = 3.1;
+    const event = { id: "1", name: "Event 1", feeCollectionType: "percentage_from_ticket" };
+    const account = { id: "1", name: "Account 1", marketFee: accountMarketFee, originalMarketFee: originalMarketFee };
+    const totalPriceWithCouponDiscount = 90;
+
+    const result = calculateFinalPriceWithNimiFee(
+      totalPriceWithoutCouponDiscount,
+      event as any,
+      account as any,
+      totalPriceWithCouponDiscount
+    );
+    const expectedMarketplaceFee = parseFloat(
+      ((totalPriceWithCouponDiscount * (account.originalMarketFee - paymeFee - account.marketFee)) / 100).toFixed(2)
+    );
+
+    expect(result.nimiFeePercentage).toBe(accountMarketFee);
+    expect(result.nimiFee).toBe(0);
+    expect(result.finalPriceWithNimiFee).toBe(totalPriceWithCouponDiscount);
+    expect(result.marketplaceFee).toBe(expectedMarketplaceFee);
+  });
+  it("when event fee type is ON_TOP_OF_TICKET, should calculate the final price with nimi fee and return the nimi fee percentage and nimi fee and marketplaceFee", () => {
+    const totalPriceWithoutCouponDiscount = 100;
+    const accountMarketFee = 2;
+    const originalMarketFee = 3.1;
+    const event = { id: "1", name: "Event 1", feeCollectionType: "on_top_of_ticket" };
+    const account = { id: "1", name: "Account 1", marketFee: accountMarketFee, originalMarketFee: originalMarketFee };
+    const totalPriceWithCouponDiscount = 90;
+
+    const result = calculateFinalPriceWithNimiFee(
+      totalPriceWithoutCouponDiscount,
+      event as any,
+      account as any,
+      totalPriceWithCouponDiscount
+    );
+    const nimiFee = 3.1;
+    const expectedMarketplaceFee = parseFloat(
+      (nimiFee - ((totalPriceWithCouponDiscount + nimiFee) * (paymeFee + account.marketFee)) / 100).toFixed(2)
+    );
+    expect(result.nimiFeePercentage).toBe(accountMarketFee);
+    expect(result.nimiFee).toBe(nimiFee);
+    expect(result.finalPriceWithNimiFee).toBe(totalPriceWithCouponDiscount + nimiFee);
+    expect(result.marketplaceFee).toBe(expectedMarketplaceFee);
+  });
+  it("when event fee type is ON_TOP_OF_TICKET and the originalMarketFee is float 2, should calculate the final price with nimi fee and return the nimi fee percentage and nimi fee and marketplaceFee", () => {
+    const totalPriceWithoutCouponDiscount = 100;
+    const accountMarketFee = 2;
+    const originalMarketFee = 3.158;
+    const event = { id: "1", name: "Event 1", feeCollectionType: "on_top_of_ticket" };
+    const account = { id: "1", name: "Account 1", marketFee: accountMarketFee, originalMarketFee: originalMarketFee };
+    const totalPriceWithCouponDiscount = 90;
+
+    const result = calculateFinalPriceWithNimiFee(
+      totalPriceWithoutCouponDiscount,
+      event as any,
+      account as any,
+      totalPriceWithCouponDiscount
+    );
+
+    const nimiFee = 3.2;
+    const expectedMarketplaceFee = parseFloat(
+      (nimiFee - ((totalPriceWithCouponDiscount + nimiFee) * (paymeFee + account.marketFee)) / 100).toFixed(2)
+    );
+
+    expect(result.nimiFeePercentage).toBe(accountMarketFee);
+    expect(result.nimiFee).toBe(nimiFee);
+    expect(result.finalPriceWithNimiFee).toBe(totalPriceWithCouponDiscount + nimiFee);
+    expect(result.marketplaceFee).toBe(expectedMarketplaceFee);
+  });
+  it("when event fee type is ON_TOP_OF_TICKET and the originalMarketFee is float 2 and result of marketplaceFee is below zero, should calculate the final price with nimi fee and return the nimi fee percentage and nimi fee and marketplaceFee", () => {
+    const totalPriceWithoutCouponDiscount = 200;
+    const accountMarketFee = 1.287;
+    const originalMarketFee = 0.287;
+    const event = { id: "1", name: "Event 1", feeCollectionType: "on_top_of_ticket" };
+    const account = { id: "1", name: "Account 1", marketFee: accountMarketFee, originalMarketFee: originalMarketFee };
+    const totalPriceWithCouponDiscount = 200;
+
+    const result = calculateFinalPriceWithNimiFee(
+      totalPriceWithoutCouponDiscount,
+      event as any,
+      account as any,
+      totalPriceWithCouponDiscount
+    );
+
+    const nimiFee = 6.3;
+    expect(result.nimiFeePercentage).toBe(accountMarketFee);
+    expect(result.nimiFee).toBe(nimiFee);
+    expect(result.finalPriceWithNimiFee).toBe(totalPriceWithCouponDiscount + nimiFee);
+    expect(result.marketplaceFee).toBe(0.99);
+  });
+});
+
+describe("calculateFinalPriceWithCouponDiscount", () => {
+  it("should calculate the final price with coupon discount", () => {
+    const totalPrice = 100;
+    const couponDiscount = 20;
+
+    const finalPrice = calculateFinalPriceWithCouponDiscount(totalPrice, couponDiscount);
+
+    expect(finalPrice).toBe(80);
+  });
+
+  it("should return 0 if the final price is negative", () => {
+    const totalPrice = 10;
+    const couponDiscount = 20;
+
+    const finalPrice = calculateFinalPriceWithCouponDiscount(totalPrice, couponDiscount);
+
+    expect(finalPrice).toBe(0);
+  });
+});
+
+describe("calculateFinalPriceWithEndUserSeasonTicket", () => {
+  it("should calculate the final price with end user season ticket discount", () => {
+    const totalPrice = 100;
+    const endUserSeasonTicketDiscountPrice = 30;
+
+    const finalPrice = calculateFinalPriceWithEndUserSeasonTicket(totalPrice, endUserSeasonTicketDiscountPrice);
+
+    expect(finalPrice).toBe(70);
+  });
+
+  it("should return 0 if the final price is negative", () => {
+    const totalPrice = 10;
+    const endUserSeasonTicketDiscountPrice = 20;
+
+    const finalPrice = calculateFinalPriceWithEndUserSeasonTicket(totalPrice, endUserSeasonTicketDiscountPrice);
+
+    expect(finalPrice).toBe(0);
+  });
+});