Merge pull request Sofie-Automation#1612 from tv2norge-collab/contribute/EAV-640

fix(LSG): make current segment timing consider partInstances

Author: ianshade

packages/live-status-gateway/src/topics/helpers/__tests__/segmentTiming.test.ts

@@ -0,0 +1,53 @@
+import { calculateSegmentTiming } from '../segmentTiming.js'
+import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part'
+import { DBPartInstance } from '@sofie-automation/corelib/dist/dataModel/PartInstance'
+import { protectString } from '@sofie-automation/corelib/dist/protectedString'
+
+function makeTestPart(id: string, expectedDuration: number): Partial<DBPart> {
+	return {
+		_id: protectString(`part_${id}`),
+		segmentId: protectString('segment_1'),
+		rundownId: protectString('rundown_1'),
+		untimed: false,
+		expectedDurationWithTransition: expectedDuration,
+	}
+}
+
+function makeTestPartInstance(id: string, partId: string, expectedDuration: number): Partial<DBPartInstance> {
+	return {
+		_id: protectString(`partInstance_${id}`),
+		part: makeTestPart(partId, expectedDuration) as DBPart,
+		rundownId: protectString('rundown_1'),
+		segmentId: protectString('segment_1'),
+		playlistActivationId: protectString('activation_1'),
+	}
+}
+
+describe('segmentTiming - calculateSegmentTiming', () => {
+	it('should use partInstance duration when available instead of original part duration', () => {
+		const parts = [makeTestPart('1', 5000), makeTestPart('2', 3000)]
+
+		// Create partInstances with modified durations
+		const partInstances = [makeTestPartInstance('1', '1', 6000), makeTestPartInstance('2', '2', 4000)]
+
+		const result = calculateSegmentTiming(undefined, partInstances as DBPartInstance[], parts as DBPart[])
+
+		// Should use the modified durations from partInstances (6000 + 4000), not the original (5000 + 3000)
+		expect(result.expectedDurationMs).toBe(10000)
+	})
+
+	it('should fall back to original part duration when no matching partInstance', () => {
+		const parts = [makeTestPart('1', 5000), makeTestPart('2', 3000), makeTestPart('3', 2000)]
+
+		// Only provide instances for parts 1 and 2, part 3 has no instance
+		const partInstances = [
+			makeTestPartInstance('1', '1', 6000), // modified from 5000
+			makeTestPartInstance('2', '2', 3000), // unchanged
+		]
+
+		const result = calculateSegmentTiming(undefined, partInstances as DBPartInstance[], parts as DBPart[])
+
+		// Should use: 6000 (instance) + 3000 (instance) + 2000 (original, no instance)
+		expect(result.expectedDurationMs).toBe(11000)
+	})
+})

packages/live-status-gateway/src/topics/helpers/segmentTiming.ts

@@ -4,6 +4,8 @@ import { DBPartInstance } from '@sofie-automation/corelib/dist/dataModel/PartIns
 import { SegmentCountdownType, SegmentTiming } from '@sofie-automation/live-status-gateway-api'
 import { CountdownType } from '@sofie-automation/blueprints-integration'
 import { assertNever } from '@sofie-automation/corelib/dist/lib'
+import { unprotectString } from '@sofie-automation/server-core-integration'
+import * as _ from 'underscore'
 
 export interface CurrentSegmentTiming extends SegmentTiming {
 	projectedEndTime: number
@@ -16,7 +18,7 @@ export function calculateCurrentSegmentTiming(
 	segmentPartInstances: DBPartInstance[],
 	segmentParts: DBPart[]
 ): CurrentSegmentTiming {
-	const segmentTiming = calculateSegmentTiming(segmentTimingInfo, segmentParts)
+	const segmentTiming = calculateSegmentTiming(segmentTimingInfo, segmentPartInstances, segmentParts)
 	const playedDurations = segmentPartInstances.reduce((sum, partInstance) => {
 		return (partInstance.timings?.duration ?? 0) + sum
 	}, 0)
@@ -38,11 +40,18 @@ export function calculateCurrentSegmentTiming(
 
 export function calculateSegmentTiming(
 	segmentTimingInfo: SegmentTimingInfo | undefined,
+	segmentPartInstances: DBPartInstance[],
 	segmentParts: DBPart[]
 ): SegmentTiming {
+	// This might be a premature optimization, at least when the number of partInstances is reasonable.
+	// Should we consider a separate path dependent on the length of the array?
+	const partInstancesByPartId: Record<string, DBPartInstance> = _.indexBy(segmentPartInstances, (partInstance) =>
+		unprotectString(partInstance.part._id)
+	)
 	return {
 		budgetDurationMs: segmentTimingInfo?.budgetDuration,
 		expectedDurationMs: segmentParts.reduce<number>((sum, part): number => {
+			part = partInstancesByPartId[unprotectString(part._id)]?.part ?? part
 			return part.expectedDurationWithTransition != null && !part.untimed
 				? sum + part.expectedDurationWithTransition
 				: sum

packages/live-status-gateway/src/topics/segmentsTopic.ts

@@ -41,7 +41,7 @@ export class SegmentsTopic extends WebSocketTopicBase implements WebSocketTopic
 					id: segmentId,
 					rundownId: unprotectString(segment.rundownId),
 					name: segment.name,
-					timing: calculateSegmentTiming(segment.segmentTiming, this._partsBySegment[segmentId] ?? []),
+					timing: calculateSegmentTiming(segment.segmentTiming, [], this._partsBySegment[segmentId] ?? []), // TODO: this might be inaccurate for the current/next segment, where partInstances might have some changes from adlib actions etc.
 					identifier: segment.identifier,
 					publicData: segment.publicData,
 				}