fix: 🐛 attach tieFormat to added qualifying structures

CourtHive · Nov 28, 2024 · a76e784 · a76e784
1 parent f79c3d6
commit a76e784
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 7 deletions.
diff --git a/src/assemblies/generators/drawDefinitions/drawTypes/generateQualifyingStructures.ts b/src/assemblies/generators/drawDefinitions/drawTypes/generateQualifyingStructures.ts
@@ -4,26 +4,38 @@ import { decorateResult } from '@Functions/global/decorateResult';
 import { coerceEven, isConvertableInteger } from '@Tools/math';
 import { addExtension } from '@Mutate/extensions/addExtension';
 import { generateRoundRobin } from './roundRobin/roundRobin';
-import { treeMatchUps } from './eliminationTree';
 import { constantToString } from '@Tools/strings';
+import { treeMatchUps } from './eliminationTree';
 
 // constants and types
 import { POSITION, QUALIFYING, ROUND_ROBIN, WINNER } from '@Constants/drawDefinitionConstants';
 import { MISSING_DRAW_SIZE } from '@Constants/errorConditionConstants';
-import { DrawLink, Structure } from '@Types/tournamentTypes';
+import { DrawLink, Structure, TieFormat } from '@Types/tournamentTypes';
+import { PolicyDefinitions, ResultType } from '@Types/factoryTypes';
 import { ROUND_TARGET } from '@Constants/extensionConstants';
 import { SUCCESS } from '@Constants/resultConstants';
-import { ResultType } from '@Types/factoryTypes';
+
+type GenerateQualifyingStructuresArgs = {
+  hasExistingDrawDefinition?: boolean;
+  appliedPolicies?: PolicyDefinitions;
+  qualifyingProfiles: any[];
+  qualifyingOnly?: boolean;
+  tieFormat?: TieFormat;
+  idPrefix?: string;
+  isMock?: boolean;
+  uuids?: string[];
+};
 
 export function generateQualifyingStructures({
+  hasExistingDrawDefinition,
   qualifyingProfiles,
   appliedPolicies,
   qualifyingOnly,
   tieFormat,
   idPrefix,
   isMock,
   uuids,
-}): ResultType & {
+}: GenerateQualifyingStructuresArgs): ResultType & {
   qualifyingDrawPositionsCount?: number;
   structures?: Structure[];
   qualifiersCount?: number;
@@ -115,6 +127,7 @@ export function generateQualifyingStructures({
           structureName: structureProfile.structureName || qualifyingStructureName,
           structureId: structureId || uuids?.pop(),
           qualifyingRoundNumber: roundLimit,
+          hasExistingDrawDefinition,
           stage: QUALIFYING,
           qualifyingOnly,
           matchUpFormat,

diff --git a/...mblies/generators/drawDefinitions/generateDrawDefinition/processExistingDrawDefinition.ts b/...mblies/generators/drawDefinitions/generateDrawDefinition/processExistingDrawDefinition.ts
@@ -28,6 +28,7 @@ export function processExistingDrawDefinition(params): ResultType & {
   const qualifyingProfiles = params.qualifyingProfiles;
   const qualifyingResult = qualifyingProfiles?.length
     ? generateQualifyingStructures({
+        hasExistingDrawDefinition: true,
         uuids: params.uuids,
         qualifyingProfiles,
         appliedPolicies,

diff --git a/src/assemblies/generators/drawDefinitions/generateDrawDefinition/qualifyingGeneration.ts b/src/assemblies/generators/drawDefinitions/generateDrawDefinition/qualifyingGeneration.ts
@@ -13,9 +13,9 @@ import { ResultType } from '@Types/factoryTypes';
 export function qualifyingGeneration(params): ResultType & { qualifyingConflicts?: any[] } {
   const {
     qualifyingPlaceholder,
-    qualifyingProfiles,
     existingDrawDefinition,
     positioningReports,
+    qualifyingProfiles,
     appliedPolicies,
     qualifyingOnly,
     drawDefinition,

diff --git a/src/assemblies/generators/templates/structureTemplate.ts b/src/assemblies/generators/templates/structureTemplate.ts
@@ -7,6 +7,7 @@ import { ROUND_OUTCOME } from '@Constants/drawDefinitionConstants';
 import { SeedingProfile } from '@Types/factoryTypes';
 
 type StructureTemplateArgs = {
+  hasExistingDrawDefinition?: boolean;
   seedAssignments?: SeedAssignment[];
   qualifyingRoundNumber?: number;
   structureAbbreviation?: string;
@@ -31,6 +32,7 @@ type StructureTemplateArgs = {
 
 export const structureTemplate = ({
   finishingPosition = ROUND_OUTCOME,
+  hasExistingDrawDefinition,
   qualifyingRoundNumber,
   structureAbbreviation,
   seedAssignments = [],
@@ -61,9 +63,9 @@ export const structureTemplate = ({
     structureName,
   };
 
+  if (qualifyingOnly || (hasExistingDrawDefinition && tieFormat)) structure.tieFormat = tieFormat;
   if (structureOrder) structure.structureOrder = structureOrder;
   if (structureType) structure.structureType = structureType;
-  if (qualifyingOnly) structure.tieFormat = tieFormat;
   if (seedingProfile) {
     if (typeof seedingProfile === 'string') {
       structure.seedingProfile = seedingProfile;

diff --git a/src/tests/mutations/drawDefinitions/primitives/firstMatchLoserConsolation.ts b/src/tests/mutations/drawDefinitions/primitives/firstMatchLoserConsolation.ts
@@ -9,8 +9,9 @@ import { attachPolicies } from '@Mutate/extensions/policies/attachPolicies';
 import { getDrawStructures } from '@Acquire/findStructure';
 import { generateRange } from '@Tools/arrays';
 
-import SEEDING_POLICY from '@Fixtures/policies/POLICY_SEEDING_ITF';
+// Constants and Fixtures
 import { MAIN, FIRST_MATCH_LOSER_CONSOLATION, CONSOLATION } from '@Constants/drawDefinitionConstants';
+import SEEDING_POLICY from '@Fixtures/policies/POLICY_SEEDING_ITF';
 
 // NOTE: replace all other occurrences of this function with this one