tods-competition-factory 1.7.5 → 1.7.7

package/dist/forge/query.mjs

@@ -3833,7 +3833,7 @@ const WIN_RATIO = "winRatio";
 const POLICY_COMPETITIVE_BANDS_DEFAULT = {
   [POLICY_TYPE_COMPETITIVE_BANDS]: {
     policyName: "Competitive Bands Default",
-    competitiveProfile: {
+    profileBands: {
       [DECISIVE]: 20,
       [ROUTINE]: 50
     }
@@ -4891,7 +4891,8 @@ function resolveTieFormat({
 
 const add = (a, b) => (a || 0) + (b || 0);
 function getBand(spread, bandProfiles) {
-  return isNaN(spread) && WALKOVER || spread <= bandProfiles[DECISIVE] && DECISIVE || spread <= bandProfiles[ROUTINE] && ROUTINE || COMPETITIVE;
+  const spreadValue = Array.isArray(spread) ? spread[0] : spread;
+  return isNaN(spreadValue) && WALKOVER || spreadValue <= bandProfiles[DECISIVE] && DECISIVE || spreadValue <= bandProfiles[ROUTINE] && ROUTINE || COMPETITIVE;
 }
 function getScoreComponents({ score }) {
   const sets = score?.sets || [];
@@ -4922,11 +4923,11 @@ function gamesPercent(scoreComponents) {
   return Math.round(minGames / maxGames * 100);
 }
 function pctSpread(pcts) {
-  return pcts.map(gamesPercent).sort().map((p) => p.toFixed(2));
+  return pcts.map(gamesPercent).sort().map((p) => parseFloat(p.toFixed(2)));
 }
 
-function getMatchUpCompetitiveness({
-  competitiveProfile,
+function getMatchUpCompetitiveProfile({
+  profileBands,
   tournamentRecord,
   matchUp
 }) {
@@ -4935,15 +4936,16 @@ function getMatchUpCompetitiveness({
   const { score, winningSide } = matchUp;
   if (!winningSide)
     return { error: INVALID_VALUES };
-  const policy = !competitiveProfile && tournamentRecord && findPolicy({
+  const policy = !profileBands && tournamentRecord && findPolicy({
     policyType: POLICY_TYPE_COMPETITIVE_BANDS,
     tournamentRecord
   }).policy;
-  const bandProfiles = competitiveProfile || policy?.competitiveProfile || POLICY_COMPETITIVE_BANDS_DEFAULT[POLICY_TYPE_COMPETITIVE_BANDS].competitiveProfile;
+  const bandProfiles = profileBands || policy?.profileBands || POLICY_COMPETITIVE_BANDS_DEFAULT[POLICY_TYPE_COMPETITIVE_BANDS].profileBands;
   const scoreComponents = getScoreComponents({ score });
   const spread = pctSpread([scoreComponents]);
   const competitiveness = getBand(spread, bandProfiles);
-  return { ...SUCCESS, competitiveness };
+  const pctSpreadValue = Array.isArray(spread) ? spread[0] : spread;
+  return { ...SUCCESS, competitiveness, pctSpread: pctSpreadValue };
 }
 
 function findMatchupFormatAverageTimes(params) {
@@ -6771,6 +6773,9 @@ function isAdHoc({ drawDefinition, structure }) {
 const POLICY_ROUND_NAMING_DEFAULT = {
   [POLICY_TYPE_ROUND_NAMING]: {
     policyName: "Round Naming Default",
+    namingConventions: {
+      round: "Round"
+    },
     abbreviatedRoundNamingMap: {
       // key is matchUpsCount for the round
       1: "F",
@@ -6810,6 +6815,9 @@ function getRoundContextProfile({
   const roundNamingMap = roundNamingPolicy?.roundNamingMap || defaultRoundNamingPolicy.roundNamingMap || {};
   const abbreviatedRoundNamingMap = roundNamingPolicy?.abbreviatedRoundNamingMap || defaultRoundNamingPolicy.abbreviatedRoundNamingMap || {};
   const roundNamePrefix = roundNamingPolicy?.affixes || defaultRoundNamingPolicy.affixes;
+  const roundNumberAffix = roundNamePrefix.roundNumber || defaultRoundNamingPolicy.affixes.roundNumber;
+  const namingConventions = roundNamingPolicy?.namingConventions || defaultRoundNamingPolicy.namingConventions;
+  const roundNameFallback = namingConventions.round;
   const stageInitial = stage && stage !== MAIN && stage[0];
   const stageConstants = roundNamingPolicy?.stageConstants;
   const stageConstant = stage && stageConstants?.[stage] || stageInitial;
@@ -6818,8 +6826,8 @@ function getRoundContextProfile({
     Object.assign(
       roundNamingProfile,
       ...roundProfileKeys.map((key) => {
-        const roundName = `Round ${key}`;
-        const abbreviatedRoundName = `R${key}`;
+        const roundName = `${roundNameFallback} ${key}`;
+        const abbreviatedRoundName = `${roundNumberAffix}${key}`;
         return { [key]: { roundName, abbreviatedRoundName } };
       })
     );
@@ -7167,7 +7175,7 @@ function getAllStructureMatchUps({
       ...collectionDefinition.category
     } : context?.category;
     const processCodes = matchUp.processCodes?.length && matchUp.processCodes || collectionDefinition?.processCodes?.length && collectionDefinition?.processCodes || structure?.processCodes?.length && structure?.processCodes || drawDefinition?.processCodes?.length && drawDefinition?.processCodes || event2?.processCodes?.length && event2?.processCodes || tournamentRecord?.processCodes;
-    const competitiveness = contextProfile?.withCompetitiveness && getMatchUpCompetitiveness({ ...contextContent, matchUp }).competitiveness;
+    const competitiveProfile = contextProfile?.withCompetitiveness && getMatchUpCompetitiveProfile({ ...contextContent, matchUp });
     const finishingPositionRange = matchUp.finishingPositionRange || additionalContext.finishingPositionRange;
     const onlyDefined = (obj) => definedAttributes(obj, void 0, true);
     const matchUpWithContext = {
@@ -7183,7 +7191,7 @@ function getAllStructureMatchUps({
         finishingPositionRange,
         abbreviatedRoundName,
         drawPositionsRange,
-        competitiveness,
+        competitiveProfile,
         structureName,
         stageSequence,
         drawPositions,
@@ -10334,8 +10342,8 @@ function getUpdatedSchedulingProfile({
 }
 
 function scheduledSortedMatchUps({
-  matchUps = [],
-  schedulingProfile
+  schedulingProfile,
+  matchUps = []
 }) {
   const profileHash = {};
   const getHash = ({ eventId, drawId, structureId, roundNumber }) => {