@riocrypto/common-server 1.0.1018 → 1.0.1021

package/build/helpers/calculate-weekly-volume-and-revenue.js

@@ -46,16 +46,13 @@ const calculateWeeklyVolumeAndRevenue = (mongoose, user) => __awaiter(void 0, vo
     orders.forEach((order) => {
         var _a;
         const fiatAmount = order.amountFiat || 0;
-        const conversionRate = order.conversionRateUSD;
-        const platformFee = ((_a = order.fees) === null || _a === void 0 ? void 0 : _a.platformFeeFiat) || 0;
-        const price = order.price || 0;
+        const conversionRate = order.actualConversionRateUSD || 0;
+        const platformFee = ((_a = order.actualFees) === null || _a === void 0 ? void 0 : _a.platformFeeFiat) || 0;
         const amountCrypto = order.amountCrypto || 0;
         let orderVolume = 0;
         let orderRevenue = 0;
         if (order.side === common_1.Side.Sell) {
-            orderVolume = conversionRate
-                ? amountCrypto * price * (1 / conversionRate)
-                : 0;
+            orderVolume = conversionRate ? amountCrypto * (1 / conversionRate) : 0;
             orderRevenue = conversionRate ? platformFee * (1 / conversionRate) : 0;
         }
         else {

package/build/index.d.ts

@@ -35,6 +35,7 @@ export * from "./models/bridge-transfer";
 export * from "./models/bridge-external-account";
 export * from "./models/bridge-liquidation-address";
 export * from "./models/admin-task";
+export * from "./models/master-order-record";
 export * from "./clients/bitstamp-client";
 export * from "./clients/ccxt-client";
 export * from "./clients/kushki-client";

package/build/index.js

@@ -51,6 +51,7 @@ __exportStar(require("./models/bridge-transfer"), exports);
 __exportStar(require("./models/bridge-external-account"), exports);
 __exportStar(require("./models/bridge-liquidation-address"), exports);
 __exportStar(require("./models/admin-task"), exports);
+__exportStar(require("./models/master-order-record"), exports);
 __exportStar(require("./clients/bitstamp-client"), exports);
 __exportStar(require("./clients/ccxt-client"), exports);
 __exportStar(require("./clients/kushki-client"), exports);

package/build/models/master-order-record.d.ts

@@ -0,0 +1,12 @@
+import mongoose from "mongoose";
+interface MasterOrderRecordAttrs {
+    orderId: string;
+}
+interface MasterOrderRecordDoc extends mongoose.Document {
+    orderId: string;
+}
+interface MasterOrderRecordModel extends mongoose.Model<MasterOrderRecordDoc> {
+    build(attrs: MasterOrderRecordAttrs): MasterOrderRecordDoc;
+}
+declare const buildMasterOrderRecord: (mongoose: typeof mongoose) => MasterOrderRecordModel;
+export { buildMasterOrderRecord, MasterOrderRecordDoc };

package/build/models/master-order-record.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildMasterOrderRecord = void 0;
+const buildMasterOrderRecord = (mongoose) => {
+    // if model is already defined, return it
+    if (mongoose.models.MasterOrderRecord) {
+        return mongoose.model("MasterOrderRecord");
+    }
+    const MasterOrderRecordSchema = new mongoose.Schema({
+        orderId: {
+            type: String,
+            required: true,
+        },
+    }, {
+        toJSON: {
+            transform(doc, ret) {
+                ret.id = ret._id;
+                delete ret._id;
+                delete ret.__v;
+            },
+        },
+    });
+    MasterOrderRecordSchema.statics.build = (attrs) => {
+        return new MasterOrderRecord(attrs);
+    };
+    const MasterOrderRecord = mongoose.model("MasterOrderRecord", MasterOrderRecordSchema);
+    return MasterOrderRecord;
+};
+exports.buildMasterOrderRecord = buildMasterOrderRecord;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riocrypto/common-server",
-  "version": "1.0.1018",
+  "version": "1.0.1021",
   "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.879",
+    "@riocrypto/common": "^1.0.881",
     "@types/express": "^4.17.13",
     "axios": "^0.27.2",
     "ccxt": "^3.0.30",