@riocrypto/common-server 1.0.720 → 1.0.723
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import { User } from "@riocrypto/common";
|
|
2
2
|
import { Mongoose } from "mongoose";
|
|
3
|
-
export declare const calculateAggregateVolume: (mongoose: Mongoose,
|
|
3
|
+
export declare const calculateAggregateVolume: (mongoose: Mongoose, days: number, user?: User) => Promise<number>;
|
|
@@ -12,15 +12,24 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
12
12
|
exports.calculateAggregateVolume = void 0;
|
|
13
13
|
const common_1 = require("@riocrypto/common");
|
|
14
14
|
const order_1 = require("../models/order");
|
|
15
|
-
const calculateAggregateVolume = (mongoose,
|
|
15
|
+
const calculateAggregateVolume = (mongoose, days, user) => __awaiter(void 0, void 0, void 0, function* () {
|
|
16
16
|
const startDate = new Date();
|
|
17
17
|
startDate.setDate(startDate.getDate() - days); // Subtract 14 days from current date
|
|
18
18
|
const Order = (0, order_1.buildOrder)(mongoose);
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
19
|
+
let orders;
|
|
20
|
+
if (user) {
|
|
21
|
+
orders = yield Order.find({
|
|
22
|
+
userId: user.id,
|
|
23
|
+
status: common_1.OrderStatus.Complete,
|
|
24
|
+
createdAt: { $gte: startDate },
|
|
25
|
+
});
|
|
26
|
+
}
|
|
27
|
+
else {
|
|
28
|
+
orders = yield Order.find({
|
|
29
|
+
status: common_1.OrderStatus.Complete,
|
|
30
|
+
createdAt: { $gte: startDate },
|
|
31
|
+
});
|
|
32
|
+
}
|
|
24
33
|
const volume = orders.reduce((sum, order) => {
|
|
25
34
|
var _a, _b, _c, _d, _e;
|
|
26
35
|
const fiatAmount = order.amountFiat || 0;
|
|
@@ -60,7 +60,7 @@ const getPlatformAndPartnerFees = (mongoose, amountFiat, fiat, processor, countr
|
|
|
60
60
|
else if (user === null || user === void 0 ? void 0 : user.platformFeeRanges) {
|
|
61
61
|
let volume;
|
|
62
62
|
if ((_a = user === null || user === void 0 ? void 0 : user.attributes) === null || _a === void 0 ? void 0 : _a.includes(common_1.UserAttribute.summedVolumeFees)) {
|
|
63
|
-
volume = yield (0, calculate_aggregate_volume_1.calculateAggregateVolume)(mongoose,
|
|
63
|
+
volume = yield (0, calculate_aggregate_volume_1.calculateAggregateVolume)(mongoose, 14, user);
|
|
64
64
|
}
|
|
65
65
|
else {
|
|
66
66
|
volume = Number(amountUSD);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@riocrypto/common-server",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.723",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "./build/index.js",
|
|
6
6
|
"types": "./build/index.d.ts",
|
|
@@ -24,7 +24,7 @@
|
|
|
24
24
|
"@aws-sdk/client-s3": "^3.297.0",
|
|
25
25
|
"@everapi/currencyapi-js": "^1.0.6",
|
|
26
26
|
"@google-cloud/storage": "^6.9.5",
|
|
27
|
-
"@riocrypto/common": "^1.0.
|
|
27
|
+
"@riocrypto/common": "^1.0.643",
|
|
28
28
|
"@types/express": "^4.17.13",
|
|
29
29
|
"axios": "^0.27.2",
|
|
30
30
|
"ccxt": "^3.0.30",
|