@riocrypto/common-server 1.0.779 → 1.0.781

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

@@ -13,16 +13,26 @@ exports.calculateAggregateVolumeAndRevenue = void 0;
 const common_1 = require("@riocrypto/common");
 const order_1 = require("../models/order");
 const calculateAggregateVolumeAndRevenue = (mongoose, days, user) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a;
     const startDate = new Date();
     startDate.setDate(startDate.getDate() - days); // Subtract 14 days from current date
     const Order = (0, order_1.buildOrder)(mongoose);
     let orders;
     if (user) {
-        orders = yield Order.find({
-            userId: user.id,
-            status: common_1.OrderStatus.Complete,
-            createdAt: { $gte: startDate },
-        });
+        if ((_a = user.attributes) === null || _a === void 0 ? void 0 : _a.includes(common_1.UserAttribute.broker)) {
+            orders = yield Order.find({
+                $or: [{ userId: user.id }, { brokerId: user.id }],
+                status: common_1.OrderStatus.Complete,
+                createdAt: { $gte: startDate },
+            });
+        }
+        else {
+            orders = yield Order.find({
+                userId: user.id,
+                status: common_1.OrderStatus.Complete,
+                createdAt: { $gte: startDate },
+            });
+        }
     }
     else {
         orders = yield Order.find({

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

@@ -18,7 +18,7 @@ const partner_1 = require("../models/partner");
 const user_1 = require("../models/user");
 const calculate_aggregate_volume_1 = require("./calculate-aggregate-volume");
 const getPlatformAndPartnerFees = (mongoose, amountFiat, fiat, processor, country, discount, partnerId, brokerId, user) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a;
+    var _a, _b;
     let platformFeeFiat;
     let platformFeeFiatTax = 0;
     let partnerFeeFiat = 0;
@@ -63,13 +63,21 @@ const getPlatformAndPartnerFees = (mongoose, amountFiat, fiat, processor, countr
     }
     else if (brokerId) {
         const User = (0, user_1.buildUser)(mongoose);
-        const brokerCustomer = yield User.findById(brokerId);
-        if (!brokerCustomer) {
+        const broker = yield User.findById(brokerId);
+        if (!broker) {
             throw new Error("Broker customer not found");
         }
-        if (brokerCustomer === null || brokerCustomer === void 0 ? void 0 : brokerCustomer.platformFeeRanges) {
-            for (const range of brokerCustomer.platformFeeRanges) {
-                if (range.min <= Number(amountUSD) && range.max >= Number(amountUSD)) {
+        let volume;
+        if ((_a = broker.attributes) === null || _a === void 0 ? void 0 : _a.includes(common_1.UserAttribute.summedVolumeFees)) {
+            const volumeAndRevenue = yield (0, calculate_aggregate_volume_1.calculateAggregateVolumeAndRevenue)(mongoose, 14, user);
+            volume = volumeAndRevenue.volume;
+        }
+        else {
+            volume = Number(amountUSD);
+        }
+        if (broker.platformFeeRanges) {
+            for (const range of broker.platformFeeRanges) {
+                if (range.min <= Number(volume) && range.max >= Number(volume)) {
                     if (discount) {
                         if (discount > range.fee) {
                             throw new Error("Discount cannot be greater than platform fee");
@@ -89,7 +97,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)) {
+        if ((_b = user === null || user === void 0 ? void 0 : user.attributes) === null || _b === void 0 ? void 0 : _b.includes(common_1.UserAttribute.summedVolumeFees)) {
             const volumeAndRevenue = yield (0, calculate_aggregate_volume_1.calculateAggregateVolumeAndRevenue)(mongoose, 14, user);
             volume = volumeAndRevenue.volume;
         }

package/build/models/order.d.ts

@@ -27,6 +27,7 @@ interface OrderAttrs {
     actualConversionRateUSD?: number;
     notes?: string;
     discount?: number;
+    markup?: number;
     invoiceUrl?: string;
 }
 interface OrderDoc extends Document {
@@ -56,6 +57,7 @@ interface OrderDoc extends Document {
     actualConversionRateUSD?: number;
     notes?: string;
     discount?: number;
+    markup?: number;
 }
 interface OrderModel extends Model<OrderDoc> {
     build(attrs: OrderAttrs): OrderDoc;

package/build/models/order.js

@@ -108,6 +108,9 @@ const buildOrder = (mongoose) => {
         discount: {
             type: Number,
         },
+        markup: {
+            type: Number,
+        },
     }, {
         toJSON: {
             transform(doc, ret) {

package/package.json

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