tods-competition-factory 1.8.18 → 1.8.19

package/dist/index.mjs

@@ -2382,7 +2382,7 @@ const matchUpFormatCode = {
 };
 
 function factoryVersion() {
-  return "1.8.18";
+  return "1.8.19";
 }
 
 function getObjectTieFormat(obj) {
@@ -2616,28 +2616,76 @@ function getCategoryAgeDetails(params) {
   return result;
 }
 
+function decorateResult({
+  context,
+  result,
+  stack,
+  info
+}) {
+  if (result && !Array.isArray(result?.stack))
+    result.stack = [];
+  if (result && Array.isArray(result?.stack) && typeof stack === "string") {
+    result.stack.push(stack);
+  }
+  if (result && info) {
+    result.info = info;
+  }
+  if (result && typeof context === "object" && Object.keys(context).length) {
+    Object.assign(result, definedAttributes(context));
+  }
+  if (result && !result?.error && !result?.success) {
+    Object.assign(result, { ...SUCCESS });
+  }
+  return result ?? { success: true };
+}
+
+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
   );
@@ -2651,29 +2699,6 @@ function mustBeAnArray(value) {
   return `${value} must be an array`;
 }
 
-function decorateResult({
-  context,
-  result,
-  stack,
-  info
-}) {
-  if (result && !Array.isArray(result?.stack))
-    result.stack = [];
-  if (result && Array.isArray(result?.stack) && typeof stack === "string") {
-    result.stack.push(stack);
-  }
-  if (result && info) {
-    result.info = info;
-  }
-  if (result && typeof context === "object" && Object.keys(context).length) {
-    Object.assign(result, definedAttributes(context));
-  }
-  if (result && !result?.error && !result?.success) {
-    Object.assign(result, { ...SUCCESS });
-  }
-  return result ?? { success: true };
-}
-
 var DrawTypeEnum = /* @__PURE__ */ ((DrawTypeEnum2) => {
   DrawTypeEnum2["AdHoc"] = "AD_HOC";
   DrawTypeEnum2["Compass"] = "COMPASS";
@@ -4206,142 +4231,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$1 || 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;
-}
-
 const APPLIED_POLICIES = "appliedPolicies";
 const AUDIT_POSITION_ACTIONS = "positionActions";
 const CONTEXT = "context";
@@ -8534,11 +8423,13 @@ function getAllStructureMatchUps({
   }
 }
 
-function publicFindMatchUp$1(params) {
+function publicFindDrawMatchUp(params) {
   Object.assign(params, { inContext: true });
-  return { matchUp: makeDeepCopy(findMatchUp$1(params).matchUp, false, true) };
+  return {
+    matchUp: makeDeepCopy(findDrawMatchUp(params).matchUp, false, true)
+  };
 }
-function findMatchUp$1({
+function findDrawMatchUp({
   tournamentParticipants,
   afterRecoveryTimes,
   contextContent,
@@ -8579,6 +8470,142 @@ function findMatchUp$1({
   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$1 || 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 = []
 }) {
@@ -8692,7 +8719,7 @@ function generateTieMatchUpScore(params) {
     }
     if (!winningSide && tallyDirectives) {
       const matchUpId = matchUp.matchUpId;
-      const inContextMatchUp = matchUp.hasContext ? matchUp : matchUpsMap?.drawMatchUps?.[matchUpId] || drawDefinition && findMatchUp$1({
+      const inContextMatchUp = matchUp.hasContext ? matchUp : matchUpsMap?.drawMatchUps?.[matchUpId] || drawDefinition && findDrawMatchUp({
         inContext: true,
         drawDefinition,
         matchUpId
@@ -8720,6 +8747,247 @@ function generateTieMatchUpScore(params) {
   };
 }
 
+function drawUpdatedAt(drawDefinition, structureIds) {
+  if (!drawDefinition)
+    return { error: MISSING_DRAW_DEFINITION };
+  let timeStamp = Date.now();
+  if (drawDefinition.updatedAt && timeStamp === new Date(drawDefinition.updatedAt).getTime())
+    timeStamp += 1;
+  const updatedAt = new Date(timeStamp).toISOString();
+  const relevantStructureIds = structureIds?.filter(Boolean);
+  drawDefinition.updatedAt = updatedAt;
+  drawDefinition.structures?.filter(Boolean).forEach((structure) => {
+    if (!relevantStructureIds?.length || relevantStructureIds?.includes(structure.structureId)) {
+      structure.updatedAt = updatedAt;
+    }
+  });
+  return { ...SUCCESS };
+}
+function addMatchUpsNotice({
+  drawDefinition,
+  tournamentId,
+  matchUps,
+  eventId
+}) {
+  if (drawDefinition)
+    drawUpdatedAt(drawDefinition);
+  addNotice({
+    payload: { matchUps, tournamentId, eventId },
+    topic: ADD_MATCHUPS
+  });
+  return { ...SUCCESS };
+}
+function deleteMatchUpsNotice({
+  drawDefinition,
+  tournamentId,
+  matchUpIds,
+  eventId,
+  action
+}) {
+  if (drawDefinition)
+    drawUpdatedAt(drawDefinition);
+  addNotice({
+    topic: DELETED_MATCHUP_IDS,
+    payload: {
+      tournamentId,
+      matchUpIds,
+      eventId,
+      action
+    }
+  });
+  for (const matchUpId of matchUpIds) {
+    deleteNotice({ key: matchUpId });
+  }
+  return { ...SUCCESS };
+}
+function modifyMatchUpNotice({
+  drawDefinition,
+  tournamentId,
+  structureId,
+  context,
+  eventId,
+  matchUp
+}) {
+  if (!matchUp) {
+    console.log(MISSING_MATCHUP);
+    return { error: MISSING_MATCHUP };
+  }
+  if (drawDefinition) {
+    const structureIds = structureId ? [structureId] : void 0;
+    modifyDrawNotice({
+      drawDefinition,
+      structureIds,
+      tournamentId,
+      eventId
+    });
+  }
+  addNotice({
+    topic: MODIFY_MATCHUP,
+    payload: { matchUp, tournamentId, context },
+    key: matchUp.matchUpId
+  });
+  return { ...SUCCESS };
+}
+function updateInContextMatchUp({ tournamentId, inContextMatchUp }) {
+  if (!inContextMatchUp) {
+    return { error: MISSING_MATCHUP };
+  }
+  addNotice({
+    payload: { inContextMatchUp, tournamentId },
+    topic: UPDATE_INCONTEXT_MATCHUP,
+    key: inContextMatchUp.matchUpId
+  });
+  return { ...SUCCESS };
+}
+function addDrawNotice({
+  tournamentId,
+  eventId,
+  drawDefinition
+}) {
+  if (!drawDefinition) {
+    console.log(MISSING_DRAW_DEFINITION);
+    return { error: MISSING_DRAW_DEFINITION };
+  }
+  drawUpdatedAt(drawDefinition);
+  addNotice({
+    payload: { drawDefinition, tournamentId, eventId },
+    topic: ADD_DRAW_DEFINITION,
+    key: drawDefinition.drawId
+  });
+  return { ...SUCCESS };
+}
+function deleteDrawNotice({
+  tournamentId,
+  eventId,
+  drawId
+}) {
+  addNotice({
+    payload: { drawId, tournamentId, eventId },
+    topic: DELETED_DRAW_IDS,
+    key: drawId
+  });
+  deleteNotice({ key: drawId });
+  return { ...SUCCESS };
+}
+function modifyDrawNotice({
+  drawDefinition,
+  tournamentId,
+  structureIds,
+  eventId
+}) {
+  if (!drawDefinition) {
+    return { error: MISSING_DRAW_DEFINITION };
+  }
+  drawUpdatedAt(drawDefinition, structureIds);
+  addNotice({
+    payload: { tournamentId, eventId, drawDefinition },
+    topic: MODIFY_DRAW_DEFINITION,
+    key: drawDefinition.drawId
+  });
+  return { ...SUCCESS };
+}
+function modifySeedAssignmentsNotice({
+  drawDefinition,
+  tournamentId,
+  structure,
+  eventId
+}) {
+  if (!drawDefinition)
+    return { error: MISSING_DRAW_DEFINITION };
+  if (!structure)
+    return { error: MISSING_STRUCTURE };
+  const seedAssignments = structure.seedAssignments;
+  const structureId = structure.structureId;
+  const drawId = drawDefinition.drawId;
+  addNotice({
+    payload: { tournamentId, eventId, drawId, structureId, seedAssignments },
+    topic: MODIFY_SEED_ASSIGNMENTS,
+    key: drawDefinition.drawId
+  });
+  modifyDrawNotice({
+    structureIds: [structureId],
+    drawDefinition,
+    tournamentId,
+    eventId
+  });
+  return { ...SUCCESS };
+}
+function modifyPositionAssignmentsNotice({
+  drawDefinition,
+  tournamentId,
+  structure,
+  event
+}) {
+  if (!drawDefinition)
+    return { error: MISSING_DRAW_DEFINITION };
+  if (!structure)
+    return { error: MISSING_STRUCTURE };
+  const positionAssignments = getPositionAssignments$1({ structure });
+  const structureId = structure.structureId;
+  const drawId = drawDefinition.drawId;
+  const eventId = event?.eventId;
+  addNotice({
+    topic: MODIFY_POSITION_ASSIGNMENTS,
+    payload: {
+      positionAssignments,
+      tournamentId,
+      structureId,
+      eventId,
+      drawId
+    },
+    key: structureId
+  });
+  modifyDrawNotice({
+    structureIds: [structureId],
+    drawDefinition,
+    tournamentId,
+    eventId
+  });
+  return { ...SUCCESS };
+}
+
+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$2({
+      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;
@@ -8793,205 +9061,6 @@ function removeNotes(params) {
   return { ...SUCCESS };
 }
 
-function drawUpdatedAt(drawDefinition, structureIds) {
-  if (!drawDefinition)
-    return { error: MISSING_DRAW_DEFINITION };
-  let timeStamp = Date.now();
-  if (drawDefinition.updatedAt && timeStamp === new Date(drawDefinition.updatedAt).getTime())
-    timeStamp += 1;
-  const updatedAt = new Date(timeStamp).toISOString();
-  const relevantStructureIds = structureIds?.filter(Boolean);
-  drawDefinition.updatedAt = updatedAt;
-  drawDefinition.structures?.filter(Boolean).forEach((structure) => {
-    if (!relevantStructureIds?.length || relevantStructureIds?.includes(structure.structureId)) {
-      structure.updatedAt = updatedAt;
-    }
-  });
-  return { ...SUCCESS };
-}
-function addMatchUpsNotice({
-  drawDefinition,
-  tournamentId,
-  matchUps,
-  eventId
-}) {
-  if (drawDefinition)
-    drawUpdatedAt(drawDefinition);
-  addNotice({
-    payload: { matchUps, tournamentId, eventId },
-    topic: ADD_MATCHUPS
-  });
-  return { ...SUCCESS };
-}
-function deleteMatchUpsNotice({
-  drawDefinition,
-  tournamentId,
-  matchUpIds,
-  eventId,
-  action
-}) {
-  if (drawDefinition)
-    drawUpdatedAt(drawDefinition);
-  addNotice({
-    topic: DELETED_MATCHUP_IDS,
-    payload: {
-      tournamentId,
-      matchUpIds,
-      eventId,
-      action
-    }
-  });
-  for (const matchUpId of matchUpIds) {
-    deleteNotice({ key: matchUpId });
-  }
-  return { ...SUCCESS };
-}
-function modifyMatchUpNotice({
-  drawDefinition,
-  tournamentId,
-  structureId,
-  context,
-  eventId,
-  matchUp
-}) {
-  if (!matchUp) {
-    console.log(MISSING_MATCHUP);
-    return { error: MISSING_MATCHUP };
-  }
-  if (drawDefinition) {
-    const structureIds = structureId ? [structureId] : void 0;
-    modifyDrawNotice({
-      drawDefinition,
-      structureIds,
-      tournamentId,
-      eventId
-    });
-  }
-  addNotice({
-    topic: MODIFY_MATCHUP,
-    payload: { matchUp, tournamentId, context },
-    key: matchUp.matchUpId
-  });
-  return { ...SUCCESS };
-}
-function updateInContextMatchUp({ tournamentId, inContextMatchUp }) {
-  if (!inContextMatchUp) {
-    return { error: MISSING_MATCHUP };
-  }
-  addNotice({
-    topic: UPDATE_INCONTEXT_MATCHUP,
-    payload: { inContextMatchUp, tournamentId },
-    key: inContextMatchUp.matchUpId
-  });
-  return { ...SUCCESS };
-}
-function addDrawNotice({
-  tournamentId,
-  eventId,
-  drawDefinition
-}) {
-  if (!drawDefinition) {
-    console.log(MISSING_DRAW_DEFINITION);
-    return { error: MISSING_DRAW_DEFINITION };
-  }
-  drawUpdatedAt(drawDefinition);
-  addNotice({
-    payload: { drawDefinition, tournamentId, eventId },
-    topic: ADD_DRAW_DEFINITION,
-    key: drawDefinition.drawId
-  });
-  return { ...SUCCESS };
-}
-function deleteDrawNotice({
-  tournamentId,
-  eventId,
-  drawId
-}) {
-  addNotice({
-    payload: { drawId, tournamentId, eventId },
-    topic: DELETED_DRAW_IDS,
-    key: drawId
-  });
-  deleteNotice({ key: drawId });
-  return { ...SUCCESS };
-}
-function modifyDrawNotice({
-  drawDefinition,
-  tournamentId,
-  structureIds,
-  eventId
-}) {
-  if (!drawDefinition) {
-    return { error: MISSING_DRAW_DEFINITION };
-  }
-  drawUpdatedAt(drawDefinition, structureIds);
-  addNotice({
-    payload: { tournamentId, eventId, drawDefinition },
-    topic: MODIFY_DRAW_DEFINITION,
-    key: drawDefinition.drawId
-  });
-  return { ...SUCCESS };
-}
-function modifySeedAssignmentsNotice({
-  drawDefinition,
-  tournamentId,
-  structure,
-  eventId
-}) {
-  if (!drawDefinition)
-    return { error: MISSING_DRAW_DEFINITION };
-  if (!structure)
-    return { error: MISSING_STRUCTURE };
-  const seedAssignments = structure.seedAssignments;
-  const structureId = structure.structureId;
-  const drawId = drawDefinition.drawId;
-  addNotice({
-    payload: { tournamentId, eventId, drawId, structureId, seedAssignments },
-    topic: MODIFY_SEED_ASSIGNMENTS,
-    key: drawDefinition.drawId
-  });
-  modifyDrawNotice({
-    structureIds: [structureId],
-    drawDefinition,
-    tournamentId,
-    eventId
-  });
-  return { ...SUCCESS };
-}
-function modifyPositionAssignmentsNotice({
-  drawDefinition,
-  tournamentId,
-  structure,
-  event
-}) {
-  if (!drawDefinition)
-    return { error: MISSING_DRAW_DEFINITION };
-  if (!structure)
-    return { error: MISSING_STRUCTURE };
-  const positionAssignments = getPositionAssignments$1({ structure });
-  const structureId = structure.structureId;
-  const drawId = drawDefinition.drawId;
-  const eventId = event?.eventId;
-  addNotice({
-    topic: MODIFY_POSITION_ASSIGNMENTS,
-    payload: {
-      positionAssignments,
-      tournamentId,
-      structureId,
-      eventId,
-      drawId
-    },
-    key: structureId
-  });
-  modifyDrawNotice({
-    structureIds: [structureId],
-    drawDefinition,
-    tournamentId,
-    eventId
-  });
-  return { ...SUCCESS };
-}
-
 const hasParticipantId = (o) => o?.participantId;
 
 function createSubOrderMap({ positionAssignments }) {
@@ -9975,7 +10044,7 @@ function modifyMatchUpScore({
   const isDualMatchUp = matchUp.matchUpType === TEAM$2;
   if (isDualMatchUp && drawDefinition) {
     if (matchUpId && matchUp.matchUpId !== matchUpId) {
-      const findResult = findMatchUp$1({
+      const findResult = findDrawMatchUp({
         drawDefinition,
         matchUpId,
         event
@@ -10004,7 +10073,7 @@ function modifyMatchUpScore({
   if (removeWinningSide)
     matchUp.winningSide = void 0;
   if (!structure && drawDefinition) {
-    ({ structure } = findMatchUp$1({
+    ({ structure } = findDrawMatchUp({
       drawDefinition,
       matchUpId,
       event
@@ -10120,7 +10189,7 @@ function updateTieMatchUpScore$1({
   matchUpId,
   event
 }) {
-  const result = findMatchUp$1({ drawDefinition, event, matchUpId });
+  const result = findDrawMatchUp({ drawDefinition, event, matchUpId });
   if (result.error)
     return result;
   if (!result.matchUp)
@@ -10128,6 +10197,12 @@ function updateTieMatchUpScore$1({
   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
@@ -19625,7 +19700,7 @@ function addMatchUpTimeItem({
   timeItem,
   event
 }) {
-  const { matchUp } = findMatchUp$1({ drawDefinition, event, matchUpId });
+  const { matchUp } = findDrawMatchUp({ drawDefinition, event, matchUpId });
   if (!matchUp)
     return { error: MATCHUP_NOT_FOUND };
   const result = addTimeItem({
@@ -19651,7 +19726,7 @@ function resetMatchUpTimeItems({
   matchUpId,
   event
 }) {
-  const { matchUp } = findMatchUp$1({ drawDefinition, event, matchUpId });
+  const { matchUp } = findDrawMatchUp({ drawDefinition, event, matchUpId });
   if (!matchUp)
     return { error: MATCHUP_NOT_FOUND };
   matchUp.timeItems = [];
@@ -19679,7 +19754,7 @@ function allocateTeamMatchUpCourts$1({
     return { error: MISSING_TOURNAMENT_RECORD };
   if (!matchUpId)
     return { error: MISSING_MATCHUP_ID };
-  const result = findMatchUp$1({
+  const result = findDrawMatchUp({
     drawDefinition,
     matchUpId
   });
@@ -19837,7 +19912,7 @@ function addMatchUpScheduledTime$2(params) {
   if (!validTimeValue(scheduledTime))
     return decorateResult({ result: { error: INVALID_TIME }, stack });
   if (!matchUp) {
-    const result = findMatchUp$1({ drawDefinition, matchUpId });
+    const result = findDrawMatchUp({ drawDefinition, matchUpId });
     if (result.error)
       return decorateResult({ result, stack });
     matchUp = result.matchUp;
@@ -19894,7 +19969,7 @@ function addMatchUpTimeModifiers({
       stack
     });
   if (!matchUp) {
-    const result = findMatchUp$1({ drawDefinition, matchUpId });
+    const result = findDrawMatchUp({ drawDefinition, matchUpId });
     if (result.error)
       return decorateResult({ result, stack });
     matchUp = result.matchUp;
@@ -19968,7 +20043,7 @@ function addMatchUpScheduleItems$2({
   const stack = "drawEngine.addMatchUpScheduleItems";
   let matchUp, warning;
   if (!drawMatchUps) {
-    const result = findMatchUp$1({ drawDefinition, event, matchUpId });
+    const result = findDrawMatchUp({ drawDefinition, event, matchUpId });
     if (result.error)
       return result;
     matchUp = result.matchUp;
@@ -20263,7 +20338,7 @@ function addMatchUpStartTime$2({
     return { error: MISSING_MATCHUP_ID };
   if (!validTimeValue(startTime))
     return { error: INVALID_TIME };
-  const { matchUp } = findMatchUp$1({ drawDefinition, event, matchUpId });
+  const { matchUp } = findDrawMatchUp({ drawDefinition, event, matchUpId });
   const { scheduledDate } = scheduledMatchUpDate({ matchUp });
   const timeItems = matchUp?.timeItems ?? [];
   const earliestRelevantTimeValue = timeItems.filter(
@@ -20307,7 +20382,7 @@ function addMatchUpEndTime$2({
     return { error: MISSING_MATCHUP_ID };
   if (!validTimeValue(endTime))
     return { error: INVALID_TIME };
-  const { matchUp } = findMatchUp$1({ drawDefinition, event, matchUpId });
+  const { matchUp } = findDrawMatchUp({ drawDefinition, event, matchUpId });
   const { scheduledDate } = scheduledMatchUpDate({ matchUp });
   const timeItems = matchUp?.timeItems ?? [];
   const latestRelevantTimeValue = timeItems.filter(
@@ -20350,7 +20425,7 @@ function addMatchUpStopTime$2({
     return { error: MISSING_MATCHUP_ID };
   if (!validTimeValue(stopTime))
     return { error: INVALID_TIME };
-  const { matchUp } = findMatchUp$1({ drawDefinition, event, matchUpId });
+  const { matchUp } = findDrawMatchUp({ drawDefinition, event, matchUpId });
   const { scheduledDate } = scheduledMatchUpDate({ matchUp });
   const timeItems = matchUp?.timeItems ?? [];
   const hasEndTime = timeItems.reduce((hasEndTime2, timeItem) => {
@@ -20409,7 +20484,7 @@ function addMatchUpResumeTime$2({
     return { error: MISSING_MATCHUP_ID };
   if (!validTimeValue(resumeTime))
     return { error: INVALID_TIME };
-  const { matchUp } = findMatchUp$1({ drawDefinition, event, matchUpId });
+  const { matchUp } = findDrawMatchUp({ drawDefinition, event, matchUpId });
   const { scheduledDate } = scheduledMatchUpDate({ matchUp });
   const timeItems = matchUp?.timeItems ?? [];
   const hasEndTime = timeItems.reduce((hasEndTime2, timeItem) => {
@@ -22254,8 +22329,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) {
@@ -22270,13 +22345,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
@@ -23213,10 +23287,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("|");
@@ -25821,7 +25895,7 @@ function setMatchUpStatus$2(params) {
     matchUp
   });
   if (matchUpTieId) {
-    const { matchUp: dualMatchUp } = findMatchUp$1({
+    const { matchUp: dualMatchUp } = findDrawMatchUp({
       matchUpId: matchUpTieId,
       inContext: true,
       drawDefinition,
@@ -25967,7 +26041,7 @@ function setMatchUpFormat$1(params) {
     return { error: UNRECOGNIZED_MATCHUP_FORMAT };
   const stack = "setMatchUpFormat";
   if (matchUpId) {
-    const result = findMatchUp$1({
+    const result = findDrawMatchUp({
       drawDefinition,
       matchUpId,
       event
@@ -28374,7 +28448,7 @@ function getTieFormat$1({
     tieFormat = getObjectTieFormat(event);
   } else if (matchUpId) {
     if (drawDefinition && (!matchUp || !structure)) {
-      const result = findMatchUp$1({
+      const result = findDrawMatchUp({
         drawDefinition,
         matchUpId
       });
@@ -29048,7 +29122,7 @@ function orderCollectionDefinitions$1({
   if (eventId && event?.tieFormat) {
     updateEventTieFormat({ tournamentRecord, event, orderMap });
   } else if (matchUpId) {
-    const result = drawDefinition && findMatchUp$1({
+    const result = drawDefinition && findDrawMatchUp({
       drawDefinition,
       matchUpId
     });
@@ -29312,7 +29386,7 @@ function removeCollectionDefinition$1({
       });
       if (result2.error)
         return result2;
-      result2 = findMatchUp$1({
+      result2 = findDrawMatchUp({
         drawDefinition,
         matchUpId
       });
@@ -30171,7 +30245,7 @@ function findMatchUp({
     contextProfile,
     inContext
   });
-  const { matchUp, structure } = findMatchUp$1({
+  const { matchUp, structure } = findDrawMatchUp({
     context: inContext ? additionalContext : void 0,
     tournamentParticipants,
     afterRecoveryTimes,
@@ -33879,7 +33953,7 @@ function checkInParticipant$1({
   tournamentParticipants = tournamentParticipants ?? tournamentRecord?.participants;
   if (tournamentParticipants?.length) {
     if (!matchUp && drawDefinition) {
-      const result2 = findMatchUp$1({
+      const result2 = findDrawMatchUp({
         tournamentParticipants,
         inContext: true,
         drawDefinition,
@@ -33928,7 +34002,7 @@ function checkOutParticipant$1({
     return { error: MISSING_MATCHUP_ID };
   tournamentParticipants = tournamentParticipants ?? tournamentRecord?.participants;
   if (!matchUp) {
-    const result = findMatchUp$1({
+    const result = findDrawMatchUp({
       tournamentParticipants,
       inContext: true,
       drawDefinition,
@@ -34052,7 +34126,7 @@ function removeMatchUpCourtAssignment$1(params) {
   });
   if (!drawDefinition)
     return { error: MISSING_DRAW_DEFINITION };
-  const result = findMatchUp$1({ drawDefinition, event, matchUpId });
+  const result = findDrawMatchUp({ drawDefinition, event, matchUpId });
   if (result.error)
     return result;
   if (result?.matchUp?.matchUpType === TEAM_MATCHUP) {
@@ -36251,7 +36325,7 @@ function matchUpActions$2({
     });
   const otherFlightEntries = specifiedPolicyDefinitions?.[POLICY_TYPE_POSITION_ACTIONS]?.otherFlightEntries;
   const { drawId } = drawDefinition;
-  const { matchUp, structure } = findMatchUp$1({
+  const { matchUp, structure } = findDrawMatchUp({
     drawDefinition,
     matchUpId,
     event
@@ -36959,7 +37033,7 @@ function removeCourtAssignment({
     ({ drawDefinition } = findEvent({ tournamentRecord, drawId }));
   }
   if (drawDefinition) {
-    ({ matchUp } = findMatchUp$1({ drawDefinition, matchUpId }));
+    ({ matchUp } = findDrawMatchUp({ drawDefinition, matchUpId }));
   } else {
     if (!tournamentRecord)
       return { error: MISSING_TOURNAMENT_RECORD };
@@ -46308,13 +46382,13 @@ function resetMatchUpLineUps$1({
 }) {
   if (!drawDefinition)
     return { error: MISSING_DRAW_DEFINITION };
-  const matchUp = findMatchUp$1({
+  const matchUp = findDrawMatchUp({
     drawDefinition,
     matchUpId
   })?.matchUp;
   if (!matchUp?.tieMatchUps)
     return { error: INVALID_MATCHUP };
-  const inContextMatchUp = findMatchUp$1({
+  const inContextMatchUp = findDrawMatchUp({
     inContext: true,
     drawDefinition,
     matchUpId,
@@ -46427,7 +46501,7 @@ function removeDelegatedOutcome$1({ drawDefinition, event, matchUpId }) {
     return { error: MISSING_DRAW_DEFINITION };
   if (!matchUpId)
     return { error: MISSING_MATCHUP_ID };
-  const { matchUp } = findMatchUp$1({ drawDefinition, event, matchUpId });
+  const { matchUp } = findDrawMatchUp({ drawDefinition, event, matchUpId });
   if (!matchUp)
     return { error: MATCHUP_NOT_FOUND };
   return removeExtension$1({
@@ -46941,7 +47015,7 @@ function setDelegatedOutcome$1({
   if (!matchUp && !matchUpId)
     return { error: MISSING_MATCHUP };
   if (!matchUp) {
-    const result = findMatchUp$1({
+    const result = findDrawMatchUp({
       drawDefinition,
       matchUpId
     });
@@ -46989,7 +47063,7 @@ function validDrawPosition(drawPosition) {
 function disableTieAutoCalc$1({ drawDefinition, matchUpId, event }) {
   if (!drawDefinition)
     return { error: MISSING_DRAW_DEFINITION };
-  const { matchUp } = findMatchUp$1({
+  const { matchUp } = findDrawMatchUp({
     drawDefinition,
     matchUpId,
     event
@@ -47008,7 +47082,7 @@ function enableTieAutoCalc$1({
 }) {
   if (!drawDefinition)
     return { error: MISSING_DRAW_DEFINITION };
-  const { matchUp } = findMatchUp$1({
+  const { matchUp } = findDrawMatchUp({
     drawDefinition,
     matchUpId,
     event
@@ -47158,7 +47232,7 @@ const matchUpGovernor = {
   removeDelegatedOutcome: removeDelegatedOutcome$1,
   drawMatic: drawMatic$1,
   addMatchUpOfficial: addMatchUpOfficial$2,
-  findMatchUp: publicFindMatchUp$1,
+  findMatchUp: publicFindDrawMatchUp,
   getRoundMatchUps: getRoundMatchUps$1,
   validDrawPositions,
   validateScore
@@ -52715,14 +52789,14 @@ function getTieMatchUpContext({
   if (!event)
     return { error: EVENT_NOT_FOUND };
   const matchUpsMap = getMatchUpsMap({ drawDefinition });
-  const { matchUp: tieMatchUp } = findMatchUp$1({
+  const { matchUp: tieMatchUp } = findDrawMatchUp({
     matchUpId: tieMatchUpId,
     drawDefinition,
     matchUpsMap
   });
   if (!tieMatchUp)
     return { error: MATCHUP_NOT_FOUND };
-  const { matchUp: inContextTieMatchUp, structure } = findMatchUp$1({
+  const { matchUp: inContextTieMatchUp, structure } = findDrawMatchUp({
     tournamentParticipants: tournamentRecord.participants,
     matchUpId: tieMatchUpId,
     inContext: true,
@@ -52755,12 +52829,12 @@ function getTieMatchUpContext({
       participantIds
     }
   });
-  const { matchUp: dualMatchUp } = findMatchUp$1({
+  const { matchUp: dualMatchUp } = findDrawMatchUp({
     matchUpId: matchUpTieId,
     drawDefinition,
     matchUpsMap
   });
-  const { matchUp: inContextDualMatchUp } = findMatchUp$1({
+  const { matchUp: inContextDualMatchUp } = findDrawMatchUp({
     matchUpId: matchUpTieId,
     inContext: true,
     drawDefinition,
@@ -52818,9 +52892,9 @@ function assignTieMatchUpParticipantId(params) {
   if (allTieIndividualParticipantIds?.includes(participantId)) {
     return decorateResult({ result: { ...SUCCESS }, stack });
   }
-  teamParticipantId = teamParticipantId || params.sideNumber && inContextDualMatchUp?.sides?.find(
+  teamParticipantId = teamParticipantId || (params.sideNumber ? inContextDualMatchUp?.sides?.find(
     (side) => side.sideNumber === params.sideNumber
-  )?.participantId;
+  )?.participantId : void 0);
   const participantToAssign = getParticipants$1({
     participantFilters: { participantIds: [participantId] },
     tournamentRecord
@@ -52870,27 +52944,13 @@ function assignTieMatchUpParticipantId(params) {
   );
   if (!collectionDefinition)
     return { error: MISSING_COLLECTION_DEFINITION };
-  if (!dualMatchUp?.sides?.length) {
-    const { extension } = findExtension$2({
-      element: drawDefinition,
-      name: LINEUPS
-    });
-    const lineUps = makeDeepCopy(extension?.value || {}, false, true);
-    const extractSideDetail = ({
-      displaySideNumber,
-      drawPosition,
-      sideNumber: sideNumber2
-    }) => ({ drawPosition, sideNumber: sideNumber2, displaySideNumber });
-    if (dualMatchUp) {
-      dualMatchUp.sides = inContextDualMatchUp?.sides?.map((side) => {
-        const participantId2 = side.participantId;
-        return {
-          ...extractSideDetail(side),
-          lineUp: participantId2 && lineUps[participantId2] || []
-        };
-      });
-    }
-  }
+  ensureSideLineUps({
+    tournamentId: tournamentRecord.tournamentId,
+    eventId: event.eventId,
+    inContextDualMatchUp,
+    drawDefinition,
+    dualMatchUp
+  });
   const dualMatchUpSide = dualMatchUp?.sides?.find(
     (side) => side.sideNumber === sideNumber
   );
@@ -52921,7 +52981,7 @@ function assignTieMatchUpParticipantId(params) {
   if (removeResult.error)
     return decorateResult({ result: removeResult, stack });
   const { modifiedLineUp } = removeResult;
-  let deleteParticipantId;
+  let deletedParticipantId;
   if (matchUpType === DOUBLES$1) {
     if (participantType !== PAIR) {
       let result = updateLineUp({
@@ -52940,7 +53000,7 @@ function assignTieMatchUpParticipantId(params) {
       });
       if (result.error)
         return result;
-      deleteParticipantId = result.deleteParticipantId;
+      deletedParticipantId = result.deletedParticipantId;
       if (dualMatchUpSide)
         dualMatchUpSide.lineUp = modifiedLineUp;
       if (dualMatchUp) {
@@ -52986,9 +53046,9 @@ function assignTieMatchUpParticipantId(params) {
       context: stack,
       drawDefinition
     });
-  if (deleteParticipantId) {
+  if (deletedParticipantId) {
     const { error } = deleteParticipants({
-      participantIds: [deleteParticipantId],
+      participantIds: [deletedParticipantId],
       tournamentRecord
     });
     if (error)
@@ -52996,7 +53056,7 @@ function assignTieMatchUpParticipantId(params) {
   }
   return { ...SUCCESS, modifiedLineUp };
   function addParticipantId2Pair({ side }) {
-    let deleteParticipantId2;
+    let deletedParticipantId2;
     if (!side.participant) {
       const newPairParticipant = {
         individualParticipantIds: [participantId],
@@ -53033,11 +53093,11 @@ function assignTieMatchUpParticipantId(params) {
           if (result.error)
             return result;
         } else {
-          deleteParticipantId2 = participant?.participantId;
+          deletedParticipantId2 = participant?.participantId;
         }
       }
     }
-    return { ...SUCCESS, deleteParticipantId: deleteParticipantId2 };
+    return { ...SUCCESS, deletedParticipantId: deletedParticipantId2 };
   }
 }
 function updateLineUp({
@@ -53182,10 +53242,12 @@ function generateLineUps(params) {
           participantIdPairs.push(participantIds2);
       });
     }
-    const lineUp = Object.keys(participantAssignments).map((participantId) => ({
-      collectionAssignments: participantAssignments[participantId],
-      participantId
-    }));
+    const lineUp = Object.keys(participantAssignments).map(
+      (participantId) => ({
+        collectionAssignments: participantAssignments[participantId],
+        participantId
+      })
+    );
     lineUps[teamParticipant.participantId] = lineUp;
   }
   const participantsToAdd = [];
@@ -53554,7 +53616,7 @@ function completeDrawMatchUps(params) {
               );
               if (teamParticipant) {
                 const individualParticipantId = teamParticipant.individualParticipantIds?.[i];
-                assignTieMatchUpParticipantId({
+                individualParticipantId && assignTieMatchUpParticipantId({
                   teamParticipantId: teamParticipant.participantId,
                   participantId: individualParticipantId,
                   tournamentRecord,
@@ -55189,8 +55251,10 @@ function assignMatchUpSideParticipant({
   if (noSideNumberProvided)
     sideNumber = 1;
   if (![1, 2].includes(sideNumber))
-    return { error: INVALID_VALUES, sideNumber };
-  const { matchUp, structure } = findMatchUp$1({
+    return decorateResult({
+      result: { error: INVALID_VALUES, context: { sideNumber } }
+    });
+  const { matchUp, structure } = findDrawMatchUp({
     drawDefinition,
     matchUpId,
     event
@@ -55245,7 +55309,7 @@ function removeMatchUpSideParticipant({
     return { error: MISSING_VALUE };
   if (![1, 2].includes(sideNumber))
     return { error: INVALID_VALUES, sideNumber };
-  const { matchUp, structure } = findMatchUp$1({
+  const { matchUp, structure } = findDrawMatchUp({
     drawDefinition,
     matchUpId,
     event
@@ -55328,27 +55392,13 @@ function replaceTieMatchUpParticipantId(params) {
     return { error: INVALID_PARTICIPANT, info: "Gender mismatch" };
   }
   const substitutionProcessCodes = matchUpActionsPolicy?.processCodes?.substitution;
-  const { extension } = findExtension$2({
-    element: drawDefinition,
-    name: LINEUPS
+  ensureSideLineUps({
+    tournamentId: tournamentRecord.tournamentId,
+    eventId: event.eventId,
+    inContextDualMatchUp,
+    drawDefinition,
+    dualMatchUp
   });
-  const lineUps = extension?.value || {};
-  if (!dualMatchUp?.sides?.length) {
-    const extractSideDetail = ({
-      displaySideNumber,
-      drawPosition,
-      sideNumber
-    }) => ({ drawPosition, sideNumber, displaySideNumber });
-    if (dualMatchUp) {
-      dualMatchUp.sides = inContextDualMatchUp?.sides?.map((side2) => {
-        const participantId = side2.participantId;
-        return {
-          ...extractSideDetail(side2),
-          lineUp: participantId && lineUps[participantId] || []
-        };
-      });
-    }
-  }
   const dualMatchUpSide = dualMatchUp?.sides?.find(
     ({ sideNumber }) => sideNumber === side.sideNumber
   );
@@ -55573,25 +55623,13 @@ function removeTieMatchUpParticipantId(params) {
     return decorateResult({ result: { error: INVALID_PARTICIPANT }, stack });
   }
   const participantIds = participantToRemove.participantType === INDIVIDUAL ? [participantId] : participantToRemove.individualParticipantIds;
-  if (!dualMatchUp?.sides?.length) {
-    const { extension } = findExtension$2({
-      element: drawDefinition,
-      name: LINEUPS
-    });
-    const lineUps = extension?.value || {};
-    const extractSideDetail = ({
-      displaySideNumber,
-      drawPosition,
-      sideNumber
-    }) => ({ drawPosition, sideNumber, displaySideNumber });
-    dualMatchUp.sides = inContextDualMatchUp?.sides?.map((side2) => {
-      const participantId2 = side2.participantId;
-      return {
-        ...extractSideDetail(side2),
-        lineUp: participantId2 && lineUps[participantId2] || []
-      };
-    });
-  }
+  ensureSideLineUps({
+    tournamentId: tournamentRecord.tournamentId,
+    eventId: event.eventId,
+    inContextDualMatchUp,
+    drawDefinition,
+    dualMatchUp
+  });
   let dualMatchUpSide = dualMatchUp.sides?.find(
     ({ sideNumber }) => sideNumber === side.sideNumber
   );
@@ -55611,8 +55649,9 @@ function removeTieMatchUpParticipantId(params) {
     );
   }
   if (!dualMatchUpSide) {
-    console.log({ teamParticipantId, teamParticipants });
-    return { error: PARTICIPANT_NOT_FOUND, participantId };
+    return decorateResult({
+      result: { error: PARTICIPANT_NOT_FOUND, context: { participantId } }
+    });
   }
   const { modifiedLineUp, previousParticipantIds } = removeCollectionAssignments({
     collectionPosition,
@@ -57824,7 +57863,7 @@ function substituteParticipant$1({
     return { error: MISSING_MATCHUP_ID };
   if (!existingParticipantId || !substituteParticipantId)
     return decorateResult({ result: { error: MISSING_PARTICIPANT_ID }, stack });
-  const { matchUp } = findMatchUp$1({
+  const { matchUp } = findDrawMatchUp({
     drawDefinition,
     matchUpId,
     event
@@ -58442,7 +58481,7 @@ function applyLineUps({
     return { error: INVALID_VALUES, lineUps };
   const stack = "applyLineUps";
   const tournamentParticipants = tournamentRecord.participants || [];
-  let result = findMatchUp$1({
+  let result = findDrawMatchUp({
     tournamentParticipants,
     inContext: true,
     drawDefinition,
@@ -58547,7 +58586,7 @@ function applyLineUps({
   }
   if (!Object.keys(sideAssignments).length)
     return { error: VALUE_UNCHANGED };
-  result = findMatchUp$1({ drawDefinition, matchUpId });
+  result = findDrawMatchUp({ drawDefinition, matchUpId });
   if (result.error)
     return result;
   if (!result.matchUp)
@@ -64871,6 +64910,7 @@ const utilities = {
   unique,
   UUID,
   UUIDS,
+  validateCategory,
   validateTieFormat,
   visualizeScheduledMatchUps
 };