@riocrypto/common-server 1.0.694 → 1.0.697

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

@@ -16,7 +16,9 @@ const kapstar_client_1 = require("../clients/kapstar-client");
 const currency_api_client_1 = require("../clients/currency-api-client");
 const partner_1 = require("../models/partner");
 const user_1 = require("../models/user");
+const order_1 = require("../models/order");
 const getPlatformAndPartnerFees = (mongoose, amountFiat, fiat, processor, country, partnerId, brokerCustomerId, user) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a;
     let platformFeeFiat;
     let platformFeeFiatTax = 0;
     let partnerFeeFiat = 0;
@@ -56,8 +58,40 @@ const getPlatformAndPartnerFees = (mongoose, amountFiat, fiat, processor, countr
         partnerFeeFiat = amountFiat * partner.partnerFee;
     }
     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)) {
+            const startDate = new Date();
+            startDate.setDate(startDate.getDate() - 14); // Subtract 14 days from current date
+            const Order = (0, order_1.buildOrder)(mongoose);
+            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({
+                userId: user.id,
+                type: common_1.Side.Buy,
+                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);
+                }, 0) + buyOrders.reduce((sum, order) => sum + order.amountFiat, 0);
+        }
+        else {
+            volume = Number(amountUSD);
+        }
         for (const range of user.platformFeeRanges) {
-            if (range.min <= Number(amountUSD) && range.max >= Number(amountUSD)) {
+            if (range.min <= Number(volume) && range.max >= Number(volume)) {
                 platformFeeFiat = amountFiat * range.fee;
                 break;
             }

package/build/models/order.d.ts

@@ -23,6 +23,7 @@ interface OrderAttrs {
     depositTxId?: string;
     withdrawalTxId?: string;
     brokerCustomerId?: string;
+    conversionRateToUSD?: number;
 }
 interface OrderDoc extends Document {
     userId: string;
@@ -47,6 +48,7 @@ interface OrderDoc extends Document {
     depositTxId?: string;
     withdrawalTxId?: string;
     brokerCustomerId?: string;
+    conversionRateToUSD?: number;
 }
 interface OrderModel extends Model<OrderDoc> {
     build(attrs: OrderAttrs): OrderDoc;

package/build/models/order.js

@@ -96,6 +96,9 @@ const buildOrder = (mongoose) => {
         brokerCustomerId: {
             type: String,
         },
+        conversionRateToUSD: {
+            type: Number,
+        },
     }, {
         toJSON: {
             transform(doc, ret) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riocrypto/common-server",
-  "version": "1.0.694",
+  "version": "1.0.697",
   "description": "",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",
@@ -24,7 +24,7 @@
     "@aws-sdk/client-s3": "^3.297.0",
     "@everapi/currencyapi-js": "^1.0.6",
     "@google-cloud/storage": "^6.9.5",
-    "@riocrypto/common": "^1.0.626",
+    "@riocrypto/common": "^1.0.628",
     "@types/express": "^4.17.13",
     "axios": "^0.27.2",
     "ccxt": "^3.0.30",