tods-competition-factory 1.8.18 → 1.8.19

package/dist/forge/generate.mjs

@@ -9454,8 +9454,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 };
@@ -10654,8 +10654,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) {
@@ -10670,13 +10670,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
@@ -11493,10 +11492,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("|");
@@ -15973,7 +15972,7 @@ const toBePlayed = {
   winningSide: void 0
 };
 
-function findMatchUp({
+function findDrawMatchUp({
   tournamentParticipants,
   afterRecoveryTimes,
   contextContent,
@@ -16035,7 +16034,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
@@ -16064,7 +16063,7 @@ function modifyMatchUpScore({
   if (removeWinningSide)
     matchUp.winningSide = void 0;
   if (!structure && drawDefinition) {
-    ({ structure } = findMatchUp({
+    ({ structure } = findDrawMatchUp({
       drawDefinition,
       matchUpId,
       event
@@ -16219,6 +16218,48 @@ function drawPositionsAssignedParticipantIds({ structure, matchUp }) {
   return assignedParticipantIds?.length === 2;
 }
 
+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
+    });
+  }
+}
+
 const typeMatch = (arr, type) => arr.filter(Boolean).every((i) => typeof i === type);
 const allNumeric = (arr) => arr.filter(Boolean).every(isNumeric);
 function getCategoryAgeDetails(params) {
@@ -16390,28 +16431,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
   );
@@ -17007,7 +17073,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
@@ -17051,7 +17117,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)
@@ -17059,6 +17125,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
@@ -21040,7 +21112,7 @@ function setMatchUpFormat(params) {
     return { error: UNRECOGNIZED_MATCHUP_FORMAT };
   const stack = "setMatchUpFormat";
   if (matchUpId) {
-    const result = findMatchUp({
+    const result = findDrawMatchUp({
       drawDefinition,
       matchUpId,
       event