tods-competition-factory 2.2.8 → 2.2.10

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

@@ -6891,6 +6891,8 @@ type GetParticipantsArgs = {
     scheduleAnalysis?: ScheduleAnalysis;
     policyDefinitions?: PolicyDefinitions;
     withPotentialMatchUps?: boolean;
+    contextFilters?: MatchUpFilters;
+    matchUpFilters?: MatchUpFilters;
     returnParticipantMap?: boolean;
     contextProfile?: ContextProfile;
     tournamentRecord: Tournament;

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 function factoryVersion() {
-    return '2.2.8';
+    return '2.2.10';
 }
 
 const SINGLES_MATCHUP = 'SINGLES';
@@ -11541,7 +11541,7 @@ function getDrawMatchUps(params) {
 
 function allEventMatchUps(params) {
     let { participants = [], contextContent, participantMap } = params;
-    const { scheduleVisibilityFilters, tournamentAppliedPolicies, participantsProfile, afterRecoveryTimes, policyDefinitions, useParticipantMap, tournamentRecord, usePublishState, contextFilters, contextProfile, matchUpFilters, nextMatchUps, inContext, context, event, } = params;
+    const { scheduleVisibilityFilters, tournamentAppliedPolicies, participantsProfile, afterRecoveryTimes, policyDefinitions, useParticipantMap, tournamentRecord, usePublishState, contextFilters, matchUpFilters, contextProfile, nextMatchUps, inContext, context, event, } = params;
     if (!event)
         return { error: MISSING_EVENT };
     const { eventId, eventName, endDate, eventType, category, gender, matchUpFormat } = event ?? {};
@@ -13791,7 +13791,7 @@ function processSides(params) {
 }
 
 function getParticipantEntries(params) {
-    const { participantFilters, convertExtensions, policyDefinitions, tournamentRecord, usePublishState, participantMap, contextProfile, withPotentialMatchUps, withRankingProfile, withScheduleItems, scheduleAnalysis, withTeamMatchUps, withStatistics, withOpponents, withMatchUps, withSeeding, withEvents, withDraws, } = params;
+    const { participantFilters, convertExtensions, policyDefinitions, tournamentRecord, usePublishState, contextFilters, matchUpFilters, participantMap, contextProfile, withPotentialMatchUps, withRankingProfile, withScheduleItems, scheduleAnalysis, withTeamMatchUps, withStatistics, withOpponents, withMatchUps, withSeeding, withEvents, withDraws, } = params;
     const targetParticipantIds = participantFilters?.participantIds;
     const getRelevantParticipantIds = (participantId) => {
         const relevantParticipantIds = [participantId];
@@ -14033,8 +14033,10 @@ function getParticipantEntries(params) {
                 policyDefinitions,
                 tournamentRecord,
                 inContext: true,
-                contextProfile,
                 participantMap,
+                contextFilters,
+                matchUpFilters,
+                contextProfile,
                 nextMatchUps,
                 event,
             })?.matchUps ?? [];
@@ -14348,7 +14350,7 @@ function getEventEntries({ eventEntryStatuses, tournamentEvents }) {
 }
 
 function getParticipants(params) {
-    const { withIndividualParticipants, participantFilters = {}, withPotentialMatchUps, withRankingProfile, convertExtensions, policyDefinitions, withScheduleItems, tournamentRecord, scheduleAnalysis, withSignInStatus, withTeamMatchUps, withScaleValues, usePublishState, contextProfile, withStatistics, withOpponents, withMatchUps, internalUse, withSeeding, withEvents, withDraws, withISO2, withIOC, } = params;
+    const { withIndividualParticipants, participantFilters = {}, withPotentialMatchUps, withRankingProfile, convertExtensions, policyDefinitions, withScheduleItems, tournamentRecord, scheduleAnalysis, withSignInStatus, withTeamMatchUps, withScaleValues, usePublishState, withStatistics, contextFilters, matchUpFilters, contextProfile, withOpponents, withMatchUps, internalUse, withSeeding, withEvents, withDraws, withISO2, withIOC, } = params;
     if (!tournamentRecord)
         return { error: MISSING_TOURNAMENT_RECORD };
     if (withMatchUps || withRankingProfile) {
@@ -14379,6 +14381,8 @@ function getParticipants(params) {
         withTeamMatchUps,
         usePublishState,
         withStatistics,
+        contextFilters,
+        matchUpFilters,
         participantMap,
         withOpponents,
         contextProfile,
@@ -55837,7 +55841,7 @@ function removeCollectionGroup({ updateInProgressMatchUps = true, collectionGrou
 
 function getOrderedTieFormat({ tieFormat, orderMap }) {
     const orderedTieFormat = copyTieFormat(tieFormat);
-    orderedTieFormat.collectionDefinitions.forEach((collectionDefinition) => {
+    orderedTieFormat.collectionDefinitions?.forEach((collectionDefinition) => {
         const collectionOrder = orderMap[collectionDefinition.collectionId];
         if (collectionOrder)
             collectionDefinition.collectionOrder = collectionOrder;
@@ -55851,6 +55855,10 @@ function orderCollectionDefinitions({ tournamentRecord, drawDefinition, structur
             result: { error: INVALID_VALUES },
             context: { orderMap },
         });
+    const result = structureId ? findStructure({ drawDefinition, structureId }) : undefined;
+    if (result?.error)
+        return result;
+    const structure = result?.structure;
     if (eventId && event?.tieFormat) {
         updateEventTieFormat({ tournamentRecord, event, orderMap });
     }
@@ -55865,24 +55873,19 @@ function orderCollectionDefinitions({ tournamentRecord, drawDefinition, structur
         matchUp = result.matchUp;
         if (!matchUp)
             return { error: MISSING_MATCHUP };
-        if (matchUp?.tieFormat) {
-            matchUp.tieFormat = getOrderedTieFormat({
-                tieFormat: matchUp.tieFormat,
-                orderMap,
-            });
-            modifyMatchUpNotice({
-                tournamentId: tournamentRecord?.tournamentId,
-                eventId: event?.eventId,
-                drawDefinition,
-                matchUp,
-            });
-        }
+        const tieFormat = getTieFormat$1({ tournamentRecord, matchUpId, structure, drawDefinition, event })?.tieFormat;
+        matchUp.tieFormat = getOrderedTieFormat({
+            tieFormat,
+            orderMap,
+        });
+        modifyMatchUpNotice({
+            tournamentId: tournamentRecord?.tournamentId,
+            eventId: event?.eventId,
+            drawDefinition,
+            matchUp,
+        });
     }
     else if (structureId) {
-        const result = findStructure({ drawDefinition, structureId });
-        if (result.error)
-            return result;
-        const structure = result.structure;
         if (structure?.tieFormat) {
             structure.tieFormat = getOrderedTieFormat({
                 tieFormat: structure.tieFormat,