@riocrypto/common-server 1.0.1439 → 1.0.1442

package/build/helpers/{calculate-weekly-volume-and-revenue.d.ts → calculate-volume-and-revenue.d.ts}

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

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

@@ -9,13 +9,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.calculateWeeklyVolumeAndRevenue = void 0;
+exports.calculateVolumeAndRevenue = void 0;
 const common_1 = require("@riocrypto/common");
 const order_1 = require("../models/order");
-const calculateWeeklyVolumeAndRevenue = (mongoose, user) => __awaiter(void 0, void 0, void 0, function* () {
+const calculateVolumeAndRevenue = (mongoose, daysAgo, user) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
     const startDate = new Date();
-    startDate.setDate(startDate.getDate() - ((startDate.getDay() + 6) % 7));
+    startDate.setDate(startDate.getDate() - daysAgo);
     startDate.setHours(12, 0, 0, 0);
     const Order = (0, order_1.buildOrder)(mongoose);
     let orders;
@@ -66,4 +66,4 @@ const calculateWeeklyVolumeAndRevenue = (mongoose, user) => __awaiter(void 0, vo
     const revenueResult = revenue || 0;
     return { volume: volumeResult, revenue: revenueResult };
 });
-exports.calculateWeeklyVolumeAndRevenue = calculateWeeklyVolumeAndRevenue;
+exports.calculateVolumeAndRevenue = calculateVolumeAndRevenue;

package/build/helpers/get-exchange-rates.js

@@ -48,15 +48,16 @@ const getExchangeRates = (mongoose, fiat) => __awaiter(void 0, void 0, void 0, f
         const mexicoCityTime = new Date(now.toLocaleString("en-US", { timeZone: "America/Mexico_City" }));
         const hours = mexicoCityTime.getHours();
         const minutes = mexicoCityTime.getMinutes();
-        if ((hours === 15 && minutes >= 45) ||
-            (hours > 15 && hours < 24) ||
-            (hours === 0 && minutes === 0)) {
-            conversionRateToUSDWithMarkups =
-                conversionRateToUSD * (1 - afterHoursExchangeRateMarkup);
-            conversionRateFromUSDWithMarkups =
-                conversionRateFromUSD * (1 - afterHoursExchangeRateMarkup);
+        let isAfterHours = false;
+        if ((hours >= 8 && hours < 15) ||
+            (hours === 15 && minutes <= 45) ||
+            (hours >= 19 && hours <= 22)) {
+            isAfterHours = true;
+        }
+        if (mexicoCityTime.getDay() === 0 || mexicoCityTime.getDay() === 6) {
+            isAfterHours = true;
         }
-        else if (hours >= 0 && hours < 7) {
+        if (isAfterHours) {
             conversionRateToUSDWithMarkups =
                 conversionRateToUSD * (1 - afterHoursExchangeRateMarkup);
             conversionRateFromUSDWithMarkups =
@@ -71,9 +72,3 @@ const getExchangeRates = (mongoose, fiat) => __awaiter(void 0, void 0, void 0, f
     };
 });
 exports.getExchangeRates = getExchangeRates;
-// function getDateRange(): { startDate: Date; endDate: Date } {
-//   const endDate = new Date(); // Current time
-//   // Subtract 10 minutes from the end_date
-//   const startDate = new Date(endDate.getTime() - 10 * 60 * 1000);
-//   return { startDate, endDate };
-// }

package/build/index.d.ts

@@ -66,7 +66,7 @@ export * from "./helpers/get-user-helper";
 export * from "./helpers/get-processor-fees";
 export * from "./helpers/get-network-fees";
 export * from "./helpers/calculate-aggregate-volume-and-revenue";
-export * from "./helpers/calculate-weekly-volume-and-revenue";
+export * from "./helpers/calculate-volume-and-revenue";
 export * from "./helpers/get-exchange-rates";
 export * from "./helpers/get-user";
 export * from "./helpers/unescape";

package/build/index.js

@@ -82,7 +82,7 @@ __exportStar(require("./helpers/get-user-helper"), exports);
 __exportStar(require("./helpers/get-processor-fees"), exports);
 __exportStar(require("./helpers/get-network-fees"), exports);
 __exportStar(require("./helpers/calculate-aggregate-volume-and-revenue"), exports);
-__exportStar(require("./helpers/calculate-weekly-volume-and-revenue"), exports);
+__exportStar(require("./helpers/calculate-volume-and-revenue"), exports);
 __exportStar(require("./helpers/get-exchange-rates"), exports);
 __exportStar(require("./helpers/get-user"), exports);
 __exportStar(require("./helpers/unescape"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riocrypto/common-server",
-  "version": "1.0.1439",
+  "version": "1.0.1442",
   "description": "",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",