@riocrypto/common-server 1.0.723 → 1.0.725

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

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

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

@@ -9,10 +9,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.calculateAggregateVolume = void 0;
+exports.calculateAggregateVolumeAndRevenue = void 0;
 const common_1 = require("@riocrypto/common");
 const order_1 = require("../models/order");
-const calculateAggregateVolume = (mongoose, days, user) => __awaiter(void 0, void 0, void 0, function* () {
+const calculateAggregateVolumeAndRevenue = (mongoose, days, user) => __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);
@@ -30,7 +30,9 @@ const calculateAggregateVolume = (mongoose, days, user) => __awaiter(void 0, voi
             createdAt: { $gte: startDate },
         });
     }
-    const volume = orders.reduce((sum, order) => {
+    let volume = 0;
+    let revenue = 0;
+    orders.forEach((order) => {
         var _a, _b, _c, _d, _e;
         const fiatAmount = order.amountFiat || 0;
         const conversionRate = order.conversionRateToUSD || 0;
@@ -39,6 +41,8 @@ const calculateAggregateVolume = (mongoose, days, user) => __awaiter(void 0, voi
         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 price = order.price || 0;
+        const amountCrypto = order.amountCrypto || 0;
         const sellVolume = (fiatAmount +
             partnerFee +
             platformFee +
@@ -47,9 +51,13 @@ const calculateAggregateVolume = (mongoose, days, user) => __awaiter(void 0, voi
             transferFee) *
             conversionRate;
         const buyVolume = fiatAmount * conversionRate;
-        return sum + sellVolume + buyVolume;
-    }, 0);
+        volume += sellVolume + buyVolume;
+        const sellRevenue = amountCrypto * price * platformFee * conversionRate;
+        const buyRevenue = fiatAmount * platformFee * conversionRate;
+        revenue += sellRevenue + buyRevenue;
+    });
     const volumeResult = volume || 0;
-    return volumeResult;
+    const revenueResult = revenue || 0;
+    return { volume: volumeResult, revenue: revenueResult };
 });
-exports.calculateAggregateVolume = calculateAggregateVolume;
+exports.calculateAggregateVolumeAndRevenue = calculateAggregateVolumeAndRevenue;

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

@@ -60,7 +60,8 @@ 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)(mongoose, 14, user);
+            const volumeAndRevenue = yield (0, calculate_aggregate_volume_1.calculateAggregateVolumeAndRevenue)(mongoose, 14, user);
+            volume = volumeAndRevenue.volume;
         }
         else {
             volume = Number(amountUSD);

package/build/models/user.d.ts

@@ -26,6 +26,7 @@ interface UserAttrs {
     COIFile?: string;
     KYCReportFile?: string;
     authorizedPhoneNumbers?: string[];
+    notificationUrl?: string;
 }
 interface UserModel extends Model<UserDoc> {
     build(attrs: UserAttrs): UserDoc;
@@ -57,6 +58,7 @@ interface UserDoc extends Document {
     COIFile?: string;
     KYCReportFile?: string;
     authorizedPhoneNumbers?: string[];
+    notificationUrl?: string;
 }
 declare const buildUser: (mongoose: Mongoose) => UserModel;
 export { buildUser, UserDoc };

package/build/models/user.js

@@ -110,6 +110,9 @@ const buildUser = (mongoose) => {
                 type: String,
             },
         ],
+        notificationUrl: {
+            type: String,
+        },
     }, {
         toJSON: {
             transform(doc, ret) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riocrypto/common-server",
-  "version": "1.0.723",
+  "version": "1.0.725",
   "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.643",
+    "@riocrypto/common": "^1.0.644",
     "@types/express": "^4.17.13",
     "axios": "^0.27.2",
     "ccxt": "^3.0.30",