@riocrypto/common-server 1.0.1443 → 1.0.1445

package/build/helpers/calculate-volume-and-revenue.d.ts

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

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

@@ -12,7 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.calculateVolumeAndRevenue = void 0;
 const common_1 = require("@riocrypto/common");
 const order_1 = require("../models/order");
-const calculateVolumeAndRevenue = (mongoose, startDate, user) => __awaiter(void 0, void 0, void 0, function* () {
+const calculateVolumeAndRevenue = (mongoose, startDate, endDate, user) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
     const Order = (0, order_1.buildOrder)(mongoose);
     let orders;
@@ -21,21 +21,21 @@ const calculateVolumeAndRevenue = (mongoose, startDate, user) => __awaiter(void
             orders = yield Order.find({
                 $or: [{ userId: user.id }, { brokerId: user.id }],
                 status: common_1.OrderStatus.Complete,
-                createdAt: { $gte: startDate },
+                createdAt: { $gte: startDate, $lte: endDate },
             });
         }
         else {
             orders = yield Order.find({
                 userId: user.id,
                 status: common_1.OrderStatus.Complete,
-                createdAt: { $gte: startDate },
+                createdAt: { $gte: startDate, $lte: endDate },
             });
         }
     }
     else {
         orders = yield Order.find({
             status: common_1.OrderStatus.Complete,
-            createdAt: { $gte: startDate },
+            createdAt: { $gte: startDate, $lte: endDate },
         });
     }
     let volume = 0;

package/build/models/user.d.ts

@@ -1,4 +1,4 @@
-import { Country, OnboardingStatus, Language, PlatformFeeRange, USState, UserAttribute, UserType, CountryOfOrigin, RiskTier } from "@riocrypto/common";
+import { Country, OnboardingStatus, Language, PlatformFeeRange, USState, UserAttribute, UserType, CountryOfOrigin, RiskTier, ImmigrationStatus } from "@riocrypto/common";
 import { Mongoose, Model, Document } from "mongoose";
 interface UserAttrs {
     createdAt: Date;
@@ -94,7 +94,7 @@ interface UserAttrs {
             personalId?: string;
             taxId?: string;
             hasAcceptedTerms?: boolean;
-            isResident?: boolean;
+            immigrationStatus?: ImmigrationStatus;
             individualIdentityVerification?: {
                 status?: "passed" | "failed" | "review";
             };
@@ -228,7 +228,7 @@ interface UserDoc extends Document {
             status?: OnboardingStatus;
             personalId?: string;
             taxId?: string;
-            isResident?: boolean;
+            immigrationStatus?: ImmigrationStatus;
             hasAcceptedTerms?: boolean;
             individualIdentityVerification?: {
                 status?: "passed" | "failed" | "review";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riocrypto/common-server",
-  "version": "1.0.1443",
+  "version": "1.0.1445",
   "description": "",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",
@@ -27,7 +27,7 @@
     "@everapi/currencyapi-js": "^1.0.6",
     "@google-cloud/storage": "^6.9.5",
     "@google-cloud/vision": "^4.0.2",
-    "@riocrypto/common": "^1.0.1276",
+    "@riocrypto/common": "^1.0.1283",
     "@types/express": "^4.17.13",
     "axios": "^0.27.2",
     "ccxt": "^3.0.30",