tods-competition-factory 2.0.49 → 2.0.50

package/dist/tods-competition-factory.d.ts

@@ -2504,6 +2504,8 @@ type DrawMaticArgs = {
     eventType?: EventTypeUnion;
     salted?: number | boolean;
     participantIds?: string[];
+    dynamicRatings?: boolean;
+    refreshDynamic?: boolean;
     encounterValue?: number;
     sameTeamValue?: number;
     scaleAccessor?: string;
@@ -3616,6 +3618,7 @@ type GenerateDrawMaticRoundArgs = {
     salted?: number | boolean;
     participantIds?: string[];
     dynamicRatings?: boolean;
+    refreshDynamic?: boolean;
     encounterValue?: number;
     sameTeamValue?: number;
     maxIterations?: number;
@@ -3643,7 +3646,7 @@ type DrawMaticRoundResult = {
     maxDelta?: number;
     maxDiff?: number;
 };
-declare function generateDrawMaticRound({ encounterValue, sameTeamValue, maxIterations, updateParticipantRatings, generateMatchUps, ignoreLastRoundNumber, iterationMatchUps, tournamentRecord, dynamicRatings, participantIds, drawDefinition, adHocRatings, salted, roundNumber, structureId, matchUpIds, eventType, structure, scaleName, idPrefix, isMock, event, }: GenerateDrawMaticRoundArgs): ResultType & DrawMaticRoundResult;
+declare function generateDrawMaticRound({ encounterValue, sameTeamValue, maxIterations, updateParticipantRatings, generateMatchUps, ignoreLastRoundNumber, iterationMatchUps, tournamentRecord, dynamicRatings, refreshDynamic, participantIds, drawDefinition, adHocRatings, salted, roundNumber, structureId, matchUpIds, eventType, structure, scaleName, idPrefix, isMock, event, }: GenerateDrawMaticRoundArgs): ResultType & DrawMaticRoundResult;
 
 type GenerateVoluntaryConsolationArgs = {
     playoffAttributes?: PlayoffAttributes;

package/dist/tods-competition-factory.development.cjs.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 function factoryVersion() {
-    return '2.0.49';
+    return '2.0.50';
 }
 
 function isFunction(obj) {
@@ -26505,6 +26505,7 @@ function addDynamicRatings({ tournamentRecord, modifiedScaleValues, removePriorV
         if (result.error)
             return result;
     }
+    return { ...SUCCESS };
 }
 
 function getParticipantScaleItem(params) {
@@ -26616,19 +26617,25 @@ const aggregateSets = (sets) => {
 };
 
 function generateDynamicRatings(params) {
-    const { updateParticipantRatings, removePriorValues = true, tournamentRecord, ratingType = ELO, considerGames, matchUpIds, asDynamic, } = params;
-    if (!tournamentRecord)
-        return { error: MISSING_TOURNAMENT_RECORD };
-    if (!Array.isArray(matchUpIds))
-        return { error: MISSING_MATCHUPS };
-    if (typeof ratingType !== 'string')
-        return { error: INVALID_VALUES, ratingType };
-    if (!ratingsParameters[ratingType])
-        return { error: INVALID_VALUES };
+    const paramsCheck = checkRequiredParameters(params, [
+        { [TOURNAMENT_RECORD]: true },
+        { matchUpIds: true, [OF_TYPE]: ARRAY, [ERROR]: MISSING_MATCHUP_IDS },
+        { ratingType: false, [VALIDATE]: (value) => ratingsParameters[value] },
+    ]);
+    if (paramsCheck.error)
+        return paramsCheck;
+    const { updateParticipantRatings, removePriorValues = true, tournamentRecord, ratingType = ELO, refreshDynamic, considerGames, drawDefinition, matchUpIds, asDynamic, } = params;
     const ratingParameter = ratingsParameters[ratingType];
     const { accessor } = ratingParameter;
     const modifiedScaleValues = {};
     const matchUps = params.matchUps ??
+        (refreshDynamic &&
+            allDrawMatchUps({
+                drawDefinition,
+                tournamentRecord,
+                inContext: true,
+                matchUpFilters: { matchUpStatuses: completedMatchUpStatuses },
+            })) ??
         allTournamentMatchUps({
             matchUpFilters: { matchUpIds, matchUpStatuses: completedMatchUpStatuses },
             tournamentRecord,
@@ -26662,16 +26669,20 @@ function generateDynamicRatings(params) {
         const scaleItemMap = Object.assign({}, ...Object.values(sideParticipantIds)
             .flat()
             .map((participantId) => {
-            const { scaleItem: dynamicScaleItem } = getParticipantScaleItem({
-                scaleAttributes: dynamicScaleAttributes,
-                tournamentRecord,
-                participantId,
-            });
-            const { scaleItem } = getParticipantScaleItem({
+            const existingModifiedScaleValue = modifiedScaleValues[participantId];
+            const useDynamic = !refreshDynamic || !existingModifiedScaleValue;
+            const dynamicScaleItem = useDynamic
+                ? getParticipantScaleItem({
+                    scaleAttributes: dynamicScaleAttributes,
+                    tournamentRecord,
+                    participantId,
+                }).scaleItem
+                : undefined;
+            const scaleItem = getParticipantScaleItem({
                 tournamentRecord,
                 scaleAttributes,
                 participantId,
-            });
+            }).scaleItem;
             const scaleValue = accessor ? { [accessor]: undefined } : undefined;
             return (participantId && {
                 [participantId]: dynamicScaleItem ??
@@ -27032,7 +27043,7 @@ function getPairings({ tournamentParticipants, adHocRatings = {}, possiblePairin
 const ENCOUNTER_VALUE = 100;
 const SAME_TEAM_VALUE = 100;
 const MAX_ITERATIONS = 4000;
-function generateDrawMaticRound({ encounterValue = ENCOUNTER_VALUE, sameTeamValue = SAME_TEAM_VALUE, maxIterations = MAX_ITERATIONS, updateParticipantRatings, generateMatchUps = true, ignoreLastRoundNumber, iterationMatchUps, tournamentRecord, dynamicRatings, participantIds, drawDefinition, adHocRatings, salted = 0.5, roundNumber, structureId, matchUpIds, eventType, structure, scaleName, idPrefix, isMock, event, }) {
+function generateDrawMaticRound({ encounterValue = ENCOUNTER_VALUE, sameTeamValue = SAME_TEAM_VALUE, maxIterations = MAX_ITERATIONS, updateParticipantRatings, generateMatchUps = true, ignoreLastRoundNumber, iterationMatchUps, tournamentRecord, dynamicRatings, refreshDynamic, participantIds, drawDefinition, adHocRatings, salted = 0.5, roundNumber, structureId, matchUpIds, eventType, structure, scaleName, idPrefix, isMock, event, }) {
     if (!drawDefinition)
         return { error: MISSING_DRAW_DEFINITION };
     if (!structure && !structureId)
@@ -27060,6 +27071,8 @@ function generateDrawMaticRound({ encounterValue = ENCOUNTER_VALUE, sameTeamValu
                 updateParticipantRatings,
                 tournamentRecord,
                 asDynamic: true,
+                refreshDynamic,
+                drawDefinition,
                 matchUpIds,
             });
             if (result.error)
@@ -32242,7 +32255,7 @@ function drawMatic(params) {
     const structureResult = getAdHocStructure(params);
     if (structureResult.error)
         return structureResult;
-    const adHocRatings = getAdHocRatings(params);
+    let adHocRatings = getAdHocRatings(params);
     const isMock = params.tournamentRecord?.isMock ?? params.isMock;
     const eventType = params.eventType ?? params.event?.eventType;
     const matchUps = [];
@@ -32263,6 +32276,8 @@ function drawMatic(params) {
         if (result.error)
             return result;
         const { matchUps: roundMatchUps, ...roundResult } = result;
+        if (roundResult.modifiedScaleValues)
+            adHocRatings = roundResult.modifiedScaleValues;
         roundResults.push({ ...roundResult, iteration, matchUpsCount: roundMatchUps?.length });
         roundNumber = (roundResult?.roundNumber ?? 1) + 1;
         if (roundMatchUps?.length) {