@riocrypto/common-server 1.0.714 → 1.0.715

package/build/helpers/calculate-aggregate-volume.d.ts

@@ -1,2 +1,3 @@
 import { User } from "@riocrypto/common";
-export declare const calculateAggregateVolume: (user: User, days: number) => Promise<number>;
+import { Mongoose } from "mongoose";
+export declare const calculateAggregateVolume: (mongoose: Mongoose, user: User, days: number) => Promise<number>;

package/build/helpers/calculate-aggregate-volume.js

@@ -8,47 +8,39 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         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.calculateAggregateVolume = void 0;
 const common_1 = require("@riocrypto/common");
 const order_1 = require("../models/order");
-const mongoose_1 = __importDefault(require("mongoose"));
-const calculateAggregateVolume = (user, days) => __awaiter(void 0, void 0, void 0, function* () {
-    let volume;
+const calculateAggregateVolume = (mongoose, user, days) => __awaiter(void 0, void 0, void 0, function* () {
     const startDate = new Date();
     startDate.setDate(startDate.getDate() - days); // Subtract 14 days from current date
-    const Order = (0, order_1.buildOrder)(mongoose_1.default);
-    const buyOrders = yield Order.find({
-        userId: user.id,
-        type: common_1.Side.Buy,
-        status: common_1.OrderStatus.Complete,
-        createdAt: { $gte: startDate },
-    });
-    const sellOrders = yield Order.find({
+    const Order = (0, order_1.buildOrder)(mongoose);
+    const orders = yield Order.find({
         userId: user.id,
-        type: common_1.Side.Sell,
         status: common_1.OrderStatus.Complete,
         createdAt: { $gte: startDate },
     });
-    volume =
-        sellOrders.reduce((sum, order) => {
-            var _a, _b, _c, _d, _e;
-            return sum +
-                (order.amountFiat +
-                    ((((_a = order.fees) === null || _a === void 0 ? void 0 : _a.partnerFeeFiat) || 0) +
-                        (((_b = order.fees) === null || _b === void 0 ? void 0 : _b.platformFeeFiat) || 0) +
-                        (((_c = order.fees) === null || _c === void 0 ? void 0 : _c.platformFeeFiatTax) || 0) +
-                        (((_d = order.fees) === null || _d === void 0 ? void 0 : _d.processingFeeFiat) || 0) +
-                        (((_e = order.fees) === null || _e === void 0 ? void 0 : _e.transferFeeFiat) || 0)) || 0) *
-                    (order.conversionRateToUSD || 0);
-        }, 0) +
-            buyOrders.reduce((sum, order) => sum + order.amountFiat * (order.conversionRateToUSD || 0), 0);
-    if (!volume) {
-        volume = 0;
-    }
-    return volume;
+    const volume = orders.reduce((sum, order) => {
+        var _a, _b, _c, _d, _e;
+        const fiatAmount = order.amountFiat || 0;
+        const conversionRate = order.conversionRateToUSD || 0;
+        const partnerFee = ((_a = order.fees) === null || _a === void 0 ? void 0 : _a.partnerFeeFiat) || 0;
+        const platformFee = ((_b = order.fees) === null || _b === void 0 ? void 0 : _b.platformFeeFiat) || 0;
+        const platformTax = ((_c = order.fees) === null || _c === void 0 ? void 0 : _c.platformFeeFiatTax) || 0;
+        const processingFee = ((_d = order.fees) === null || _d === void 0 ? void 0 : _d.processingFeeFiat) || 0;
+        const transferFee = ((_e = order.fees) === null || _e === void 0 ? void 0 : _e.transferFeeFiat) || 0;
+        const sellVolume = (fiatAmount +
+            partnerFee +
+            platformFee +
+            platformTax +
+            processingFee +
+            transferFee) *
+            conversionRate;
+        const buyVolume = fiatAmount * conversionRate;
+        return sum + sellVolume + buyVolume;
+    }, 0);
+    const volumeResult = volume || 0;
+    return volumeResult;
 });
 exports.calculateAggregateVolume = calculateAggregateVolume;

package/build/helpers/get-platform-and-partner-fees.js

@@ -60,7 +60,7 @@ const getPlatformAndPartnerFees = (mongoose, amountFiat, fiat, processor, countr
     else if (user === null || user === void 0 ? void 0 : user.platformFeeRanges) {
         let volume;
         if ((_a = user === null || user === void 0 ? void 0 : user.attributes) === null || _a === void 0 ? void 0 : _a.includes(common_1.UserAttribute.summedVolumeFees)) {
-            volume = yield (0, calculate_aggregate_volume_1.calculateAggregateVolume)(user, 14);
+            volume = yield (0, calculate_aggregate_volume_1.calculateAggregateVolume)(mongoose, user, 14);
         }
         else {
             volume = Number(amountUSD);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riocrypto/common-server",
-  "version": "1.0.714",
+  "version": "1.0.715",
   "description": "",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",