From 0ea00ff6bed080f0ca07fc16dcba62ac5bf9c923 Mon Sep 17 00:00:00 2001 From: Carlos Valente Date: Fri, 24 Jan 2025 11:35:13 +0100 Subject: [PATCH] chore: remove unused code --- .../src/services/__tests__/timerUtils.test.ts | 37 +------------------ apps/server/src/services/timerUtils.ts | 20 ---------- 2 files changed, 1 insertion(+), 56 deletions(-) diff --git a/apps/server/src/services/__tests__/timerUtils.test.ts b/apps/server/src/services/__tests__/timerUtils.test.ts index e15bd33b6..7ce409369 100644 --- a/apps/server/src/services/__tests__/timerUtils.test.ts +++ b/apps/server/src/services/__tests__/timerUtils.test.ts @@ -1,4 +1,4 @@ -import { MILLIS_PER_HOUR, dayInMs, millisToString } from 'ontime-utils'; +import { dayInMs, millisToString } from 'ontime-utils'; import { EndAction, Playback, TimeStrategy, TimerPhase, TimerType } from 'ontime-types'; import { @@ -6,7 +6,6 @@ import { getExpectedFinish, getRuntimeOffset, getTimerPhase, - getTotalDuration, normaliseEndTime, skippedOutOfEvent, } from '../timerUtils.js'; @@ -1047,40 +1046,6 @@ describe('getRuntimeOffset()', () => { }); }); -describe('getTotalDuration()', () => { - it('calculates the duration of events in a single day', () => { - const start = MILLIS_PER_HOUR * 9; - const end = MILLIS_PER_HOUR * 17; - const daySpan = 0; - const duration = getTotalDuration(start, end, daySpan); - expect(duration).toBe(MILLIS_PER_HOUR * (17 - 9)); - }); - - it('calculates the duration of events across days', () => { - const start = MILLIS_PER_HOUR * 9; - const end = MILLIS_PER_HOUR * 17; - const daySpan = 1; - const duration = getTotalDuration(start, end, daySpan); - expect(duration).toBe(MILLIS_PER_HOUR * (17 - 9) + dayInMs); - }); - - it('calculates the duration of events across days (2)', () => { - const start = new Date(0).setHours(12); - const end = new Date(0).setHours(8); - const daySpan = 1; - const duration = getTotalDuration(start, end, daySpan); - expect(millisToString(duration)).toBe('20:00:00'); - }); - - it('calculates the duration of events across days (3)', () => { - const start = new Date(0).setHours(9); - const end = new Date(0).setHours(23); - const daySpan = 2; - const duration = getTotalDuration(start, end, daySpan); - expect(millisToString(duration)).toBe('62:00:00'); - }); -}); - describe('getTimerPhase()', () => { it('should be None if the timer is not running', () => { const state = { diff --git a/apps/server/src/services/timerUtils.ts b/apps/server/src/services/timerUtils.ts index 54f698a9b..8fd93a76f 100644 --- a/apps/server/src/services/timerUtils.ts +++ b/apps/server/src/services/timerUtils.ts @@ -156,26 +156,6 @@ export function getRuntimeOffset(state: RuntimeState): number { return startOffset - addedTime - pausedTime + overtime; } -/** - * Calculates total duration of a time span - * @param firstStart - * @param lastEnd - * @param daySpan - * @returns - */ -export function getTotalDuration(firstStart: number, lastEnd: number, daySpan: number): number { - if (!lastEnd) { - return 0; - } - let correctDay = 0; - if (lastEnd < firstStart) { - correctDay = dayInMs; - daySpan -= 1; - } - // eslint-disable-next-line prettier/prettier -- we like the clarity - return lastEnd + correctDay + daySpan * dayInMs - firstStart; -} - /** * Calculates the expected end of the rundown */