shufflecom-calculations 6.8.0 → 6.9.1

package/lib/utils/parse-create-vip-bonus.d.ts

@@ -9,12 +9,10 @@ export interface BaseCreateVipBonusInput {
     expiryDate?: Date;
 }
 export declare const VALID_RELOAD_VIP_BONUS_CADENCE: number[];
-export declare const AUTOMATED_RELOAD_SCHEDULE: {
-    cadence: number;
-    occurrence: number;
-    firstOccurrenceActivationPeriod: number;
-    expiryPerOccurrence: number;
-};
+export declare const AUTOMATED_RELOAD_CYCLE_SECONDS: number;
+export declare const DEFAULT_AUTOMATED_RELOAD_CADENCE: number;
+export declare const AUTOMATED_RELOAD_EXPIRY_PER_OCCURRENCE: number;
+export declare const AUTOMATED_RELOAD_FIRST_OCCURRENCE_ACTIVATION_PERIOD = 0;
 export declare const MIN_RELOAD_VIP_BONUS_OCCURRENCE = 3;
 export declare const MAX_RELOAD_VIP_BONUS_OCCURRENCE = 5000;
 type ParsedVipBonusData = {
@@ -24,6 +22,14 @@ type ParsedVipBonusData = {
     expiryPerOccurrence: number;
     endAt: Date;
 };
+export type AutomatedReloadSchedule = {
+    cadence: number;
+    occurrence: number;
+    firstOccurrenceActivationPeriod: number;
+    expiryPerOccurrence: number;
+};
+export declare function automatedReloadSchedule(cadence?: number): AutomatedReloadSchedule;
+export declare function reloadScheduleEndAt(date: dayjs.Dayjs, { cadence, occurrence, firstOccurrenceActivationPeriod, expiryPerOccurrence }: AutomatedReloadSchedule): Date;
 export declare function parseCreateVipBonusBaseInput({ date, bonus }: {
     date: dayjs.Dayjs;
     bonus: BaseCreateVipBonusInput;

package/lib/utils/parse-create-vip-bonus.js

@@ -1,27 +1,42 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseCreateVipBonusBaseInput = exports.MAX_RELOAD_VIP_BONUS_OCCURRENCE = exports.MIN_RELOAD_VIP_BONUS_OCCURRENCE = exports.AUTOMATED_RELOAD_SCHEDULE = exports.VALID_RELOAD_VIP_BONUS_CADENCE = void 0;
+exports.parseCreateVipBonusBaseInput = exports.reloadScheduleEndAt = exports.automatedReloadSchedule = exports.MAX_RELOAD_VIP_BONUS_OCCURRENCE = exports.MIN_RELOAD_VIP_BONUS_OCCURRENCE = exports.AUTOMATED_RELOAD_FIRST_OCCURRENCE_ACTIVATION_PERIOD = exports.AUTOMATED_RELOAD_EXPIRY_PER_OCCURRENCE = exports.DEFAULT_AUTOMATED_RELOAD_CADENCE = exports.AUTOMATED_RELOAD_CYCLE_SECONDS = exports.VALID_RELOAD_VIP_BONUS_CADENCE = void 0;
 const vip_bonus_type_1 = require("./vip-bonus.type");
 const minuteInSeconds = (min) => min * 60;
 const hourInSeconds = (hour) => minuteInSeconds(hour * 60);
 const dayInSeconds = (day) => hourInSeconds(day * 24);
 exports.VALID_RELOAD_VIP_BONUS_CADENCE = [minuteInSeconds(10), hourInSeconds(1), hourInSeconds(8), dayInSeconds(1)];
-exports.AUTOMATED_RELOAD_SCHEDULE = {
-    cadence: hourInSeconds(8),
-    occurrence: 21,
-    firstOccurrenceActivationPeriod: 0,
-    expiryPerOccurrence: dayInSeconds(1),
-};
+exports.AUTOMATED_RELOAD_CYCLE_SECONDS = hourInSeconds(168);
+exports.DEFAULT_AUTOMATED_RELOAD_CADENCE = dayInSeconds(1);
+exports.AUTOMATED_RELOAD_EXPIRY_PER_OCCURRENCE = dayInSeconds(1);
+exports.AUTOMATED_RELOAD_FIRST_OCCURRENCE_ACTIVATION_PERIOD = 0;
 exports.MIN_RELOAD_VIP_BONUS_OCCURRENCE = 3;
 exports.MAX_RELOAD_VIP_BONUS_OCCURRENCE = 5000;
+function automatedReloadSchedule(cadence = exports.DEFAULT_AUTOMATED_RELOAD_CADENCE) {
+    if (!exports.VALID_RELOAD_VIP_BONUS_CADENCE.includes(cadence)) {
+        throw new Error(`Vip Bonus (Automated Reload) cadence must be oneOf ${exports.VALID_RELOAD_VIP_BONUS_CADENCE.join(', ')} seconds`);
+    }
+    return {
+        cadence,
+        occurrence: exports.AUTOMATED_RELOAD_CYCLE_SECONDS / cadence,
+        firstOccurrenceActivationPeriod: exports.AUTOMATED_RELOAD_FIRST_OCCURRENCE_ACTIVATION_PERIOD,
+        expiryPerOccurrence: exports.AUTOMATED_RELOAD_EXPIRY_PER_OCCURRENCE,
+    };
+}
+exports.automatedReloadSchedule = automatedReloadSchedule;
+function reloadScheduleEndAt(date, { cadence, occurrence, firstOccurrenceActivationPeriod, expiryPerOccurrence }) {
+    return date
+        .add(firstOccurrenceActivationPeriod, 'hour')
+        .add(cadence * (occurrence - 1), 'second')
+        .add(expiryPerOccurrence, 'second')
+        .toDate();
+}
+exports.reloadScheduleEndAt = reloadScheduleEndAt;
 function parseCreateVipBonusBaseInput({ date, bonus }) {
+    var _a;
     if (bonus.type === vip_bonus_type_1.VipBonusType.AUTOMATED_RELOAD) {
-        const { cadence, occurrence, firstOccurrenceActivationPeriod, expiryPerOccurrence } = exports.AUTOMATED_RELOAD_SCHEDULE;
-        return Object.assign(Object.assign({}, exports.AUTOMATED_RELOAD_SCHEDULE), { endAt: date
-                .add(firstOccurrenceActivationPeriod, 'hour')
-                .add(cadence * (occurrence - 1), 'second')
-                .add(expiryPerOccurrence, 'second')
-                .toDate() });
+        const schedule = automatedReloadSchedule((_a = bonus.cadence) !== null && _a !== void 0 ? _a : exports.DEFAULT_AUTOMATED_RELOAD_CADENCE);
+        return Object.assign(Object.assign({}, schedule), { endAt: reloadScheduleEndAt(date, schedule) });
     }
     if ((0, vip_bonus_type_1.isReloadVipBonusType)(bonus.type)) {
         const { cadence, occurrence, firstOccurrenceActivationPeriod, expiryPerOccurrence } = bonus;
@@ -40,17 +55,12 @@ function parseCreateVipBonusBaseInput({ date, bonus }) {
         if (cadence > expiryPerOccurrence) {
             throw new Error('Vip Bonus (Reloaded) expiryPerOccurrence must be greater than or equal to cadence');
         }
-        const endAt = date
-            .add(firstOccurrenceActivationPeriod, 'hour')
-            .add(cadence * (occurrence - 1), 'second')
-            .add(expiryPerOccurrence, 'second')
-            .toDate();
         return {
             cadence,
             occurrence,
             firstOccurrenceActivationPeriod,
             expiryPerOccurrence,
-            endAt,
+            endAt: reloadScheduleEndAt(date, { cadence, occurrence, firstOccurrenceActivationPeriod, expiryPerOccurrence }),
         };
     }
     if (!(bonus === null || bonus === void 0 ? void 0 : bonus.expiryDate) || date.isAfter(bonus.expiryDate)) {

package/lib/utils/parse-create-vip-bonus.js.map

@@ -1 +1 @@
-{"version":3,"file":"parse-create-vip-bonus.js","sourceRoot":"","sources":["../../src/utils/parse-create-vip-bonus.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"parse-create-vip-bonus.js","sourceRoot":"","sources":["../../src/utils/parse-create-vip-bonus.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shufflecom-calculations",
-  "version": "6.8.0",
+  "version": "6.9.1",
   "description": "",
   "types": "lib/index.d.ts",
   "main": "lib/index.js",
@@ -19,5 +19,5 @@
   },
   "author": "",
   "license": "ISC",
-  "gitHead": "aa6d35e33a97dff5bb25838a0999b5afd4f97fa2"
+  "gitHead": "a5ff669f1b9885fe4639c13ec581553dd1ddc01b"
 }

package/src/games/rollercoaster/rollercoaster-rules.ts

@@ -1,4 +1,5 @@
 import BigNumber from 'bignumber.js';
+import { calculatePayoutBN } from '../../utils/calculate-payout';
 import {
   ROLLERCOASTER_INTERNAL_PRICE_DECIMAL_PLACES,
   ROLLERCOASTER_MAX_STALE_CLIENT_TICKS,
@@ -185,7 +186,7 @@ export class RollercoasterRules {
   static grossPayoutForReason(bet: RollercoasterOpenBetState, reason: RollercoasterSettlementReason, price: BigNumber): BigNumber {
     switch (reason.kind) {
       case RollercoasterBetTerminalReason.TAKE_PROFIT:
-        return bet.amount.multipliedBy(reason.takeProfitMultiplier);
+        return calculatePayoutBN(bet.amount, reason.takeProfitMultiplier);
       case RollercoasterBetTerminalReason.LIQUIDATION:
         return BigNumber(0);
       case RollercoasterBetTerminalReason.MAX_PAYOUT:

package/src/utils/parse-create-vip-bonus.spec.ts

@@ -1,10 +1,11 @@
 import dayjs from 'dayjs';
 import {
-  AUTOMATED_RELOAD_SCHEDULE,
+  AUTOMATED_RELOAD_CYCLE_SECONDS,
   BaseCreateVipBonusInput,
   MAX_RELOAD_VIP_BONUS_OCCURRENCE,
   MIN_RELOAD_VIP_BONUS_OCCURRENCE,
   VALID_RELOAD_VIP_BONUS_CADENCE,
+  automatedReloadSchedule,
   parseCreateVipBonusBaseInput,
 } from './parse-create-vip-bonus';
 import { VipBonusType } from './vip-bonus.type';
@@ -138,36 +139,55 @@ describe('parseCreateVipBonusBaseInput', () => {
   });
 
   describe('AUTOMATED_RELOAD', () => {
-    it('applies the fixed schedule and ignores whatever the caller passed', () => {
+    it('honours the cadence and derives the rest, ignoring whatever else the caller passed', () => {
       const result = parseCreateVipBonusBaseInput({
         date,
         bonus: {
           type: VipBonusType.AUTOMATED_RELOAD,
-          // deliberately wrong: the admin does not get to choose these
           cadence: VALID_RELOAD_VIP_BONUS_CADENCE[0],
+          // deliberately wrong: only the cadence is the admin's to choose
           occurrence: MIN_RELOAD_VIP_BONUS_OCCURRENCE,
           firstOccurrenceActivationPeriod: 99,
           expiryPerOccurrence: 1,
         },
       });
 
+      const schedule = automatedReloadSchedule(VALID_RELOAD_VIP_BONUS_CADENCE[0]);
+
       expect(result).toEqual({
-        ...AUTOMATED_RELOAD_SCHEDULE,
+        ...schedule,
         endAt: date
-          .add(AUTOMATED_RELOAD_SCHEDULE.firstOccurrenceActivationPeriod, 'hour')
-          .add(AUTOMATED_RELOAD_SCHEDULE.cadence * (AUTOMATED_RELOAD_SCHEDULE.occurrence - 1), 'second')
-          .add(AUTOMATED_RELOAD_SCHEDULE.expiryPerOccurrence, 'second')
+          .add(schedule.firstOccurrenceActivationPeriod, 'hour')
+          .add(schedule.cadence * (schedule.occurrence - 1), 'second')
+          .add(schedule.expiryPerOccurrence, 'second')
           .toDate(),
       });
     });
 
-    it('needs no schedule fields at all', () => {
-      expect(() => parseCreateVipBonusBaseInput({ date, bonus: { type: VipBonusType.AUTOMATED_RELOAD } })).not.toThrow();
+    it('needs no schedule fields at all, falling back to the default cadence', () => {
+      const result = parseCreateVipBonusBaseInput({ date, bonus: { type: VipBonusType.AUTOMATED_RELOAD } });
+
+      expect(result).toMatchObject(automatedReloadSchedule());
     });
 
     it('keeps a cadence the reloaded validator would also accept', () => {
-      expect(VALID_RELOAD_VIP_BONUS_CADENCE).toContain(AUTOMATED_RELOAD_SCHEDULE.cadence);
-      expect(AUTOMATED_RELOAD_SCHEDULE.expiryPerOccurrence).toBeGreaterThanOrEqual(AUTOMATED_RELOAD_SCHEDULE.cadence);
+      const schedule = automatedReloadSchedule();
+
+      expect(VALID_RELOAD_VIP_BONUS_CADENCE).toContain(schedule.cadence);
+      expect(schedule.expiryPerOccurrence).toBeGreaterThanOrEqual(schedule.cadence);
+    });
+
+    it('derives an occurrence count that spans the fixed cycle for every valid cadence', () => {
+      for (const cadence of VALID_RELOAD_VIP_BONUS_CADENCE) {
+        const schedule = automatedReloadSchedule(cadence);
+
+        expect(Number.isInteger(schedule.occurrence)).toBe(true);
+        expect(schedule.cadence * schedule.occurrence).toBe(AUTOMATED_RELOAD_CYCLE_SECONDS);
+      }
+    });
+
+    it('rejects a cadence outside the reload whitelist', () => {
+      expect(() => automatedReloadSchedule(12345)).toThrow();
     });
   });
 

package/src/utils/parse-create-vip-bonus.ts

@@ -16,12 +16,11 @@ const dayInSeconds = (day: number) => hourInSeconds(day * 24);
 
 export const VALID_RELOAD_VIP_BONUS_CADENCE = [minuteInSeconds(10), hourInSeconds(1), hourInSeconds(8), dayInSeconds(1)];
 
-export const AUTOMATED_RELOAD_SCHEDULE = {
-  cadence: hourInSeconds(8),
-  occurrence: 21,
-  firstOccurrenceActivationPeriod: 0,
-  expiryPerOccurrence: dayInSeconds(1),
-};
+export const AUTOMATED_RELOAD_CYCLE_SECONDS = hourInSeconds(168);
+export const DEFAULT_AUTOMATED_RELOAD_CADENCE = dayInSeconds(1);
+export const AUTOMATED_RELOAD_EXPIRY_PER_OCCURRENCE = dayInSeconds(1);
+export const AUTOMATED_RELOAD_FIRST_OCCURRENCE_ACTIVATION_PERIOD = 0;
+
 export const MIN_RELOAD_VIP_BONUS_OCCURRENCE = 3;
 // max occurance 5000 if set to high might cause slow performance in the frontend when handling each reload bonus occurance state
 export const MAX_RELOAD_VIP_BONUS_OCCURRENCE = 5000;
@@ -34,19 +33,42 @@ type ParsedVipBonusData = {
   endAt: Date;
 };
 
+export type AutomatedReloadSchedule = {
+  cadence: number;
+  occurrence: number;
+  firstOccurrenceActivationPeriod: number;
+  expiryPerOccurrence: number;
+};
+
+export function automatedReloadSchedule(cadence: number = DEFAULT_AUTOMATED_RELOAD_CADENCE): AutomatedReloadSchedule {
+  if (!VALID_RELOAD_VIP_BONUS_CADENCE.includes(cadence)) {
+    throw new Error(`Vip Bonus (Automated Reload) cadence must be oneOf ${VALID_RELOAD_VIP_BONUS_CADENCE.join(', ')} seconds`);
+  }
+
+  return {
+    cadence,
+    occurrence: AUTOMATED_RELOAD_CYCLE_SECONDS / cadence,
+    firstOccurrenceActivationPeriod: AUTOMATED_RELOAD_FIRST_OCCURRENCE_ACTIVATION_PERIOD,
+    expiryPerOccurrence: AUTOMATED_RELOAD_EXPIRY_PER_OCCURRENCE,
+  };
+}
+
+export function reloadScheduleEndAt(
+  date: dayjs.Dayjs,
+  { cadence, occurrence, firstOccurrenceActivationPeriod, expiryPerOccurrence }: AutomatedReloadSchedule,
+): Date {
+  return date
+    .add(firstOccurrenceActivationPeriod, 'hour')
+    .add(cadence * (occurrence - 1), 'second')
+    .add(expiryPerOccurrence, 'second')
+    .toDate();
+}
+
 export function parseCreateVipBonusBaseInput({ date, bonus }: { date: dayjs.Dayjs; bonus: BaseCreateVipBonusInput }): ParsedVipBonusData {
-  // Whatever the caller passed for the schedule is ignored — these are not the admin's to choose.
   if (bonus.type === VipBonusType.AUTOMATED_RELOAD) {
-    const { cadence, occurrence, firstOccurrenceActivationPeriod, expiryPerOccurrence } = AUTOMATED_RELOAD_SCHEDULE;
+    const schedule = automatedReloadSchedule(bonus.cadence ?? DEFAULT_AUTOMATED_RELOAD_CADENCE);
 
-    return {
-      ...AUTOMATED_RELOAD_SCHEDULE,
-      endAt: date
-        .add(firstOccurrenceActivationPeriod, 'hour')
-        .add(cadence * (occurrence - 1), 'second')
-        .add(expiryPerOccurrence, 'second')
-        .toDate(),
-    };
+    return { ...schedule, endAt: reloadScheduleEndAt(date, schedule) };
   }
 
   if (isReloadVipBonusType(bonus.type)) {
@@ -72,18 +94,12 @@ export function parseCreateVipBonusBaseInput({ date, bonus }: { date: dayjs.Dayj
       throw new Error('Vip Bonus (Reloaded) expiryPerOccurrence must be greater than or equal to cadence');
     }
 
-    const endAt = date
-      .add(firstOccurrenceActivationPeriod, 'hour')
-      .add(cadence * (occurrence - 1), 'second')
-      .add(expiryPerOccurrence, 'second')
-      .toDate();
-
     return {
       cadence,
       occurrence,
       firstOccurrenceActivationPeriod,
       expiryPerOccurrence,
-      endAt,
+      endAt: reloadScheduleEndAt(date, { cadence, occurrence, firstOccurrenceActivationPeriod, expiryPerOccurrence }),
     };
   }