Fix get.currentRound() when BYE decided (#245)

Author: Drarig29

src/get.ts

@@ -112,7 +112,7 @@ export class Get extends BaseGetter {
         const matchesByRound = helpers.splitBy(matches, 'round_id');
 
         for (const roundMatches of matchesByRound) {
-            if (roundMatches.every(match => match.status >= Status.Completed))
+            if (roundMatches.every(match => helpers.isMatchStale(match)))
                 continue;
 
             const round = await this.storage.select('round', roundMatches[0].round_id);

test/get.spec.js

@@ -59,6 +59,38 @@ describe('Get child games', () => {
     });
 });
 
+describe('Get current round', () => {
+
+    beforeEach(() => {
+        storage.reset();
+    });
+
+    it('should skip a round decided by BYEs when getting the current round', async () => {
+        const stage = await manager.create.stage({
+            name: 'Some Title',
+            tournamentId: 0,
+            type: 'single_elimination',
+            seeding: ['P1', 'P2', 'P3', null],
+            settings: {
+                grandFinal: 'simple',
+                balanceByes: true,
+                matchesChildCount: 3,
+            },
+        });
+
+        assert.strictEqual((await manager.get.currentRound(stage.id)).number, 1);
+        assert.deepEqual((await manager.get.currentMatches(stage.id)).map(match => match.round_id), [0]);
+
+        await manager.update.match({ id: 1, opponent1: { result: 'win' } });
+
+        const currentRound = await manager.get.currentRound(stage.id);
+        const currentMatches = await manager.get.currentMatches(stage.id);
+
+        assert.strictEqual(currentRound.number, 2);
+        assert.deepEqual(currentMatches.map(match => match.round_id), [currentRound.id]);
+    });
+});
+
 describe('Get final standings', () => {
 
     beforeEach(() => {

test/unit/get.spec.js

@@ -61,6 +61,16 @@ describe('Unit - get', () => {
                 [{ stage_id: 2, round_id: 0, status: Status.Completed }, { stage_id: 2, round_id: 0, status: Status.Completed }, { stage_id: 2, round_id: 1, status: Status.Waiting }],
                 { stage_id: 2, id: 1 },
             ],
+            [
+                'two rounds, with 1st round decided by completed matches and BYEs',
+                [{ stage_id: 2, id: 0 }, { stage_id: 2, id: 1 }],
+                [
+                    { stage_id: 2, round_id: 0, status: Status.Locked, opponent1: { id: 0 }, opponent2: null },
+                    { stage_id: 2, round_id: 0, status: Status.Completed },
+                    { stage_id: 2, round_id: 1, status: Status.Ready },
+                ],
+                { stage_id: 2, id: 1 },
+            ],
             [
                 'two stages, with all matches completed',
                 [{ stage_id: 2, id: 0 }, { stage_id: 2, id: 1 }],