tods-competition-factory 1.8.14 → 1.8.15

package/dist/forge/query.d.ts

@@ -2215,10 +2215,8 @@ declare function allEventMatchUps(params: GetMatchUpsArgs): {
         code: string;
     };
     matchUps?: undefined;
-    eventMatchUps?: undefined;
 } | {
     matchUps: HydratedMatchUp[];
-    eventMatchUps: MatchUp[];
     error?: undefined;
 };
 declare function tournamentMatchUps(params: GetMatchUpsArgs): GroupsMatchUpsResult;

package/dist/forge/query.mjs

@@ -3536,6 +3536,21 @@ function addNationalityCode({
   persons.forEach(annotatePerson);
 }
 
+function addIndividualParticipants({ participantMap }) {
+  const participantObjects = Object.values(participantMap);
+  for (const participantObject of participantObjects) {
+    const participant = participantObject.participant;
+    if (participant.individualParticipantIds?.length) {
+      participant.individualParticipants = [];
+      for (const participantId of participant.individualParticipantIds) {
+        participant.individualParticipants.push(
+          participantMap[participantId].participant
+        );
+      }
+    }
+  }
+}
+
 function getTimeItem({
   returnPreviousValues,
   itemSubTypes,
@@ -3681,20 +3696,6 @@ function signedIn(participant) {
   });
   return timeItem?.itemValue === SIGNED_IN;
 }
-function addIndividualParticipants({ participantMap }) {
-  const participantObjects = Object.values(participantMap);
-  for (const participantObject of participantObjects) {
-    const participant = participantObject.participant;
-    if (participant.individualParticipantIds?.length) {
-      participant.individualParticipants = [];
-      for (const participantId of participant.individualParticipantIds) {
-        participant.individualParticipants.push(
-          participantMap[participantId].participant
-        );
-      }
-    }
-  }
-}
 function processIndividualParticipantIds({
   individualParticipantIds,
   participantCopy,
@@ -7821,7 +7822,6 @@ function allEventMatchUps(params) {
   if (!event)
     return { error: MISSING_EVENT };
   const { eventId, eventName, endDate, category, gender, matchUpFormat } = event;
-  const eventMatchUps2 = [];
   const additionalContext = {
     ...context,
     ...definedAttributes({
@@ -7865,7 +7865,7 @@ function allEventMatchUps(params) {
   }).scheduleTiming;
   const matchUps = drawDefinitions.flatMap(
     (drawDefinition) => {
-      const { matchUps: matchUps2, matchUpsMap } = getAllDrawMatchUps({
+      const { matchUps: matchUps2 } = getAllDrawMatchUps({
         tournamentParticipants: participants,
         tournamentAppliedPolicies,
         scheduleVisibilityFilters,
@@ -7885,12 +7885,10 @@ function allEventMatchUps(params) {
         inContext,
         event
       });
-      if (matchUpsMap?.drawMatchUps)
-        eventMatchUps2.push(...matchUpsMap.drawMatchUps);
       return matchUps2 ?? [];
     }
   );
-  return { matchUps, eventMatchUps: eventMatchUps2 };
+  return { matchUps };
 }
 function tournamentMatchUps(params) {
   if (!params?.tournamentRecord)
@@ -12767,7 +12765,6 @@ function getParticipants(params) {
     getMatchUpDependencies({ tournamentRecord });
   }
   let { participantMap } = getParticipantMap({
-    withIndividualParticipants,
     convertExtensions,
     tournamentRecord,
     withSignInStatus,
@@ -12806,45 +12803,48 @@ function getParticipants(params) {
   const matchUps = entriesResult.matchUps;
   participantMap = entriesResult.participantMap;
   const nextMatchUps = scheduleAnalysis ?? withPotentialMatchUps;
-  const processedParticipants = Object.values(participantMap).map(
-    ({
-      potentialMatchUps,
-      scheduleConflicts,
-      scheduleItems,
-      participant,
-      statistics,
-      opponents,
-      matchUps: matchUps2,
-      events,
-      draws
-    }) => {
-      const participantDraws = Object.values(draws);
-      const participantOpponents = Object.values(opponents);
-      if (withOpponents) {
-        participantDraws?.forEach((draw) => {
-          draw.opponents = participantOpponents.filter(
-            (opponent) => opponent.drawId === draw.drawId
-          );
-        });
-      }
-      return definedAttributes(
-        {
-          ...participant,
-          scheduleConflicts: scheduleAnalysis ? scheduleConflicts : void 0,
-          draws: withDraws || withRankingProfile ? participantDraws : void 0,
-          events: withEvents || withRankingProfile ? Object.values(events) : void 0,
-          matchUps: withMatchUps || withRankingProfile ? Object.values(matchUps2) : void 0,
-          opponents: withOpponents ? participantOpponents : void 0,
-          potentialMatchUps: nextMatchUps ? Object.values(potentialMatchUps) : void 0,
-          statistics: withStatistics ? Object.values(statistics) : void 0,
-          scheduleItems: withScheduleItems ? scheduleItems : void 0
-        },
-        false,
-        false,
-        true
-      );
+  const processParticipant = ({
+    potentialMatchUps,
+    scheduleConflicts,
+    scheduleItems,
+    participant,
+    statistics,
+    opponents,
+    matchUps: matchUps2,
+    events,
+    draws
+  }) => {
+    const participantDraws = Object.values(draws);
+    const participantOpponents = Object.values(opponents);
+    if (withOpponents) {
+      participantDraws?.forEach((draw) => {
+        draw.opponents = participantOpponents.filter(
+          (opponent) => opponent.drawId === draw.drawId
+        );
+      });
     }
-  );
+    return definedAttributes(
+      {
+        ...participant,
+        scheduleConflicts: scheduleAnalysis ? scheduleConflicts : void 0,
+        draws: withDraws || withRankingProfile ? participantDraws : void 0,
+        events: withEvents || withRankingProfile ? Object.values(events) : void 0,
+        matchUps: withMatchUps || withRankingProfile ? Object.values(matchUps2) : void 0,
+        opponents: withOpponents ? participantOpponents : void 0,
+        potentialMatchUps: nextMatchUps ? Object.values(potentialMatchUps) : void 0,
+        statistics: withStatistics ? Object.values(statistics) : void 0,
+        scheduleItems: withScheduleItems ? scheduleItems : void 0
+      },
+      false,
+      false,
+      true
+    );
+  };
+  const ppMap = /* @__PURE__ */ new Map();
+  for (const participantId of Object.keys(participantMap)) {
+    ppMap.set(participantId, processParticipant(participantMap[participantId]));
+  }
+  const processedParticipants = [...ppMap.values()];
   const participantAttributes = policyDefinitions?.[POLICY_TYPE_PARTICIPANT];
   const template = participantAttributes?.participant;
   const filteredParticipants = filterParticipants({
@@ -12852,6 +12852,17 @@ function getParticipants(params) {
     participantFilters,
     tournamentRecord
   });
+  if (withIndividualParticipants) {
+    for (const participant of filteredParticipants) {
+      for (const individualParticipantId of participant.individualParticipantIds ?? []) {
+        if (!participant.individualParticipants)
+          participant.individualParticipants = [];
+        participant.individualParticipants.push(
+          ppMap.get(individualParticipantId)
+        );
+      }
+    }
+  }
   const participants = template ? filteredParticipants.map(
     (source) => attributeFilter({ source, template })
   ) : filteredParticipants;