tods-competition-factory - npm Package Compare versions

Comparing version 0.1.21 to 0.1.22

package.json

@@ -10,3 +10,3 @@ {
   ],
-  "version": "0.1.21",
+  "version": "0.1.22",
   "license": "MIT",
@@ -56,3 +56,3 @@ "private": false,
     "@babel/preset-typescript": "7.10.4",
-    "@types/jest": "26.0.13",
+    "@types/jest": "26.0.14",
     "eslint-config-prettier": "6.11.0",
@@ -59,0 +59,0 @@ "eslint-plugin-jest": "24.0.1",

src/drawEngine/governors/scoreGovernor/index.js

 import { analyzeSet } from './analyzeSet';
 import { analyzeMatchUp } from './analyzeMatchUp';
 import { tallyBracket } from './roundRobinTally';
+import { generateScoreString } from './generateScoreString';
 import { getSetComplement, getTiebreakComplement } from './getComplement';
@@ -8,8 +9,9 @@
   analyzeSet,
+  tallyBracket,
   analyzeMatchUp,
   getSetComplement,
+  generateScoreString,
   getTiebreakComplement,
-  tallyBracket,
 };
 
 export default scoreGovernor;

src/tournamentEngine/generators/tournamentRecordTemplate.js

@@ -1,3 +0,3 @@
-export const tournamentRecordTemplate = () => ({
-  tournamentId: null,
+export const tournamentRecordTemplate = ({ tournamentId }) => ({
+  tournamentId,
   tournamentRank: null,
@@ -32,4 +32,13 @@ tournamentCategories: [],
   },
+
+  unifiedTournamentId: {
+    tournamentId,
+    organisation: {
+      organisationId: null,
+      organisationName: null,
+      organisationAbbreviation: null,
+    },
+  },
 });
 
 export default tournamentRecordTemplate;

src/tournamentEngine/getters/matchUpsGetter.js

@@ -10,3 +10,5 @@ import { makeDeepCopy } from '../../utilities/makeDeepCopy';
 }) {
-  const { tournamentId } = tournamentRecord;
+  const tournamentId =
+    tournamentRecord.unifiedTournamentId?.tournamentId ||
+    tournamentRecord.tournamentId;
   const events = tournamentRecord?.events || [];
@@ -59,3 +61,5 @@ const participants = getParticipants({ tournamentRecord });
 }) {
-  const { tournamentId } = tournamentRecord;
+  const tournamentId =
+    tournamentRecord.unifiedTournamentId?.tournamentId ||
+    tournamentRecord.tournamentId;
   const events = (tournamentRecord && tournamentRecord.events) || [];
@@ -62,0 +66,0 @@ const participants = getParticipants({ tournamentRecord });

src/tournamentEngine/index.js

@@ -23,3 +23,3 @@ import { UUID } from '../utilities';
   if (!props.tournamentId) Object.assign(props, { tournamentId: UUID() });
-  const template = definitionTemplate();
+  const template = definitionTemplate(props);
   return Object.assign({}, template, props);
@@ -34,8 +34,7 @@ }
   if (typeof tournament !== 'object') return { error: 'Invalid Object' };
-  if (!tournament.tournamentId) return { error: 'Missing tournamentId' };
+  const tournamentId =
+    tournament.unifiedTournamentId?.tournamentId || tournament.tournamentId;
+  if (!tournamentId) return { error: 'Missing tournamentId' };
   tournamentRecord = makeDeepCopy(tournament);
-  return Object.assign(
-    { tournamentId: tournamentRecord.tournamentId },
-    SUCCESS
-  );
+  return Object.assign({ tournamentId }, SUCCESS);
 }
@@ -57,6 +56,4 @@
       tournamentRecord = newTournamentRecord(props);
-      return Object.assign(
-        { tournamentId: tournamentRecord.tournamentId },
-        SUCCESS
-      );
+      const tournamentId = tournamentRecord.unifiedTournamentId?.tournamentId;
+      return Object.assign({ tournamentId }, SUCCESS);
     },
@@ -63,0 +60,0 @@ };

src/tournamentEngine/tests/integration/scheduling.test.js

@@ -101,3 +101,5 @@ import { tournamentEngine } from '../../../tournamentEngine';
   let tournamentRecord = tournamentEngine.getState();
-  const { tournamentId } = tournamentRecord;
+  const tournamentId =
+    tournamentRecord.unifiedTournamentId?.tournamentId ||
+    tournamentRecord.tournamentId;
   let tournamentRecords = { [tournamentId]: tournamentRecord };
@@ -104,0 +106,0 @@

No alert changes

Improved metrics

Total package byte prevSize

4240842

increased by0.27%

Number of package files

274

increased by0.74%

Lines of code

63274

increased by0.34%

No dependency changes