@riocrypto/common-server 1.0.696 → 1.0.698

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.
Files changed (4) hide show
  1. package/build/helpers/get-platform-and-partner-fees.js +6 -4
  2. package/build/models/order.d.ts +2 -0
  3. package/build/models/order.js +3 -0
  4. package/package.json +2 -2
package/build/helpers/get-platform-and-partner-fees.js CHANGED
@@ -76,16 +76,18 @@ const getPlatformAndPartnerFees = (mongoose, amountFiat, fiat, processor, countr
76
76
  createdAt: { $gte: startDate },
77
77
  });
78
78
  volume =
79
- buyOrders.reduce((sum, order) => {
79
+ sellOrders.reduce((sum, order) => {
80
80
  var _a, _b, _c, _d, _e;
81
81
  return sum +
82
- (order.amountFiat -
82
+ (order.amountFiat +
83
83
  ((((_a = order.fees) === null || _a === void 0 ? void 0 : _a.partnerFeeFiat) || 0) +
84
84
  (((_b = order.fees) === null || _b === void 0 ? void 0 : _b.platformFeeFiat) || 0) +
85
85
  (((_c = order.fees) === null || _c === void 0 ? void 0 : _c.platformFeeFiatTax) || 0) +
86
86
  (((_d = order.fees) === null || _d === void 0 ? void 0 : _d.processingFeeFiat) || 0) +
87
- (((_e = order.fees) === null || _e === void 0 ? void 0 : _e.transferFeeFiat) || 0)) || 0);
88
- }, 0) + sellOrders.reduce((sum, order) => sum + order.amountFiat, 0);
87
+ (((_e = order.fees) === null || _e === void 0 ? void 0 : _e.transferFeeFiat) || 0)) || 0) *
88
+ order.conversionRateToUSD;
89
+ }, 0) +
90
+ buyOrders.reduce((sum, order) => sum + order.amountFiat * conversionRateToUSD, 0);
89
91
  }
90
92
  else {
91
93
  volume = Number(amountUSD);
package/build/models/order.d.ts CHANGED
@@ -23,6 +23,7 @@ interface OrderAttrs {
23
23
  depositTxId?: string;
24
24
  withdrawalTxId?: string;
25
25
  brokerCustomerId?: string;
26
+ conversionRateToUSD?: number;
26
27
  }
27
28
  interface OrderDoc extends Document {
28
29
  userId: string;
@@ -47,6 +48,7 @@ interface OrderDoc extends Document {
47
48
  depositTxId?: string;
48
49
  withdrawalTxId?: string;
49
50
  brokerCustomerId?: string;
51
+ conversionRateToUSD?: number;
50
52
  }
51
53
  interface OrderModel extends Model<OrderDoc> {
52
54
  build(attrs: OrderAttrs): OrderDoc;
package/build/models/order.js CHANGED
@@ -96,6 +96,9 @@ const buildOrder = (mongoose) => {
96
96
  brokerCustomerId: {
97
97
  type: String,
98
98
  },
99
+ conversionRateToUSD: {
100
+ type: Number,
101
+ },
99
102
  }, {
100
103
  toJSON: {
101
104
  transform(doc, ret) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@riocrypto/common-server",
3
- "version": "1.0.696",
3
+ "version": "1.0.698",
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.626",
27
+ "@riocrypto/common": "^1.0.629",
28
28
  "@types/express": "^4.17.13",
29
29
  "axios": "^0.27.2",
30
30
  "ccxt": "^3.0.30",