tods-competition-factory 1.8.18 → 1.8.20

package/dist/forge/transform.mjs

@@ -1588,28 +1588,53 @@ function getCategoryAgeDetails(params) {
   return result;
 }
 
+function validateCategory({ category }) {
+  if (!isObject(category))
+    return { error: INVALID_VALUES };
+  const categoryDetails = getCategoryAgeDetails({ category });
+  if (categoryDetails.error)
+    return { error: categoryDetails };
+  const { ratingMax, ratingMin } = category;
+  if (ratingMax && !isNumeric(ratingMax))
+    return decorateResult({
+      result: { error: INVALID_VALUES },
+      context: { ratingMax }
+    });
+  if (ratingMin && !isNumeric(ratingMin))
+    return decorateResult({
+      result: { error: INVALID_VALUES },
+      context: { ratingMin }
+    });
+  return { ...categoryDetails };
+}
+
 function categoryCanContain({
   childCategory,
   withDetails,
   category
 }) {
-  const categoryDetails = getCategoryAgeDetails({ category });
-  const childCategoryDetails = getCategoryAgeDetails({
+  const categoryDetails = validateCategory({ category });
+  const childCategoryDetails = validateCategory({
     category: childCategory
   });
   const invalidAgeMin = childCategoryDetails.ageMin && (categoryDetails.ageMin && childCategoryDetails.ageMin < categoryDetails.ageMin || categoryDetails.ageMax && childCategoryDetails.ageMin > categoryDetails.ageMax);
   const invalidAgeMax = childCategoryDetails.ageMax && (categoryDetails.ageMax && childCategoryDetails.ageMax > categoryDetails.ageMax || categoryDetails.ageMin && childCategoryDetails.ageMax < categoryDetails.ageMin);
   const invalidAgeMinDate = childCategoryDetails.ageMinDate && categoryDetails.ageMaxDate && new Date(childCategoryDetails.ageMinDate) > new Date(categoryDetails.ageMaxDate);
   const invalidAgeMaxDate = childCategoryDetails.ageMaxDate && categoryDetails.ageMinDate && new Date(childCategoryDetails.ageMaxDate) < new Date(categoryDetails.ageMinDate);
-  const valid = !invalidAgeMax && !invalidAgeMin && !invalidAgeMinDate && !invalidAgeMaxDate;
+  const ratingComparison = category.ratingType && childCategory.ratingType && category.ratingType === childCategory.ratingType;
+  const invalidRatingRange = ratingComparison && (category.ratingMin && childCategory.ratingMin && childCategory.ratingMin < category.ratingMin || category.ratingMax && childCategory.ratingMax && childCategory.ratingMax > category.ratingMax || category.ratingMin && childCategory.ratingMax && childCategory.ratingMax < category.ratingMin || category.ratingMax && childCategory.ratingMin && childCategory.ratingMin > category.ratingMax);
+  const invalidBallType = category.ballType && childCategory.ballType && category.ballType !== childCategory.ballType;
+  const valid = !invalidRatingRange && !invalidAgeMinDate && !invalidAgeMaxDate && !invalidBallType && !invalidAgeMax && !invalidAgeMin;
   const ignoreFalse = true;
   const result = definedAttributes(
     {
-      valid,
+      invalidRatingRange,
+      invalidAgeMinDate,
+      invalidAgeMaxDate,
+      invalidBallType,
       invalidAgeMax,
       invalidAgeMin,
-      invalidAgeMinDate,
-      invalidAgeMaxDate
+      valid
     },
     ignoreFalse
   );
@@ -2091,8 +2116,8 @@ function validateCollectionDefinition({
   if (checkGender && referenceGender && gender && [GenderEnum.Male, GenderEnum.Female].includes(referenceGender) && referenceGender !== gender) {
     errors.push(`Invalid gender: ${gender}`);
     return decorateResult({
+      result: { error: INVALID_GENDER, errors },
       context: { referenceGender, gender },
-      result: { error: INVALID_GENDER },
       stack
     });
   }
@@ -3250,142 +3275,6 @@ function tallyParticipantResults({
   return result;
 }
 
-function evaluateCollectionResult({
-  collectionDefinition,
-  groupValueNumbers,
-  groupValueGroups,
-  sideTieValues,
-  tieMatchUps
-}) {
-  const collectionMatchUps = tieMatchUps.filter(
-    (matchUp) => matchUp.collectionId === collectionDefinition.collectionId
-  );
-  const sideMatchUpValues = [0, 0];
-  let sideCollectionValues = [0, 0];
-  const allCollectionMatchUpsCompleted = collectionMatchUps.every(
-    (matchUp) => completedMatchUpStatuses.includes(matchUp.matchUpStatus)
-  );
-  const {
-    collectionValueProfiles,
-    collectionGroupNumber,
-    collectionValue,
-    matchUpValue,
-    winCriteria,
-    scoreValue,
-    setValue
-  } = collectionDefinition;
-  const belongsToValueGroup = collectionGroupNumber && groupValueNumbers.includes(collectionGroupNumber);
-  const sideWins = [0, 0];
-  collectionMatchUps.forEach((matchUp) => {
-    if (matchUp.winningSide)
-      sideWins[matchUp.winningSide - 1] += 1;
-  });
-  if (isConvertableInteger(matchUpValue)) {
-    collectionMatchUps.forEach((matchUp) => {
-      if (matchUp.winningSide) {
-        sideMatchUpValues[matchUp.winningSide - 1] += matchUpValue;
-      }
-    });
-  } else if (isConvertableInteger(setValue)) {
-    collectionMatchUps.forEach((matchUp) => {
-      matchUp.score?.sets?.forEach((set) => {
-        if (set.winningSide)
-          sideMatchUpValues[set.winningSide - 1] += setValue;
-      });
-    });
-  } else if (isConvertableInteger(scoreValue)) {
-    collectionMatchUps.forEach((matchUp) => {
-      matchUp.score?.sets?.forEach((set) => {
-        const {
-          side1TiebreakScore = 0,
-          side2TiebreakScore = 0,
-          side1Score = 0,
-          side2Score = 0
-        } = set;
-        if (matchUp.matchUpStatus === COMPLETED || matchUp.winningSide || set.winningSide) {
-          if (side1Score || side2Score) {
-            sideMatchUpValues[0] += side1Score;
-            sideMatchUpValues[1] += side2Score;
-          } else if ((side1TiebreakScore || side2TiebreakScore) && set.winningSide) {
-            sideMatchUpValues[set.winningSide - 1] += 1;
-          }
-        }
-      });
-    });
-  } else if (Array.isArray(collectionValueProfiles)) {
-    collectionMatchUps.forEach((matchUp) => {
-      if (matchUp.winningSide) {
-        const collectionPosition = matchUp.collectionPosition;
-        const matchUpValue2 = getCollectionPositionValue({
-          collectionDefinition,
-          collectionPosition
-        });
-        if (isConvertableInteger(matchUpValue2)) {
-          sideMatchUpValues[matchUp.winningSide - 1] += matchUpValue2;
-        }
-      }
-    });
-  }
-  if (isConvertableInteger(collectionValue)) {
-    let collectionWinningSide;
-    if (winCriteria?.aggregateValue) {
-      if (allCollectionMatchUpsCompleted) {
-        if (isConvertableInteger(matchUpValue || setValue || scoreValue) && sideMatchUpValues[0] !== sideMatchUpValues[1]) {
-          collectionWinningSide = sideMatchUpValues[0] > sideMatchUpValues[1] ? 1 : 2;
-        } else if (sideWins[0] !== sideWins[1]) {
-          collectionWinningSide = sideWins[0] > sideWins[1] ? 1 : 2;
-        }
-      }
-    } else if (winCriteria?.valueGoal) {
-      collectionWinningSide = sideMatchUpValues.reduce(
-        (winningSide, side, i) => {
-          return side >= winCriteria.valueGoal ? i + 1 : winningSide;
-        },
-        0
-      );
-    } else {
-      const winGoal = Math.floor(collectionDefinition.matchUpCount / 2) + 1;
-      collectionWinningSide = sideWins.reduce((winningSide, side, i) => {
-        return side >= winGoal ? i + 1 : winningSide;
-      }, 0);
-    }
-    if (collectionWinningSide) {
-      if (belongsToValueGroup) {
-        groupValueGroups[collectionGroupNumber].values[collectionWinningSide - 1] += collectionValue;
-      } else {
-        sideCollectionValues[collectionWinningSide - 1] += collectionValue;
-      }
-    }
-  } else {
-    if (belongsToValueGroup) {
-      groupValueGroups[collectionGroupNumber].values[0] += sideMatchUpValues[0] || 0;
-      groupValueGroups[collectionGroupNumber].values[1] += sideMatchUpValues[1] || 0;
-    } else {
-      sideCollectionValues = sideMatchUpValues;
-    }
-  }
-  if (!belongsToValueGroup) {
-    sideCollectionValues.forEach(
-      (sideCollectionValue, i) => sideTieValues[i] += sideCollectionValue || 0
-    );
-  } else {
-    groupValueGroups[collectionGroupNumber].sideWins[0] += sideWins[0] || 0;
-    groupValueGroups[collectionGroupNumber].sideWins[1] += sideWins[1] || 0;
-    groupValueGroups[collectionGroupNumber].allGroupMatchUpsCompleted = groupValueGroups[collectionGroupNumber].allGroupMatchUpsCompleted && allCollectionMatchUpsCompleted;
-    groupValueGroups[collectionGroupNumber].matchUpsCount += collectionMatchUps.length;
-  }
-}
-function getCollectionPositionValue({
-  collectionDefinition,
-  collectionPosition
-}) {
-  const collectionValueProfiles = collectionDefinition.collectionValueProfiles || [];
-  const profile = collectionValueProfiles?.find(
-    (profile2) => profile2.collectionPosition === collectionPosition
-  );
-  return profile?.matchUpValue;
-}
-
 function getAppliedPolicies({
   onlySpecifiedPolicyTypes = false,
   policyTypes = [],
@@ -6501,7 +6390,7 @@ function getAllStructureMatchUps({
   }
 }
 
-function findMatchUp({
+function findDrawMatchUp({
   tournamentParticipants,
   afterRecoveryTimes,
   contextContent,
@@ -6542,6 +6431,142 @@ function findMatchUp({
   return { error: MATCHUP_NOT_FOUND };
 }
 
+function evaluateCollectionResult({
+  collectionDefinition,
+  groupValueNumbers,
+  groupValueGroups,
+  sideTieValues,
+  tieMatchUps
+}) {
+  const collectionMatchUps = tieMatchUps.filter(
+    (matchUp) => matchUp.collectionId === collectionDefinition.collectionId
+  );
+  const sideMatchUpValues = [0, 0];
+  let sideCollectionValues = [0, 0];
+  const allCollectionMatchUpsCompleted = collectionMatchUps.every(
+    (matchUp) => completedMatchUpStatuses.includes(matchUp.matchUpStatus)
+  );
+  const {
+    collectionValueProfiles,
+    collectionGroupNumber,
+    collectionValue,
+    matchUpValue,
+    winCriteria,
+    scoreValue,
+    setValue
+  } = collectionDefinition;
+  const belongsToValueGroup = collectionGroupNumber && groupValueNumbers.includes(collectionGroupNumber);
+  const sideWins = [0, 0];
+  collectionMatchUps.forEach((matchUp) => {
+    if (matchUp.winningSide)
+      sideWins[matchUp.winningSide - 1] += 1;
+  });
+  if (isConvertableInteger(matchUpValue)) {
+    collectionMatchUps.forEach((matchUp) => {
+      if (matchUp.winningSide) {
+        sideMatchUpValues[matchUp.winningSide - 1] += matchUpValue;
+      }
+    });
+  } else if (isConvertableInteger(setValue)) {
+    collectionMatchUps.forEach((matchUp) => {
+      matchUp.score?.sets?.forEach((set) => {
+        if (set.winningSide)
+          sideMatchUpValues[set.winningSide - 1] += setValue;
+      });
+    });
+  } else if (isConvertableInteger(scoreValue)) {
+    collectionMatchUps.forEach((matchUp) => {
+      matchUp.score?.sets?.forEach((set) => {
+        const {
+          side1TiebreakScore = 0,
+          side2TiebreakScore = 0,
+          side1Score = 0,
+          side2Score = 0
+        } = set;
+        if (matchUp.matchUpStatus === COMPLETED || matchUp.winningSide || set.winningSide) {
+          if (side1Score || side2Score) {
+            sideMatchUpValues[0] += side1Score;
+            sideMatchUpValues[1] += side2Score;
+          } else if ((side1TiebreakScore || side2TiebreakScore) && set.winningSide) {
+            sideMatchUpValues[set.winningSide - 1] += 1;
+          }
+        }
+      });
+    });
+  } else if (Array.isArray(collectionValueProfiles)) {
+    collectionMatchUps.forEach((matchUp) => {
+      if (matchUp.winningSide) {
+        const collectionPosition = matchUp.collectionPosition;
+        const matchUpValue2 = getCollectionPositionValue({
+          collectionDefinition,
+          collectionPosition
+        });
+        if (isConvertableInteger(matchUpValue2)) {
+          sideMatchUpValues[matchUp.winningSide - 1] += matchUpValue2;
+        }
+      }
+    });
+  }
+  if (isConvertableInteger(collectionValue)) {
+    let collectionWinningSide;
+    if (winCriteria?.aggregateValue) {
+      if (allCollectionMatchUpsCompleted) {
+        if (isConvertableInteger(matchUpValue || setValue || scoreValue) && sideMatchUpValues[0] !== sideMatchUpValues[1]) {
+          collectionWinningSide = sideMatchUpValues[0] > sideMatchUpValues[1] ? 1 : 2;
+        } else if (sideWins[0] !== sideWins[1]) {
+          collectionWinningSide = sideWins[0] > sideWins[1] ? 1 : 2;
+        }
+      }
+    } else if (winCriteria?.valueGoal) {
+      collectionWinningSide = sideMatchUpValues.reduce(
+        (winningSide, side, i) => {
+          return side >= winCriteria.valueGoal ? i + 1 : winningSide;
+        },
+        0
+      );
+    } else {
+      const winGoal = Math.floor(collectionDefinition.matchUpCount / 2) + 1;
+      collectionWinningSide = sideWins.reduce((winningSide, side, i) => {
+        return side >= winGoal ? i + 1 : winningSide;
+      }, 0);
+    }
+    if (collectionWinningSide) {
+      if (belongsToValueGroup) {
+        groupValueGroups[collectionGroupNumber].values[collectionWinningSide - 1] += collectionValue;
+      } else {
+        sideCollectionValues[collectionWinningSide - 1] += collectionValue;
+      }
+    }
+  } else {
+    if (belongsToValueGroup) {
+      groupValueGroups[collectionGroupNumber].values[0] += sideMatchUpValues[0] || 0;
+      groupValueGroups[collectionGroupNumber].values[1] += sideMatchUpValues[1] || 0;
+    } else {
+      sideCollectionValues = sideMatchUpValues;
+    }
+  }
+  if (!belongsToValueGroup) {
+    sideCollectionValues.forEach(
+      (sideCollectionValue, i) => sideTieValues[i] += sideCollectionValue || 0
+    );
+  } else {
+    groupValueGroups[collectionGroupNumber].sideWins[0] += sideWins[0] || 0;
+    groupValueGroups[collectionGroupNumber].sideWins[1] += sideWins[1] || 0;
+    groupValueGroups[collectionGroupNumber].allGroupMatchUpsCompleted = groupValueGroups[collectionGroupNumber].allGroupMatchUpsCompleted && allCollectionMatchUpsCompleted;
+    groupValueGroups[collectionGroupNumber].matchUpsCount += collectionMatchUps.length;
+  }
+}
+function getCollectionPositionValue({
+  collectionDefinition,
+  collectionPosition
+}) {
+  const collectionValueProfiles = collectionDefinition.collectionValueProfiles || [];
+  const profile = collectionValueProfiles?.find(
+    (profile2) => profile2.collectionPosition === collectionPosition
+  );
+  return profile?.matchUpValue;
+}
+
 function getGroupValueGroups({
   collectionGroups = []
 }) {
@@ -6655,7 +6680,7 @@ function generateTieMatchUpScore(params) {
     }
     if (!winningSide && tallyDirectives) {
       const matchUpId = matchUp.matchUpId;
-      const inContextMatchUp = matchUp.hasContext ? matchUp : matchUpsMap?.drawMatchUps?.[matchUpId] || drawDefinition && findMatchUp({
+      const inContextMatchUp = matchUp.hasContext ? matchUp : matchUpsMap?.drawMatchUps?.[matchUpId] || drawDefinition && findDrawMatchUp({
         inContext: true,
         drawDefinition,
         matchUpId
@@ -7807,8 +7832,8 @@ function updateInContextMatchUp({ tournamentId, inContextMatchUp }) {
     return { error: MISSING_MATCHUP };
   }
   addNotice({
-    topic: UPDATE_INCONTEXT_MATCHUP,
     payload: { inContextMatchUp, tournamentId },
+    topic: UPDATE_INCONTEXT_MATCHUP,
     key: inContextMatchUp.matchUpId
   });
   return { ...SUCCESS };
@@ -11277,6 +11302,48 @@ function includesMatchUpStatuses({
   };
 }
 
+function ensureSideLineUps({
+  inContextDualMatchUp,
+  drawDefinition,
+  tournamentId,
+  dualMatchUp,
+  eventId
+}) {
+  if (dualMatchUp && !dualMatchUp?.sides?.length) {
+    if (!inContextDualMatchUp) {
+      inContextDualMatchUp = findDrawMatchUp({
+        matchUpId: dualMatchUp.matchUpId,
+        inContext: true,
+        drawDefinition
+      })?.matchUp;
+    }
+    const { extension } = findExtension$1({
+      element: drawDefinition,
+      name: LINEUPS
+    });
+    const lineUps = makeDeepCopy(extension?.value || {}, false, true);
+    const extractSideDetail = ({
+      displaySideNumber,
+      drawPosition,
+      sideNumber
+    }) => ({ drawPosition, sideNumber, displaySideNumber });
+    dualMatchUp.sides = inContextDualMatchUp?.sides?.map((side) => {
+      const participantId = side.participantId;
+      return {
+        ...extractSideDetail(side),
+        lineUp: participantId && lineUps[participantId] || []
+      };
+    });
+    modifyMatchUpNotice({
+      context: "ensureSidLineUps",
+      matchUp: dualMatchUp,
+      drawDefinition,
+      tournamentId,
+      eventId
+    });
+  }
+}
+
 function copyTieFormat(tieFormat) {
   if (!tieFormat)
     return void 0;
@@ -11403,7 +11470,7 @@ function modifyMatchUpScore({
   const isDualMatchUp = matchUp.matchUpType === TEAM$2;
   if (isDualMatchUp && drawDefinition) {
     if (matchUpId && matchUp.matchUpId !== matchUpId) {
-      const findResult = findMatchUp({
+      const findResult = findDrawMatchUp({
         drawDefinition,
         matchUpId,
         event
@@ -11432,7 +11499,7 @@ function modifyMatchUpScore({
   if (removeWinningSide)
     matchUp.winningSide = void 0;
   if (!structure && drawDefinition) {
-    ({ structure } = findMatchUp({
+    ({ structure } = findDrawMatchUp({
       drawDefinition,
       matchUpId,
       event
@@ -11548,7 +11615,7 @@ function updateTieMatchUpScore({
   matchUpId,
   event
 }) {
-  const result = findMatchUp({ drawDefinition, event, matchUpId });
+  const result = findDrawMatchUp({ drawDefinition, event, matchUpId });
   if (result.error)
     return result;
   if (!result.matchUp)
@@ -11556,6 +11623,12 @@ function updateTieMatchUpScore({
   const { matchUp, structure } = result;
   if (!matchUp.tieMatchUps)
     return { error: INVALID_MATCHUP };
+  ensureSideLineUps({
+    tournamentId: tournamentRecord?.tournamentId,
+    eventId: event?.eventId,
+    dualMatchUp: matchUp,
+    drawDefinition
+  });
   const { extension } = findExtension({
     name: DISABLE_AUTO_CALC,
     element: matchUp
@@ -12433,8 +12506,8 @@ function updateSideLineUp({
     element: drawDefinition,
     name: LINEUPS
   });
-  const value = existingExtension?.value || {};
-  const lineUp = value[teamParticipantId];
+  const lineUps = existingExtension?.value || {};
+  const lineUp = makeDeepCopy(lineUps[teamParticipantId], false, true);
   if (sideExists) {
     matchUp?.sides?.forEach((side) => {
       if (side.sideNumber === drawPositionSideNumber) {
@@ -12449,13 +12522,12 @@ function updateSideLineUp({
     const targetSide = matchUp.sides.find(
       (side) => side.sideNumber === drawPositionSideNumber
     );
-    if (targetSide) {
+    if (targetSide)
       targetSide.lineUp = lineUp;
-    }
   }
   modifyMatchUpNotice({
     tournamentId: tournamentRecord?.tournamentId,
-    context: "updateSidLineUps",
+    context: "updateSidLineUp",
     eventId: event?.eventId,
     drawDefinition,
     matchUp
@@ -13270,10 +13342,10 @@ function removeLineUpSubstitutions({ lineUp }) {
   const participantAssignments = {};
   const permutations = unique(
     lineUp.flatMap(
-      ({ collectionAssignments }) => collectionAssignments.map(
+      ({ collectionAssignments }) => collectionAssignments?.map(
         ({ collectionId, collectionPosition }) => [collectionId, collectionPosition].join("|")
       )
-    )
+    ).filter(Boolean)
   );
   permutations.forEach((permutation) => {
     const [collectionId, position] = permutation.split("|");
@@ -15332,7 +15404,7 @@ function addMatchUpTimeItem({
   timeItem,
   event
 }) {
-  const { matchUp } = findMatchUp({ drawDefinition, event, matchUpId });
+  const { matchUp } = findDrawMatchUp({ drawDefinition, event, matchUpId });
   if (!matchUp)
     return { error: MATCHUP_NOT_FOUND };
   const result = addTimeItem({
@@ -15367,7 +15439,7 @@ function allocateTeamMatchUpCourts({
     return { error: MISSING_TOURNAMENT_RECORD };
   if (!matchUpId)
     return { error: MISSING_MATCHUP_ID };
-  const result = findMatchUp({
+  const result = findDrawMatchUp({
     drawDefinition,
     matchUpId
   });
@@ -15517,7 +15589,7 @@ function addMatchUpScheduledTime$1(params) {
   if (!validTimeValue(scheduledTime))
     return decorateResult({ result: { error: INVALID_TIME }, stack });
   if (!matchUp) {
-    const result = findMatchUp({ drawDefinition, matchUpId });
+    const result = findDrawMatchUp({ drawDefinition, matchUpId });
     if (result.error)
       return decorateResult({ result, stack });
     matchUp = result.matchUp;
@@ -15574,7 +15646,7 @@ function addMatchUpTimeModifiers({
       stack
     });
   if (!matchUp) {
-    const result = findMatchUp({ drawDefinition, matchUpId });
+    const result = findDrawMatchUp({ drawDefinition, matchUpId });
     if (result.error)
       return decorateResult({ result, stack });
     matchUp = result.matchUp;
@@ -15648,7 +15720,7 @@ function addMatchUpScheduleItems({
   const stack = "drawEngine.addMatchUpScheduleItems";
   let matchUp, warning;
   if (!drawMatchUps) {
-    const result = findMatchUp({ drawDefinition, event, matchUpId });
+    const result = findDrawMatchUp({ drawDefinition, event, matchUpId });
     if (result.error)
       return result;
     matchUp = result.matchUp;
@@ -15916,7 +15988,7 @@ function addMatchUpStartTime({
     return { error: MISSING_MATCHUP_ID };
   if (!validTimeValue(startTime))
     return { error: INVALID_TIME };
-  const { matchUp } = findMatchUp({ drawDefinition, event, matchUpId });
+  const { matchUp } = findDrawMatchUp({ drawDefinition, event, matchUpId });
   const { scheduledDate } = scheduledMatchUpDate({ matchUp });
   const timeItems = matchUp?.timeItems ?? [];
   const earliestRelevantTimeValue = timeItems.filter(
@@ -15960,7 +16032,7 @@ function addMatchUpEndTime({
     return { error: MISSING_MATCHUP_ID };
   if (!validTimeValue(endTime))
     return { error: INVALID_TIME };
-  const { matchUp } = findMatchUp({ drawDefinition, event, matchUpId });
+  const { matchUp } = findDrawMatchUp({ drawDefinition, event, matchUpId });
   const { scheduledDate } = scheduledMatchUpDate({ matchUp });
   const timeItems = matchUp?.timeItems ?? [];
   const latestRelevantTimeValue = timeItems.filter(
@@ -16003,7 +16075,7 @@ function addMatchUpStopTime({
     return { error: MISSING_MATCHUP_ID };
   if (!validTimeValue(stopTime))
     return { error: INVALID_TIME };
-  const { matchUp } = findMatchUp({ drawDefinition, event, matchUpId });
+  const { matchUp } = findDrawMatchUp({ drawDefinition, event, matchUpId });
   const { scheduledDate } = scheduledMatchUpDate({ matchUp });
   const timeItems = matchUp?.timeItems ?? [];
   const hasEndTime = timeItems.reduce((hasEndTime2, timeItem) => {
@@ -16062,7 +16134,7 @@ function addMatchUpResumeTime({
     return { error: MISSING_MATCHUP_ID };
   if (!validTimeValue(resumeTime))
     return { error: INVALID_TIME };
-  const { matchUp } = findMatchUp({ drawDefinition, event, matchUpId });
+  const { matchUp } = findDrawMatchUp({ drawDefinition, event, matchUpId });
   const { scheduledDate } = scheduledMatchUpDate({ matchUp });
   const timeItems = matchUp?.timeItems ?? [];
   const hasEndTime = timeItems.reduce((hasEndTime2, timeItem) => {
@@ -16362,7 +16434,7 @@ function setMatchUpStatus$2(params) {
     matchUp
   });
   if (matchUpTieId) {
-    const { matchUp: dualMatchUp } = findMatchUp({
+    const { matchUp: dualMatchUp } = findDrawMatchUp({
       matchUpId: matchUpTieId,
       inContext: true,
       drawDefinition,
@@ -16503,7 +16575,7 @@ function setMatchUpFormat(params) {
     return { error: UNRECOGNIZED_MATCHUP_FORMAT };
   const stack = "setMatchUpFormat";
   if (matchUpId) {
-    const result = findMatchUp({
+    const result = findDrawMatchUp({
       drawDefinition,
       matchUpId,
       event