tods-competition-factory 1.8.9 → 1.8.11

package/dist/forge/generate.mjs

@@ -695,10 +695,6 @@ const INVALID_SCALE_ITEM = {
   message: "Invalid scaleItem",
   code: "ERR_INVALID_SCALE_ITEM"
 };
-const SCALE_ITEM_NOT_FOUND = {
-  message: "No scaleItem found",
-  code: "ERR_NOT_FOUND_SCALE_ITEM"
-};
 const NO_CANDIDATES = {
   message: "No Candidates",
   code: "ERR_UNCHANGED_NO_CANDIDATES"
@@ -1383,7 +1379,7 @@ function getPolicyDefinitions({
     if (policy)
       policyDefinitions[policyType] = policy;
   }
-  return Object.keys(policyDefinitions).length ? { policyDefinitions } : { error: POLICY_NOT_FOUND };
+  return Object.keys(policyDefinitions).length ? { policyDefinitions } : { info: POLICY_NOT_FOUND.message };
 }
 
 const WALKOVER = "WALKOVER";
@@ -1444,7 +1440,7 @@ function findPolicy({
     structure,
     event
   });
-  return appliedPolicies?.[policyType] ? { policy: appliedPolicies[policyType] } : { error: POLICY_NOT_FOUND };
+  return appliedPolicies?.[policyType] ? { policy: appliedPolicies[policyType] } : { info: POLICY_NOT_FOUND?.message };
 }
 
 const POLICY_TYPE_COMPETITIVE_BANDS = "competitiveBands";
@@ -17936,7 +17932,7 @@ function participantScaleItem({
     return { error: INVALID_VALUES };
   if (!participant.timeItems)
     participant.timeItems = [];
-  if (participant && Array.isArray(participant.timeItems)) {
+  if (Array.isArray(participant.timeItems)) {
     const { accessor, scaleType, eventType, scaleName } = scaleAttributes;
     const filterType = [SCALE, scaleType, eventType, scaleName].join(".");
     const filteredTimeItems = participant.timeItems.filter((timeItem2) => timeItem2?.itemType === filterType).filter((timeItem2) => !requireTimeStamp || timeItem2?.itemDate).sort(
@@ -17956,12 +17952,10 @@ function participantScaleItem({
         scaleName: scaleName2,
         scaleType: scaleType2
       };
-      return { scaleItem };
-    } else {
-      return { error: SCALE_ITEM_NOT_FOUND };
+      return { ...SUCCESS, scaleItem };
     }
   }
-  return { error: MISSING_PARTICIPANT };
+  return { ...SUCCESS, scaleItem: void 0 };
 }
 
 function getEventSeedAssignments({
@@ -18168,7 +18162,7 @@ function addStructureParticipation({
 
 function processSides(params) {
   const {
-    withScheduleTimes,
+    withScheduleItems,
     scheduleAnalysis,
     withTeamMatchUps,
     participantMap,
@@ -18278,7 +18272,7 @@ function processSides(params) {
           stage
         });
       }
-      if (scheduleAnalysis || withScheduleTimes) {
+      if (scheduleAnalysis || withScheduleItems) {
         addScheduleItem({
           participantMap,
           participantId: participantId2,
@@ -18424,7 +18418,6 @@ function getParticipantEntries(params) {
     participantMap,
     withPotentialMatchUps,
     withRankingProfile,
-    withScheduleTimes,
     withScheduleItems,
     scheduleAnalysis,
     withTeamMatchUps,
@@ -18435,8 +18428,6 @@ function getParticipantEntries(params) {
     withEvents,
     withDraws
   } = params;
-  if (withScheduleItems)
-    console.log({ withScheduleItems });
   const targetParticipantIds = participantFilters?.participantIds;
   const getRelevantParticipantIds = (participantId) => {
     const relevantParticipantIds = [participantId];
@@ -18454,7 +18445,7 @@ function getParticipantEntries(params) {
     withDraws: withDraws || withRankingProfile,
     withPotentialMatchUps,
     withRankingProfile,
-    withScheduleTimes,
+    withScheduleItems,
     scheduleAnalysis,
     withTeamMatchUps,
     withStatistics,
@@ -18774,7 +18765,7 @@ function getParticipantEntries(params) {
             matchUpType: matchUpType2
           });
         }
-        if (Array.isArray(potentialParticipants) && (nextMatchUps || !!scheduleAnalysis || withScheduleTimes)) {
+        if (Array.isArray(potentialParticipants) && (nextMatchUps || !!scheduleAnalysis || withScheduleItems)) {
           const potentialParticipantIds = potentialParticipants.flat().map(extractAttributes("participantId")).filter(Boolean);
           potentialParticipantIds?.forEach((participantId) => {
             const relevantParticipantIds = getRelevantParticipantIds(participantId);
@@ -18789,7 +18780,7 @@ function getParticipantEntries(params) {
                 drawId
               });
             });
-            if (!!scheduleAnalysis || withScheduleTimes) {
+            if (!!scheduleAnalysis || withScheduleItems) {
               addScheduleItem({
                 potential: true,
                 participantMap,
@@ -18898,13 +18889,18 @@ function getParticipantEntries(params) {
             const notBeforeTime = typeChange ? typeChangeTimeAfterRecovery || timeAfterRecovery : timeAfterRecovery;
             const sameDraw = scheduleItem.drawId === consideredItem.drawId;
             const bothPotential = potentialMatchUps[scheduleItem.matchUpId] && potentialMatchUps[consideredItem.matchUpId];
-            const nextMinutes = timeStringMinutes(consideredItem.scheduledTime);
-            const minutesDifference = Math.abs(nextMinutes - scheduledMinutes);
-            const timeOverlap = scheduledMinutesDifference && !isNaN(scheduledMinutesDifference) ? minutesDifference <= scheduledMinutesDifference : timeStringMinutes(notBeforeTime) > timeStringMinutes(consideredItem.scheduledTime);
-            if (timeOverlap && !(bothPotential && sameDraw)) {
+            const consideredMinutes = timeStringMinutes(
+              consideredItem.scheduledTime
+            );
+            const minutesDifference = Math.abs(
+              consideredMinutes - scheduledMinutes
+            );
+            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({
-                priorScheduledMatchUpId: consideredItem.matchUpId,
-                matchUpIdWithConflict: scheduleItem.matchUpId
+                priorScheduledMatchUpId: scheduleItem.matchUpId,
+                matchUpIdWithConflict: consideredItem.matchUpId
               });
             }
           }
@@ -19120,6 +19116,7 @@ function getParticipants(params) {
     ({
       potentialMatchUps,
       scheduleConflicts,
+      scheduleItems,
       participant,
       statistics,
       opponents,
@@ -19145,7 +19142,8 @@ function getParticipants(params) {
           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
+          statistics: withStatistics ? Object.values(statistics) : void 0,
+          scheduleItems: withScheduleItems ? scheduleItems : void 0
         },
         false,
         false,
@@ -23648,7 +23646,7 @@ function generateDrawDefinition(params) {
       drawDefinition.links = [];
     drawDefinition.links.push(link);
   }
-  drawDefinition.drawName = params.drawName ?? drawType;
+  drawDefinition.drawName = params.drawName ?? (drawType && constantToString(drawType));
   if (typeof voluntaryConsolation === "object") {
     addVoluntaryConsolationStructure({
       ...voluntaryConsolation,