shufflecom-calculations 3.3.18 → 3.3.20

package/lib/utils/derive-vip-bonus.d.ts

@@ -1,6 +1,6 @@
 import { Dayjs } from 'dayjs';
 import { VipBonusIssuanceModel, VipBonusPartial } from './vip-bonus.type';
-export declare function getReloadAvailableDate(activationTime: Dayjs | null, cadence: number, index: number, createdAt: Dayjs): Date;
-export declare function getReloadExpiryDate(activationTime: Dayjs | null, cadence: number, expiryPerOccurrence: number, index: number, createdAt: Dayjs, firstOccurrenceActivationPeriod: number): Date;
+export declare function getReloadAvailableDate(activationTime: Dayjs | null, cadence: number, index: number, createdAt: Dayjs): Date | null;
+export declare function getReloadExpiryDate(activationTime: Dayjs | null, cadence: number, expiryPerOccurrence: number, index: number, createdAt: Dayjs, firstOccurrenceActivationPeriod: number): Date | null;
 export declare function deriveBonusIssuances(vipBonus: VipBonusPartial, now?: Dayjs): VipBonusIssuanceModel[];
 export declare function updateBonusIssuanceStatus(issuance: VipBonusIssuanceModel, vipBonusCancelledAt: Date | null, now: Dayjs): VipBonusIssuanceModel;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shufflecom-calculations",
-  "version": "3.3.18",
+  "version": "3.3.20",
   "description": "",
   "types": "lib/index.d.ts",
   "main": "lib/index.js",
@@ -14,5 +14,5 @@
   },
   "author": "",
   "license": "ISC",
-  "gitHead": "790409f0ad898b64030c8ebb943d0191f91e6626"
+  "gitHead": "680a93d4430f249efb6b00ac6a79421a9dcf71a1"
 }

package/src/sports/calculate-sports-payout-odd.spec.ts

@@ -1,7 +1,9 @@
 import BigNumber from 'bignumber.js';
-import { calculateSportsPayoutOdds, getSystemBetSubBetSelections } from './calculate-sports-payout-odds';
+import { calculateSportsPayoutOdds, calculateSportsPayoutOddsFromLegs, getSystemBetSubBetSelections } from './calculate-sports-payout-odds';
 import {
   OutcomeResult,
+  SportsBetLegInterface,
+  SportsBetLegType,
   SportsBetSelectionInterface,
   SportsBetSelectionStatus,
   SportsMarketProvider,
@@ -565,6 +567,81 @@ describe('calculateSportsPayoutOdds', () => {
     });
   });
 
+  // Multi-of-SGMs: a CUSTOM_BET with more than one CUSTOM leg. These go through
+  // calculateSportsPayoutOddsFromLegs with the real legs, so each leg's odds/void/loss is
+  // isolated — unlike the flat selection façade, which collapses every selection into one
+  // custom leg and would return 1 for the whole ticket on any void.
+  describe('multi-SGM (multiple custom legs)', () => {
+    it('multiplies each custom leg odds when all legs win', () => {
+      const legs: SportsBetLegInterface[] = [
+        {
+          type: SportsBetLegType.CUSTOM,
+          oddsDecimal: new BigNumber(3),
+          selections: [createSelection('a1', SportsBetSelectionStatus.WON, 150, 100), createSelection('a2', SportsBetSelectionStatus.WON, 200, 100)],
+        },
+        {
+          type: SportsBetLegType.CUSTOM,
+          oddsDecimal: new BigNumber(2),
+          selections: [createSelection('b1', SportsBetSelectionStatus.WON, 150, 100), createSelection('b2', SportsBetSelectionStatus.WON, 200, 100)],
+        },
+      ];
+      const marketSelections = [
+        createMarketSelection('a1', 150, 100),
+        createMarketSelection('a2', 200, 100),
+        createMarketSelection('b1', 150, 100),
+        createMarketSelection('b2', 200, 100),
+      ];
+
+      const result = calculateSportsPayoutOddsFromLegs(legs, marketSelections, { subBetLegs: null, isEstimation: false });
+
+      expect(result.toFixed(4)).toBe('6.0000');
+    });
+
+    it('voids only the affected custom leg and keeps the other legs odds', () => {
+      const legs: SportsBetLegInterface[] = [
+        {
+          type: SportsBetLegType.CUSTOM,
+          oddsDecimal: new BigNumber(3),
+          selections: [createSelection('a1', SportsBetSelectionStatus.WON, 150, 100), createSelection('a2', SportsBetSelectionStatus.WON, 250, 100)],
+        },
+        {
+          type: SportsBetLegType.CUSTOM,
+          oddsDecimal: new BigNumber(2),
+          selections: [
+            createSelection('b1', SportsBetSelectionStatus.WON, 150, 100),
+            createSelection('b2', SportsBetSelectionStatus.VOIDED, 200, 100),
+          ],
+        },
+      ];
+      const marketSelections = [createMarketSelection('a1', 150, 100), createMarketSelection('a2', 250, 100), createMarketSelection('b1', 150, 100), createMarketSelection('b2', 200, 100)];
+
+      // Leg B voids (→ odds 1); leg A survives at 3.0. The flat façade would return 1.0 for the whole ticket.
+      const result = calculateSportsPayoutOddsFromLegs(legs, marketSelections, { subBetLegs: null, isEstimation: false });
+
+      expect(result.toFixed(4)).toBe('3.0000');
+    });
+
+    it('returns 0 when a custom leg loses', () => {
+      const legs: SportsBetLegInterface[] = [
+        {
+          type: SportsBetLegType.CUSTOM,
+          oddsDecimal: new BigNumber(3),
+          selections: [createSelection('a1', SportsBetSelectionStatus.WON, 150, 100)],
+        },
+        {
+          type: SportsBetLegType.CUSTOM,
+          oddsDecimal: new BigNumber(2),
+          selections: [createSelection('b1', SportsBetSelectionStatus.WON, 150, 100), createSelection('b2', SportsBetSelectionStatus.LOST, 200, 100)],
+        },
+      ];
+      const marketSelections = [createMarketSelection('a1', 150, 100), createMarketSelection('b1', 150, 100), createMarketSelection('b2', 200, 100)];
+
+      const result = calculateSportsPayoutOddsFromLegs(legs, marketSelections, { subBetLegs: null, isEstimation: false });
+
+      expect(result.toFixed(4)).toBe('0.0000');
+    });
+  });
+
   describe('system bet', () => {
     it('can calculate payout odds correctly', () => {
       const selections = [

package/src/sports/calculate-sports-payout-odds.ts

@@ -18,8 +18,6 @@ export const BPS_DIVISOR = 10_000;
 export const SPORTS_BET_CASHOUT_MARGIN = 500; // in bps
 export const SPORTS_BET_CASHOUT_PENDING_SELECTION_PENALTY = 300; // in bps
 
-
-
 export const CUSTOM_BET_VOIDED_STATUSES = [
   SportsBetSelectionStatus.VOIDED,
   SportsBetSelectionStatus.PROVIDER_VOIDED,
@@ -76,14 +74,13 @@ export function getSystemBetSubBetSelections(
   selections: SportsBetSelectionInterface[],
   sportsSystemBetType: SportsSystemBetType,
 ): SportsBetSelectionInterface[][] {
-
   const subBetSelectionsAndIndex = getSystemBetSubBetSelectionsAndIndex(selections, sportsSystemBetType);
   return subBetSelectionsAndIndex.map(({ subBetSelection }) => subBetSelection);
 }
 
 // Selection-shaped façade over `calculateSportsPayoutOddsFromLegs`. Builds legs from the input
 // selections, maps subBetSelections to subBetLegs, and delegates. Callers that already have legs
-// should prefer `calculateSportsPayoutOddsFromLegs` directly to skip the bridging cost.
+// deprecated function and is only used for cashout atm, as only regular bet / system bets are allowed for cashouts
 export function calculateSportsPayoutOdds(
   selections: SportsBetSelectionInterface[],
   marketSelections: SportsMarketSelectionInterface[],
@@ -99,10 +96,7 @@ export function calculateSportsPayoutOdds(
   return calculateSportsPayoutOddsFromLegs(legs, marketSelections, { subBetLegs, isEstimation: opt.isEstimation });
 }
 
-function mapSubBetSelectionsToLegs(
-  subBetSelections: SportsBetSelectionInterface[][],
-  legs: SportsBetLegInterface[],
-): SportsBetLegInterface[][] {
+function mapSubBetSelectionsToLegs(subBetSelections: SportsBetSelectionInterface[][], legs: SportsBetLegInterface[]): SportsBetLegInterface[][] {
   const legByMarketSelectionId = new Map<string, SportsBetLegInterface>();
   for (const leg of legs) {
     for (const selection of leg.selections) {
@@ -196,14 +190,26 @@ function calculateSelectionCashoutOdds(
     .dividedBy(oddsFractionToDecimal(marketSelection.oddsNumerator, marketSelection.oddsDenominator));
 }
 
-// Structural mapping from (bet type, selections) → legs. The placement writer and the backfill
-// service both consume this so that the leg-shape rule for each bet type lives in one place.
+/**
+ * Structural mapping from (bet type, selections) → legs.
+ *
+ * @deprecated Reconstructing legs from a flat selection list only works for regular/system bets and
+ * single-custom-leg bets — it cannot represent a multi-custom-leg (multi-SGM) bet and throws for
+ * one. Confined to the cashout odds path; anywhere persisted legs are available, pass them to
+ * `calculateSportsPayoutOddsFromLegs` instead of calling this.
+ */
 export function deriveLegsFromSelections(
   sportsBetType: SportsBetType,
   selections: SportsBetSelectionInterface[],
   customBetTotalOddsDecimal: BigNumber,
 ): SportsBetLegInterface[] {
   if (sportsBetType === SportsBetType.CUSTOM_BET) {
+    const distinctLegIds = new Set(selections.map(selection => selection.sportsBetLegId).filter(Boolean));
+    if (distinctLegIds.size > 1) {
+      throw new Error(
+        'deriveLegsFromSelections cannot reconstruct a multi-custom-leg bet from a flat selection list; use persisted legs with calculateSportsPayoutOddsFromLegs',
+      );
+    }
     return [{ type: SportsBetLegType.CUSTOM, oddsDecimal: customBetTotalOddsDecimal, selections }];
   }
   return selections.map(selection => ({
@@ -214,6 +220,13 @@ export function deriveLegsFromSelections(
 }
 
 export function getSystemBetSubBetLegs<TLeg>(legs: TLeg[], sportsSystemBetType: SportsSystemBetType): TLeg[][] {
+  return getSystemBetSubBetLegsAndIndex(legs, sportsSystemBetType).map(({ subBetLegs }) => subBetLegs);
+}
+
+export function getSystemBetSubBetLegsAndIndex<TLeg>(
+  legs: TLeg[],
+  sportsSystemBetType: SportsSystemBetType,
+): { subBetLegs: TLeg[]; combinationIndex: string }[] {
   const systemBetSizes = SportsSystemBetTypeCombinations[sportsSystemBetType];
   if (!systemBetSizes) {
     throw new Error('Invalid system bet type');
@@ -222,7 +235,10 @@ export function getSystemBetSubBetLegs<TLeg>(legs: TLeg[], sportsSystemBetType:
     throw new Error('Invalid selection count');
   }
   const combinations = systemBetSizes.flatMap(size => generateSystemBetIndexCombinations(legs.length, size));
-  return combinations.map(combination => combination.map(index => legs[index]));
+  return combinations.map(combination => ({
+    subBetLegs: combination.map(index => legs[index]),
+    combinationIndex: combination.map(index => index + 1).join('/'),
+  }));
 }
 
 export function calculateSportsPayoutOddsFromLegs(
@@ -256,7 +272,10 @@ export function calculateSportsPayoutOddsFromLegs(
   }
 
   return limitTotalOddsDecimalPlaces(
-    legs.reduce((totalOddsDecimal, leg) => totalOddsDecimal.multipliedBy(getLegPayoutOddsDecimal(leg, marketSelectionMap, opt.isEstimation)), new BigNumber(1)),
+    legs.reduce(
+      (totalOddsDecimal, leg) => totalOddsDecimal.multipliedBy(getLegPayoutOddsDecimal(leg, marketSelectionMap, opt.isEstimation)),
+      new BigNumber(1),
+    ),
   );
 }
 

package/src/sports/sports-bet.types.ts

@@ -119,6 +119,7 @@ export interface SportsBetLegV3 {
   id: string;
   type: SportsBetLegType;
   oddsDecimal: string;
+  displayStatus: SportsBetSelectionStatus;
   updatedAt: string;
   createdAt: string;
   selections: SportsBetSelectionV3[];

package/src/sports/sports-content-fixture.types.ts

@@ -13,3 +13,7 @@ export class SportsContentFeaturedEvents extends SportsContentBase {
     pinned: boolean;
   })[];
 }
+
+export class SportsContentFeaturedOutright extends SportsContentBase {
+  fixture: SportsFixtureInfoWithCompetition;
+}

package/src/sports/sports.types.ts

@@ -144,6 +144,9 @@ export interface SportsBetSelectionInterface {
   status: SportsBetSelectionStatus;
   oddsNumerator: BigNumber;
   oddsDenominator: BigNumber;
+  // Present on persisted selections; used to detect multi-custom-leg bets that a flat selection
+  // list cannot faithfully represent (see deriveLegsFromSelections).
+  sportsBetLegId?: string | null;
 }
 
 export enum SportsBetLegType {