cpvalente/ontime
1
0
Fork 0
mirror of https://github.com/cpvalente/ontime.git synced 2026-08-14 11:53:49 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

refactor: clarify responsabilities

Browse Source
This commit is contained in:
Carlos Valente
2023-11-30 21:35:09 +01:00
parent a67b89190d
commit 34e9b1ef07
4 changed files with 94 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/server/src/services/__tests__/timerUtils.test.ts
+59 -43
View File
@@ -1,8 +1,7 @@
import { dayInMs } from 'ontime-utils';
import { TimerType } from 'ontime-types';
import { getCurrent, getExpectedFinish, skipedOutOfEvent } from '../timerUtils.js';
import { config } from '../../config/config.js';
import { getCurrent, getExpectedFinish, skippedOutOfEvent } from '../timerUtils.js';
describe('getExpectedFinish()', () => {
it('is null if we havent started', () => {
@@ -356,88 +355,105 @@ describe('getExpectedFinish() and getCurrentTime() combined', () => {
});
});
describe('skipedOutOfEvent()', () => {
it('normal roll out of event', () => {
describe('skippedOutOfEvent()', () => {
const testSkipLimit = 32;
it('does not consider an event end as a skip', () => {
const startedAt = 1000;
const duration = 1000;
const expectedFinish = startedAt + duration;
const previousTime = expectedFinish - config.timeSkipLimit / 2;
const previousTime = expectedFinish - testSkipLimit / 2;
let clock = previousTime;
expect(skipedOutOfEvent(previousTime, clock, startedAt, expectedFinish)).toBe(false);
clock += config.timeSkipLimit;
expect(skipedOutOfEvent(previousTime, clock, startedAt, expectedFinish)).toBe(false);
expect(skippedOutOfEvent(previousTime, clock, startedAt, expectedFinish, testSkipLimit)).toBe(false);
clock += testSkipLimit;
expect(skippedOutOfEvent(previousTime, clock, startedAt, expectedFinish, testSkipLimit)).toBe(false);
});
it('normal roll backwards out of event', () => {
it('allows rolling backwards in an event', () => {
const startedAt = 1000;
const duration = 1000;
const expectedFinish = startedAt + duration;
const previousTime = startedAt + config.timeSkipLimit / 2;
const previousTime = startedAt + testSkipLimit / 2;
let clock = previousTime;
expect(skipedOutOfEvent(previousTime, clock, startedAt, expectedFinish)).toBe(false);
clock -= config.timeSkipLimit;
expect(skipedOutOfEvent(previousTime, clock, startedAt, expectedFinish)).toBe(false);
expect(skippedOutOfEvent(previousTime, clock, startedAt, expectedFinish, testSkipLimit)).toBe(false);
clock -= testSkipLimit;
expect(skippedOutOfEvent(previousTime, clock, startedAt, expectedFinish, testSkipLimit)).toBe(false);
});
it('normal roll out of event over midnight', () => {
const startedAt = dayInMs - config.timeSkipLimit;
it('accounts for crossing midnight', () => {
const startedAt = dayInMs - testSkipLimit;
const expectedFinish = 10;
const previousTime = dayInMs - 1;
let clock = previousTime;
expect(skipedOutOfEvent(previousTime, clock, startedAt, expectedFinish)).toBe(false);
clock = config.timeSkipLimit - 2;
expect(skipedOutOfEvent(previousTime, clock, startedAt, expectedFinish)).toBe(false);
expect(skippedOutOfEvent(previousTime, clock, startedAt, expectedFinish, testSkipLimit)).toBe(false);
clock = testSkipLimit - 2;
expect(skippedOutOfEvent(previousTime, clock, startedAt, expectedFinish, testSkipLimit)).toBe(false);
});
it('normal roll backwards out of event over midnight', () => {
const startedAt = dayInMs - config.timeSkipLimit;
it('allows rolling backwards in an event across midnight', () => {
const startedAt = dayInMs - testSkipLimit;
const expectedFinish = 10;
const previousTime = startedAt + 1;
let clock = previousTime;
expect(skipedOutOfEvent(previousTime, clock, startedAt, expectedFinish)).toBe(false);
clock -= config.timeSkipLimit;
expect(skipedOutOfEvent(previousTime, clock, startedAt, expectedFinish)).toBe(false);
expect(skippedOutOfEvent(previousTime, clock, startedAt, expectedFinish, testSkipLimit)).toBe(false);
clock -= testSkipLimit;
expect(skippedOutOfEvent(previousTime, clock, startedAt, expectedFinish, testSkipLimit)).toBe(false);
});
it('skip out of event', () => {
it('finds skip forwards out of event', () => {
const startedAt = 1000;
const duration = 1000;
const expectedFinish = startedAt + duration;
const previousTime = expectedFinish - config.timeSkipLimit / 2;
const previousTime = expectedFinish - testSkipLimit / 2;
let clock = previousTime;
expect(skipedOutOfEvent(previousTime, clock, startedAt, expectedFinish)).toBe(false);
clock += config.timeSkipLimit + 1;
expect(skipedOutOfEvent(previousTime, clock, startedAt, expectedFinish)).toBe(true);
expect(skippedOutOfEvent(previousTime, clock, startedAt, expectedFinish, testSkipLimit)).toBe(false);
clock += testSkipLimit + 1;
expect(skippedOutOfEvent(previousTime, clock, startedAt, expectedFinish, testSkipLimit)).toBe(true);
});
it('skip backwards out of event', () => {
it('finds skip backwards out of event', () => {
const startedAt = 1000;
const duration = 1000;
const expectedFinish = startedAt + duration;
const previousTime = startedAt + config.timeSkipLimit / 2;
const previousTime = startedAt + testSkipLimit / 2;
let clock = previousTime;
expect(skipedOutOfEvent(previousTime, clock, startedAt, expectedFinish)).toBe(false);
clock -= config.timeSkipLimit + 1;
expect(skipedOutOfEvent(previousTime, clock, startedAt, expectedFinish)).toBe(true);
expect(skippedOutOfEvent(previousTime, clock, startedAt, expectedFinish, testSkipLimit)).toBe(false);
clock -= testSkipLimit + 1;
expect(skippedOutOfEvent(previousTime, clock, startedAt, expectedFinish, testSkipLimit)).toBe(true);
});
it('skip out of event over midnight', () => {
const startedAt = dayInMs - config.timeSkipLimit;
it('finds skip forwards out of event across midnight', () => {
const startedAt = dayInMs - testSkipLimit;
const expectedFinish = 10;
const previousTime = dayInMs - 3;
let clock = previousTime;
expect(skipedOutOfEvent(previousTime, clock, startedAt, expectedFinish)).toBe(false);
clock = config.timeSkipLimit - 2;
expect(skipedOutOfEvent(previousTime, clock, startedAt, expectedFinish)).toBe(true);
expect(skippedOutOfEvent(previousTime, clock, startedAt, expectedFinish, testSkipLimit)).toBe(false);
clock = testSkipLimit - 2;
expect(skippedOutOfEvent(previousTime, clock, startedAt, expectedFinish, testSkipLimit)).toBe(true);
});
it('skip backwards out of event over midnight', () => {
const startedAt = dayInMs - config.timeSkipLimit;
it('finds skip backwards out of event across midnight', () => {
const startedAt = dayInMs - testSkipLimit;
const expectedFinish = 10;
const previousTime = startedAt + 1;
let clock = previousTime;
expect(skipedOutOfEvent(previousTime, clock, startedAt, expectedFinish)).toBe(false);
clock -= config.timeSkipLimit + 1;
expect(skipedOutOfEvent(previousTime, clock, startedAt, expectedFinish)).toBe(true);
expect(skippedOutOfEvent(previousTime, clock, startedAt, expectedFinish, testSkipLimit)).toBe(false);
clock -= testSkipLimit + 1;
expect(skippedOutOfEvent(previousTime, clock, startedAt, expectedFinish, testSkipLimit)).toBe(true);
});
});