refactor(LSG): improve access modifier consistency

ianshade · ianshade · commit eae0cb1c4efe · 2025-02-13T11:52:11.000+01:00
diff --git a/packages/live-status-gateway/src/collections/adLibActionsHandler.ts b/packages/live-status-gateway/src/collections/adLibActionsHandler.ts
@@ -48,7 +48,7 @@ export class AdLibActionsHandler
 		}
 	}
 
-	protected updateAndNotify(): void {
+	private updateAndNotify(): void {
 		const col = this.getCollectionOrFail()
 		this._collectionData = col.find({ rundownId: this._currentRundownId })
 		this.notify(this._collectionData)
diff --git a/packages/live-status-gateway/src/collections/adLibsHandler.ts b/packages/live-status-gateway/src/collections/adLibsHandler.ts
@@ -27,7 +27,7 @@ export class AdLibsHandler
 		handlers.playlistHandler.subscribe(this.onPlaylistUpdate, PLAYLIST_KEYS)
 	}
 
-	changed(): void {
+	protected changed(): void {
 		this.updateAndNotify()
 	}
 
@@ -47,7 +47,7 @@ export class AdLibsHandler
 		}
 	}
 
-	protected updateAndNotify(): void {
+	private updateAndNotify(): void {
 		const collection = this.getCollectionOrFail()
 		this._collectionData = collection.find({ rundownId: this._currentRundownId })
 		this.notify(this._collectionData)
diff --git a/packages/live-status-gateway/src/collections/globalAdLibActionsHandler.ts b/packages/live-status-gateway/src/collections/globalAdLibActionsHandler.ts
@@ -36,7 +36,7 @@ export class GlobalAdLibActionsHandler
 		handlers.playlistHandler.subscribe(this.onPlaylistUpdate, PLAYLIST_KEYS)
 	}
 
-	changed(): void {
+	protected changed(): void {
 		this.updateAndNotify()
 	}
 
@@ -55,7 +55,7 @@ export class GlobalAdLibActionsHandler
 		}
 	}
 
-	protected updateAndNotify(): void {
+	private updateAndNotify(): void {
 		const collection = this.getCollectionOrFail()
 		this._collectionData = collection.find({ rundownId: this._currentRundownId })
 		this.notify(this._collectionData)
diff --git a/packages/live-status-gateway/src/collections/globalAdLibsHandler.ts b/packages/live-status-gateway/src/collections/globalAdLibsHandler.ts
@@ -31,7 +31,7 @@ export class GlobalAdLibsHandler
 		handlers.playlistHandler.subscribe(this.onPlaylistUpdate, PLAYLIST_KEYS)
 	}
 
-	changed(): void {
+	protected changed(): void {
 		this.updateAndNotify()
 	}
 
@@ -50,7 +50,7 @@ export class GlobalAdLibsHandler
 		}
 	}
 
-	protected updateAndNotify(): void {
+	private updateAndNotify(): void {
 		const collection = this.getCollectionOrFail()
 		this._collectionData = collection.find({ rundownId: this._currentRundownId })
 		this.notify(this._collectionData)
diff --git a/packages/live-status-gateway/src/collections/partHandler.ts b/packages/live-status-gateway/src/collections/partHandler.ts
@@ -34,7 +34,7 @@ export class PartHandler
 		handlers.partInstancesHandler.subscribe(this.onPartInstanceUpdate, PART_INSTANCES_KEYS)
 	}
 
-	changed(): void {
+	protected changed(): void {
 		const collection = this.getCollectionOrFail()
 		const allParts = collection.find(undefined)
 		this._partsHandler.setParts(allParts)
diff --git a/packages/live-status-gateway/src/collections/partInstancesHandler.ts b/packages/live-status-gateway/src/collections/partInstancesHandler.ts
@@ -59,7 +59,7 @@ export class PartInstancesHandler
 		handlers.playlistHandler.subscribe(this.onPlaylistUpdate, PLAYLIST_KEYS)
 	}
 
-	changed(): void {
+	protected changed(): void {
 		this._throttledUpdateAndNotify()
 	}
 
diff --git a/packages/live-status-gateway/src/collections/pieceInstancesHandler.ts b/packages/live-status-gateway/src/collections/pieceInstancesHandler.ts
@@ -76,7 +76,7 @@ export class PieceInstancesHandler
 		handlers.showStyleBaseHandler.subscribe(this.onShowStyleBaseUpdate, SHOW_STYLE_BASE_KEYS)
 	}
 
-	changed(): void {
+	protected changed(): void {
 		this.updateAndNotify()
 	}
 
diff --git a/packages/live-status-gateway/src/collections/playlistHandler.ts b/packages/live-status-gateway/src/collections/playlistHandler.ts
@@ -37,11 +37,11 @@ export class PlaylistHandler
 		this.setupSubscription(null, [this._studioId])
 	}
 
-	changed(): void {
+	protected changed(): void {
 		this.updateAndNotify()
 	}
 
-	protected updateAndNotify(): void {
+	private updateAndNotify(): void {
 		const collection = this.getCollectionOrFail()
 		const playlists = collection.find(undefined)
 		this._playlistsHandler.setPlaylists(playlists)
diff --git a/packages/live-status-gateway/src/collections/rundownHandler.ts b/packages/live-status-gateway/src/collections/rundownHandler.ts
@@ -30,11 +30,11 @@ export class RundownHandler
 		handlers.playlistHandler.subscribe(this.onPlaylistUpdate, PLAYLIST_KEYS)
 	}
 
-	changed(): void {
+	protected changed(): void {
 		this.updateAndNotify()
 	}
 
-	protected updateAndNotify(): void {
+	private updateAndNotify(): void {
 		const collection = this.getCollectionOrFail()
 		this._rundownsHandler?.setRundowns(collection.find(undefined))
 		if (this._currentRundownId) {
diff --git a/packages/live-status-gateway/src/collections/segmentHandler.ts b/packages/live-status-gateway/src/collections/segmentHandler.ts
@@ -35,7 +35,7 @@ export class SegmentHandler
 		handlers.partInstancesHandler.subscribe(this.onPartInstancesUpdate, PART_INSTANCES_KEYS)
 	}
 
-	changed(): void {
+	protected changed(): void {
 		this.updateAndNotify()
 	}
 
diff --git a/packages/live-status-gateway/src/collections/showStyleBaseHandler.ts b/packages/live-status-gateway/src/collections/showStyleBaseHandler.ts
@@ -34,7 +34,7 @@ export class ShowStyleBaseHandler
 		handlers.rundownHandler.subscribe(this.onRundownUpdate)
 	}
 
-	changed(): void {
+	protected changed(): void {
 		if (this._showStyleBaseId) {
 			this.updateCollectionData()
 			this.notify(this._collectionData)
diff --git a/packages/live-status-gateway/src/collections/studioHandler.ts b/packages/live-status-gateway/src/collections/studioHandler.ts
@@ -20,7 +20,7 @@ export class StudioHandler
 		this.setupSubscription([this._studioId])
 	}
 
-	changed(): void {
+	protected changed(): void {
 		const collection = this.getCollectionOrFail()
 		const studio = collection.findOne(this._studioId)
 		this._collectionData = studio
diff --git a/packages/live-status-gateway/src/topics/activePiecesTopic.ts b/packages/live-status-gateway/src/topics/activePiecesTopic.ts
@@ -54,13 +54,13 @@ export class ActivePiecesTopic extends WebSocketTopicBase implements WebSocketTo
 		this.sendMessage(subscribers, message)
 	}
 
-	protected onShowStyleBaseUpdate = (showStyleBase: ShowStyleBaseExt | undefined): void => {
+	private onShowStyleBaseUpdate = (showStyleBase: ShowStyleBaseExt | undefined): void => {
 		this.logUpdateReceived('showStyleBase')
 		this._showStyleBaseExt = showStyleBase
 		this.throttledSendStatusToAll()
 	}
 
-	protected onPlaylistUpdate = (rundownPlaylist: Playlist | undefined): void => {
+	private onPlaylistUpdate = (rundownPlaylist: Playlist | undefined): void => {
 		this.logUpdateReceived(
 			'playlist',
 			`rundownPlaylistId ${rundownPlaylist?._id}, activationId ${rundownPlaylist?.activationId}`
@@ -73,7 +73,7 @@ export class ActivePiecesTopic extends WebSocketTopicBase implements WebSocketTo
 		}
 	}
 
-	protected onPieceInstancesUpdate = (pieceInstances: PieceInstances | undefined): void => {
+	private onPieceInstancesUpdate = (pieceInstances: PieceInstances | undefined): void => {
 		this.logUpdateReceived('pieceInstances')
 		const prevPieceInstances = this._activePieceInstances
 		this._activePieceInstances = pieceInstances?.active
diff --git a/packages/live-status-gateway/src/topics/adLibsTopic.ts b/packages/live-status-gateway/src/topics/adLibsTopic.ts
@@ -245,31 +245,31 @@ export class AdLibsTopic extends WebSocketTopicBase implements WebSocketTopic {
 		this.throttledSendStatusToAll()
 	}
 
-	protected onAdLibActionsUpdate = (adLibActions: AdLibAction[] | undefined): void => {
+	private onAdLibActionsUpdate = (adLibActions: AdLibAction[] | undefined): void => {
 		this.logUpdateReceived('adLibActions')
 		this._adLibActions = adLibActions
 		this.throttledSendStatusToAll()
 	}
 
-	protected onAdLibsUpdate = (adLibs: AdLibPiece[] | undefined): void => {
+	private onAdLibsUpdate = (adLibs: AdLibPiece[] | undefined): void => {
 		this.logUpdateReceived('adLibs')
 		this._adLibs = adLibs
 		this.throttledSendStatusToAll()
 	}
 
-	protected onGlobalAdLibActionsUpdate = (adLibActions: RundownBaselineAdLibAction[] | undefined): void => {
+	private onGlobalAdLibActionsUpdate = (adLibActions: RundownBaselineAdLibAction[] | undefined): void => {
 		this.logUpdateReceived('globalAdLibActions')
 		this._globalAdLibActions = adLibActions
 		this.throttledSendStatusToAll()
 	}
 
-	protected onGlobalAdLibsUpdate = (adLibs: RundownBaselineAdLibItem[] | undefined): void => {
+	private onGlobalAdLibsUpdate = (adLibs: RundownBaselineAdLibItem[] | undefined): void => {
 		this.logUpdateReceived('globalAdLibs')
 		this._globalAdLibs = adLibs
 		this.throttledSendStatusToAll()
 	}
 
-	protected onSegmentsUpdate = (segments: DBSegment[] | undefined): void => {
+	private onSegmentsUpdate = (segments: DBSegment[] | undefined): void => {
 		this.logUpdateReceived('segments')
 		const newSegments = new Map()
 		segments ??= []
@@ -280,7 +280,7 @@ export class AdLibsTopic extends WebSocketTopicBase implements WebSocketTopic {
 		this.throttledSendStatusToAll()
 	}
 
-	protected onPartsUpdate = (parts: DBPart[] | undefined): void => {
+	private onPartsUpdate = (parts: DBPart[] | undefined): void => {
 		this.logUpdateReceived('parts')
 		const newParts = new Map()
 		parts ??= []
diff --git a/packages/live-status-gateway/src/topics/segmentsTopic.ts b/packages/live-status-gateway/src/topics/segmentsTopic.ts
@@ -73,13 +73,13 @@ export class SegmentsTopic extends WebSocketTopicBase implements WebSocketTopic
 		this.updateAndSendStatusToAll()
 	}
 
-	protected onSegmentsUpdate = (segments: DBSegment[] | undefined): void => {
+	private onSegmentsUpdate = (segments: DBSegment[] | undefined): void => {
 		this.logUpdateReceived('segments')
 		this._segments = segments ?? []
 		this.updateAndSendStatusToAll()
 	}
 
-	protected onPartsUpdate = (parts: DBPart[] | undefined): void => {
+	private onPartsUpdate = (parts: DBPart[] | undefined): void => {
 		this.logUpdateReceived('parts')
 		this._partsBySegment = _.groupBy(parts ?? [], 'segmentId')
 		this.updateAndSendStatusToAll()
diff --git a/packages/live-status-gateway/src/wsHandler.ts b/packages/live-status-gateway/src/wsHandler.ts
@@ -253,7 +253,7 @@ export abstract class PublicationCollection<
 		// override me
 	}
 
-	protected onDocumentEvent(id: ProtectedString<any> | string, changeType: string): void {
+	private onDocumentEvent(id: ProtectedString<any> | string, changeType: string): void {
 		this.logDocumentChange(id, changeType)
 		if (!this._subscriptionId) {
 			this._logger.silly(`${this._name} ${changeType} ${id} skipping (lack of subscription)`)
@@ -266,7 +266,7 @@ export abstract class PublicationCollection<
 		this.throttledChanged()
 	}
 
-	protected setupObserver(): void {
+	private setupObserver(): void {
 		this._dbObserver = this._coreHandler.setupObserver(this._collectionName)
 		this._dbObserver.added = (id) => {
 			this.onDocumentEvent(id, 'added')

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ export class AdLibActionsHandler`
`48`	`48`	`}`
`49`	`49`	`}`
`50`	`50`
`51`		`- protected updateAndNotify(): void {`
	`51`	`+ private updateAndNotify(): void {`
`52`	`52`	`const col = this.getCollectionOrFail()`
`53`	`53`	`this._collectionData = col.find({ rundownId: this._currentRundownId })`
`54`	`54`	`this.notify(this._collectionData)`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ export class AdLibsHandler`
`27`	`27`	`handlers.playlistHandler.subscribe(this.onPlaylistUpdate, PLAYLIST_KEYS)`
`28`	`28`	`}`
`29`	`29`
`30`		`- changed(): void {`
	`30`	`+ protected changed(): void {`
`31`	`31`	`this.updateAndNotify()`
`32`	`32`	`}`
`33`	`33`
`@@ -47,7 +47,7 @@ export class AdLibsHandler`
`47`	`47`	`}`
`48`	`48`	`}`
`49`	`49`
`50`		`- protected updateAndNotify(): void {`
	`50`	`+ private updateAndNotify(): void {`
`51`	`51`	`const collection = this.getCollectionOrFail()`
`52`	`52`	`this._collectionData = collection.find({ rundownId: this._currentRundownId })`
`53`	`53`	`this.notify(this._collectionData)`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ export class GlobalAdLibActionsHandler`
`36`	`36`	`handlers.playlistHandler.subscribe(this.onPlaylistUpdate, PLAYLIST_KEYS)`
`37`	`37`	`}`
`38`	`38`
`39`		`- changed(): void {`
	`39`	`+ protected changed(): void {`
`40`	`40`	`this.updateAndNotify()`
`41`	`41`	`}`
`42`	`42`
`@@ -55,7 +55,7 @@ export class GlobalAdLibActionsHandler`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`
`58`		`- protected updateAndNotify(): void {`
	`58`	`+ private updateAndNotify(): void {`
`59`	`59`	`const collection = this.getCollectionOrFail()`
`60`	`60`	`this._collectionData = collection.find({ rundownId: this._currentRundownId })`
`61`	`61`	`this.notify(this._collectionData)`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ export class GlobalAdLibsHandler`
`31`	`31`	`handlers.playlistHandler.subscribe(this.onPlaylistUpdate, PLAYLIST_KEYS)`
`32`	`32`	`}`
`33`	`33`
`34`		`- changed(): void {`
	`34`	`+ protected changed(): void {`
`35`	`35`	`this.updateAndNotify()`
`36`	`36`	`}`
`37`	`37`
`@@ -50,7 +50,7 @@ export class GlobalAdLibsHandler`
`50`	`50`	`}`
`51`	`51`	`}`
`52`	`52`
`53`		`- protected updateAndNotify(): void {`
	`53`	`+ private updateAndNotify(): void {`
`54`	`54`	`const collection = this.getCollectionOrFail()`
`55`	`55`	`this._collectionData = collection.find({ rundownId: this._currentRundownId })`
`56`	`56`	`this.notify(this._collectionData)`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ export class PartHandler`
`34`	`34`	`handlers.partInstancesHandler.subscribe(this.onPartInstanceUpdate, PART_INSTANCES_KEYS)`
`35`	`35`	`}`
`36`	`36`
`37`		`- changed(): void {`
	`37`	`+ protected changed(): void {`
`38`	`38`	`const collection = this.getCollectionOrFail()`
`39`	`39`	`const allParts = collection.find(undefined)`
`40`	`40`	`this._partsHandler.setParts(allParts)`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ export class PartInstancesHandler`
`59`	`59`	`handlers.playlistHandler.subscribe(this.onPlaylistUpdate, PLAYLIST_KEYS)`
`60`	`60`	`}`
`61`	`61`
`62`		`- changed(): void {`
	`62`	`+ protected changed(): void {`
`63`	`63`	`this._throttledUpdateAndNotify()`
`64`	`64`	`}`
`65`	`65`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ export class PieceInstancesHandler`
`76`	`76`	`handlers.showStyleBaseHandler.subscribe(this.onShowStyleBaseUpdate, SHOW_STYLE_BASE_KEYS)`
`77`	`77`	`}`
`78`	`78`
`79`		`- changed(): void {`
	`79`	`+ protected changed(): void {`
`80`	`80`	`this.updateAndNotify()`
`81`	`81`	`}`
`82`	`82`
Original file line number	Diff line number	Diff line change
`@@ -37,11 +37,11 @@ export class PlaylistHandler`
`37`	`37`	`this.setupSubscription(null, [this._studioId])`
`38`	`38`	`}`
`39`	`39`
`40`		`- changed(): void {`
	`40`	`+ protected changed(): void {`
`41`	`41`	`this.updateAndNotify()`
`42`	`42`	`}`
`43`	`43`
`44`		`- protected updateAndNotify(): void {`
	`44`	`+ private updateAndNotify(): void {`
`45`	`45`	`const collection = this.getCollectionOrFail()`
`46`	`46`	`const playlists = collection.find(undefined)`
`47`	`47`	`this._playlistsHandler.setPlaylists(playlists)`
Original file line number	Diff line number	Diff line change
`@@ -30,11 +30,11 @@ export class RundownHandler`
`30`	`30`	`handlers.playlistHandler.subscribe(this.onPlaylistUpdate, PLAYLIST_KEYS)`
`31`	`31`	`}`
`32`	`32`
`33`		`- changed(): void {`
	`33`	`+ protected changed(): void {`
`34`	`34`	`this.updateAndNotify()`
`35`	`35`	`}`
`36`	`36`
`37`		`- protected updateAndNotify(): void {`
	`37`	`+ private updateAndNotify(): void {`
`38`	`38`	`const collection = this.getCollectionOrFail()`
`39`	`39`	`this._rundownsHandler?.setRundowns(collection.find(undefined))`
`40`	`40`	`if (this._currentRundownId) {`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ export class SegmentHandler`
`35`	`35`	`handlers.partInstancesHandler.subscribe(this.onPartInstancesUpdate, PART_INSTANCES_KEYS)`
`36`	`36`	`}`
`37`	`37`
`38`		`- changed(): void {`
	`38`	`+ protected changed(): void {`
`39`	`39`	`this.updateAndNotify()`
`40`	`40`	`}`
`41`	`41`