tods-competition-factory 1.8.36 → 1.8.38

package/dist/forge/query.d.ts

@@ -1531,7 +1531,9 @@ type MappedParticipant = {
         eventId: string;
         drawId: string;
     }[];
-    scheduleConflicts: ScheduleConflict[];
+    scheduleConflicts: {
+        [key: string]: ScheduleConflict;
+    };
     scheduleItems: any[];
     participant: HydratedParticipant & {
         groupParticipantIds: string[];

package/dist/forge/query.mjs

@@ -3544,15 +3544,16 @@ function addNationalityCode({
   persons.forEach(annotatePerson);
 }
 
-function addIndividualParticipants({ participantMap }) {
+function addIndividualParticipants({ participantMap, template }) {
   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) {
+        const source = participantMap[participantId].participant;
         participant.individualParticipants.push(
-          participantMap[participantId].participant
+          template ? attributeFilter({ template, source }) : source
         );
       }
     }
@@ -3693,8 +3694,10 @@ function getParticipantMap({
         withIOC
       });
   }
-  if (withIndividualParticipants)
-    addIndividualParticipants({ participantMap });
+  if (withIndividualParticipants) {
+    const template = isObject(withIndividualParticipants) ? withIndividualParticipants : void 0;
+    addIndividualParticipants({ participantMap, template });
+  }
   return { participantMap };
 }
 function signedIn(participant) {
@@ -3754,7 +3757,7 @@ function initializeParticipantId({ participantMap, participantId }) {
   participantMap[participantId] = {
     structureParticipation: {},
     potentialMatchUps: {},
-    scheduleConflicts: [],
+    scheduleConflicts: {},
     scheduleItems: [],
     participant: {
       groupParticipantIds: [],
@@ -11961,7 +11964,7 @@ function getEventSeedAssignments({
 }
 
 function processEventEntry({
-  extensionConversions,
+  convertExtensions,
   seedAssignments,
   participant,
   withSeeding,
@@ -11971,10 +11974,8 @@ function processEventEntry({
   entry
 }) {
   const { entryStatus, entryStage, entryPosition, extensions } = entry;
-  const entryExtensions = extensions?.length ? Object.assign({}, ...extensionsToAttributes(extensions)) : {};
+  const entryExtensions = extensions?.length && convertExtensions ? Object.assign({}, ...extensionsToAttributes(extensions)) : {};
   const attributes = Object.assign(entryExtensions, {
-    ...extensionConversions,
-    // this should be deprecated and clients should use derivedEventInfo
     entryPosition,
     entryStatus,
     entryStage,
@@ -12391,7 +12392,6 @@ function getParticipantEntries(params) {
       continue;
     const {
       drawDefinitions = [],
-      extensions = [],
       eventType,
       eventName,
       category,
@@ -12406,9 +12406,7 @@ function getParticipantEntries(params) {
     if (publishStatuses)
       eventsPublishStatuses[eventId] = publishStatuses;
     if (withEvents || withSeeding || withRankingProfile) {
-      const extensionConversions = convertExtensions ? Object.assign({}, ...extensionsToAttributes(extensions)) : {};
       derivedEventInfo[eventId] = {
-        ...extensionConversions,
         eventName,
         eventType,
         category,
@@ -12440,7 +12438,7 @@ function getParticipantEntries(params) {
             return;
           const participant = participantMap[id];
           processEventEntry({
-            extensionConversions,
+            convertExtensions,
             seedAssignments,
             participant,
             withSeeding,
@@ -12822,15 +12820,16 @@ function getParticipantEntries(params) {
             const itemIsPrior = consideredMinutes >= scheduledMinutes;
             const timeOverlap = scheduledMinutesDifference && !isNaN(scheduledMinutesDifference) ? minutesDifference <= scheduledMinutesDifference : itemIsPrior && timeStringMinutes(consideredItem.scheduledTime) < timeStringMinutes(notBeforeTime);
             if (timeOverlap && !(bothPotential && sameDraw) && itemIsPrior) {
-              participantAggregator.scheduleConflicts.push({
+              const key = [scheduleItem.matchUpId, consideredItem.matchUpId].sort().join("|");
+              participantAggregator.scheduleConflicts[key] = {
                 priorScheduledMatchUpId: scheduleItem.matchUpId,
                 matchUpIdWithConflict: consideredItem.matchUpId
-              });
+              };
             }
           }
         }
         const pid = participantAggregator.participant.participantId;
-        if (participantAggregator.scheduleConflicts.length) {
+        if (Object.keys(participantAggregator.scheduleConflicts).length) {
           participantIdsWithConflicts.push(pid);
         }
         participantMap[pid].scheduleConflicts = participantAggregator.scheduleConflicts;
@@ -12941,7 +12940,7 @@ function getParticipants(params) {
     return definedAttributes(
       {
         ...participant,
-        scheduleConflicts: scheduleAnalysis ? scheduleConflicts : void 0,
+        scheduleConflicts: scheduleAnalysis ? Object.values(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,
@@ -12968,12 +12967,14 @@ function getParticipants(params) {
     tournamentRecord
   });
   if (withIndividualParticipants) {
+    const template2 = isObject(withIndividualParticipants) ? withIndividualParticipants : void 0;
     for (const participant of filteredParticipants) {
       for (const individualParticipantId of participant.individualParticipantIds ?? []) {
         if (!participant.individualParticipants)
           participant.individualParticipants = [];
+        const source = ppMap.get(individualParticipantId);
         participant.individualParticipants.push(
-          ppMap.get(individualParticipantId)
+          template2 ? attributeFilter({ template: template2, source }) : source
         );
       }
     }