Skip to content

Commit 2efaab3

Browse files
JulusianJulusian
committed
wip
1 parent 3f9e1f5 commit 2efaab3

File tree

18 files changed

+46
-49
lines changed

18 files changed

+46
-49
lines changed

‎meteor/server/api/ingest/packageInfo.ts‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {
22
ExpectedPackageDBType,
3-
ExpectedPackageDBNew,
3+
ExpectedPackageDB,
44
ExpectedPackageIngestSourceBucket,
55
} from '@sofie-automation/corelib/dist/dataModel/ExpectedPackages'
66
import { PackageInfoDB } from '@sofie-automation/corelib/dist/dataModel/PackageInfos'
@@ -52,7 +52,7 @@ export async function onUpdatedPackageInfo(packageId: ExpectedPackageId, _doc: P
5252
}
5353

5454
const pendingRundownPackageUpdates = new Map<RundownId, Array<ExpectedPackageId>>()
55-
function onUpdatedPackageInfoForRundownDebounce(pkg: ExpectedPackageDBNew) {
55+
function onUpdatedPackageInfoForRundownDebounce(pkg: ExpectedPackageDB) {
5656
if (!pkg.rundownId) {
5757
logger.error(`Updating ExpectedPackage "${pkg._id}" for Rundown "${pkg.rundownId}" not possible`)
5858
return
@@ -111,10 +111,7 @@ async function onUpdatedPackageInfoForRundown(
111111
})
112112
}
113113

114-
function onUpdatedPackageInfoForBucketItemDebounce(
115-
pkg: ExpectedPackageDBNew,
116-
source: ExpectedPackageIngestSourceBucket
117-
) {
114+
function onUpdatedPackageInfoForBucketItemDebounce(pkg: ExpectedPackageDB, source: ExpectedPackageIngestSourceBucket) {
118115
if (!pkg.bucketId) {
119116
logger.error(`Updating ExpectedPackage "${pkg._id}" for Bucket "${pkg.bucketId}" not possible`)
120117
return
@@ -140,7 +137,7 @@ function onUpdatedPackageInfoForBucketItemDebounce(
140137
)
141138
}
142139

143-
function onUpdatedPackageInfoForStudioBaselineDebounce(pkg: ExpectedPackageDBNew) {
140+
function onUpdatedPackageInfoForStudioBaselineDebounce(pkg: ExpectedPackageDB) {
144141
lazyIgnore(
145142
`onUpdatedPackageInfoForStudioBaseline_${pkg.studioId}`,
146143
() => {

‎meteor/server/collections/packages-media.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { CollectionName } from '@sofie-automation/corelib/dist/dataModel/Collections'
22
import { ExpectedMediaItem } from '@sofie-automation/corelib/dist/dataModel/ExpectedMediaItem'
3-
import { ExpectedPackageDBNew } from '@sofie-automation/corelib/dist/dataModel/ExpectedPackages'
3+
import { ExpectedPackageDB } from '@sofie-automation/corelib/dist/dataModel/ExpectedPackages'
44
import { ExpectedPackageWorkStatus } from '@sofie-automation/corelib/dist/dataModel/ExpectedPackageWorkStatuses'
55
import { ExpectedPlayoutItem } from '@sofie-automation/corelib/dist/dataModel/ExpectedPlayoutItem'
66
import { PackageContainerPackageStatusDB } from '@sofie-automation/corelib/dist/dataModel/PackageContainerPackageStatus'
@@ -27,7 +27,7 @@ registerIndex(ExpectedMediaItems, {
2727
rundownId: 1,
2828
})
2929

30-
export const ExpectedPackages = createAsyncOnlyReadOnlyMongoCollection<ExpectedPackageDBNew>(
30+
export const ExpectedPackages = createAsyncOnlyReadOnlyMongoCollection<ExpectedPackageDB>(
3131
CollectionName.ExpectedPackages
3232
)
3333
registerIndex(ExpectedPackages, {

‎meteor/server/migration/X_X_X.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { CURRENT_SYSTEM_VERSION } from './currentSystemVersion'
33
import { ExpectedPackages } from '../collections'
44
import * as PackagesPreR53 from '@sofie-automation/corelib/dist/dataModel/Old/ExpectedPackagesR52'
55
import {
6-
ExpectedPackageDBNew,
6+
ExpectedPackageDB,
77
ExpectedPackageIngestSource,
88
} from '@sofie-automation/corelib/dist/dataModel/ExpectedPackages'
99
import { assertNever, Complete } from '../lib/tempLib'
@@ -126,7 +126,7 @@ export const addSteps = addMigrationSteps(CURRENT_SYSTEM_VERSION, [
126126
},
127127
created: pkg.created,
128128
ingestSources: [ingestSource],
129-
} satisfies Complete<ExpectedPackageDBNew>)
129+
} satisfies Complete<ExpectedPackageDB>)
130130
}
131131
}
132132
},

‎meteor/server/publications/packageManager/expectedPackages/contentCache.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { ReactiveCacheCollection } from '../../lib/ReactiveCacheCollection'
22
import { literal } from '@sofie-automation/corelib/dist/lib'
33
import { MongoFieldSpecifierOnesStrict } from '@sofie-automation/corelib/dist/mongo'
4-
import { ExpectedPackageDBNew } from '@sofie-automation/corelib/dist/dataModel/ExpectedPackages'
4+
import { ExpectedPackageDB } from '@sofie-automation/corelib/dist/dataModel/ExpectedPackages'
55
import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
66
import { PieceInstance, PieceInstancePiece } from '@sofie-automation/corelib/dist/dataModel/PieceInstance'
77

@@ -29,14 +29,14 @@ export const pieceInstanceFieldsSpecifier = literal<MongoFieldSpecifierOnesStric
2929
})
3030

3131
export interface ExpectedPackagesContentCache {
32-
ExpectedPackages: ReactiveCacheCollection<ExpectedPackageDBNew>
32+
ExpectedPackages: ReactiveCacheCollection<ExpectedPackageDB>
3333
RundownPlaylists: ReactiveCacheCollection<RundownPlaylistCompact>
3434
PieceInstances: ReactiveCacheCollection<PieceInstanceCompact>
3535
}
3636

3737
export function createReactiveContentCache(): ExpectedPackagesContentCache {
3838
const cache: ExpectedPackagesContentCache = {
39-
ExpectedPackages: new ReactiveCacheCollection<ExpectedPackageDBNew>('expectedPackages'),
39+
ExpectedPackages: new ReactiveCacheCollection<ExpectedPackageDB>('expectedPackages'),
4040
RundownPlaylists: new ReactiveCacheCollection<RundownPlaylistCompact>('rundownPlaylists'),
4141
PieceInstances: new ReactiveCacheCollection<PieceInstanceCompact>('pieceInstances'),
4242
}

‎packages/corelib/src/dataModel/ExpectedPackages.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ export enum ExpectedPackageDBType {
3838
STUDIO_BASELINE_OBJECTS = 'studio_baseline_objects',
3939
}
4040

41-
export interface ExpectedPackageDBNew {
41+
export interface ExpectedPackageDB {
4242
_id: ExpectedPackageId // derived from rundownId and hash of `package`
4343

4444
/** The studio of the Rundown of the Piece this package belongs to */

‎packages/corelib/src/pubsub.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import { BucketAdLibAction } from './dataModel/BucketAdLibAction'
1919
import { BucketAdLib } from './dataModel/BucketAdLibPiece'
2020
import { ExpectedMediaItem } from './dataModel/ExpectedMediaItem'
2121
import { ExpectedPackageWorkStatus } from './dataModel/ExpectedPackageWorkStatuses'
22-
import { ExpectedPackageDBNew } from './dataModel/ExpectedPackages'
22+
import { ExpectedPackageDB } from './dataModel/ExpectedPackages'
2323
import { ExternalMessageQueueObj } from './dataModel/ExternalMessageQueue'
2424
import { PackageContainerStatusDB } from './dataModel/PackageContainerStatus'
2525
import { PeripheralDevice } from './dataModel/PeripheralDevice'
@@ -344,7 +344,7 @@ export type CorelibPubSubCollections = {
344344
[CollectionName.BucketAdLibActions]: BucketAdLibAction
345345
[CollectionName.BucketAdLibPieces]: BucketAdLib
346346
[CollectionName.ExpectedMediaItems]: ExpectedMediaItem
347-
[CollectionName.ExpectedPackages]: ExpectedPackageDBNew
347+
[CollectionName.ExpectedPackages]: ExpectedPackageDB
348348
[CollectionName.ExpectedPackageWorkStatuses]: ExpectedPackageWorkStatus
349349
[CollectionName.ExternalMessageQueue]: ExternalMessageQueueObj
350350
[CollectionName.NrcsIngestDataCache]: NrcsIngestDataCacheObj

‎packages/corelib/src/snapshots.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { AdLibAction } from './dataModel/AdlibAction'
22
import { AdLibPiece } from './dataModel/AdLibPiece'
33
import { ExpectedMediaItem } from './dataModel/ExpectedMediaItem'
4-
import { ExpectedPackageDBNew } from './dataModel/ExpectedPackages'
4+
import { ExpectedPackageDB } from './dataModel/ExpectedPackages'
55
import { ExpectedPlayoutItem } from './dataModel/ExpectedPlayoutItem'
66
import { RundownPlaylistId } from './dataModel/Ids'
77
import { NrcsIngestDataCacheObj } from './dataModel/NrcsIngestDataCache'
@@ -37,6 +37,6 @@ export interface CoreRundownPlaylistSnapshot {
3737
baselineAdLibActions: Array<RundownBaselineAdLibAction>
3838
expectedMediaItems: Array<ExpectedMediaItem>
3939
expectedPlayoutItems: Array<ExpectedPlayoutItem>
40-
expectedPackages: Array<ExpectedPackageDBNew> // Note: when reading, this could be in the old format
40+
expectedPackages: Array<ExpectedPackageDB> // Note: when reading, this could be in the old format
4141
timeline?: TimelineComplete
4242
}

‎packages/job-worker/src/__mocks__/collection.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { Blueprint } from '@sofie-automation/corelib/dist/dataModel/Blueprint'
44
import { BucketAdLibAction } from '@sofie-automation/corelib/dist/dataModel/BucketAdLibAction'
55
import { BucketAdLib } from '@sofie-automation/corelib/dist/dataModel/BucketAdLibPiece'
66
import { CollectionName } from '@sofie-automation/corelib/dist/dataModel/Collections'
7-
import { ExpectedPackageDBNew } from '@sofie-automation/corelib/dist/dataModel/ExpectedPackages'
7+
import { ExpectedPackageDB } from '@sofie-automation/corelib/dist/dataModel/ExpectedPackages'
88
import { ExpectedPlayoutItem } from '@sofie-automation/corelib/dist/dataModel/ExpectedPlayoutItem'
99
import { NrcsIngestDataCacheObj } from '@sofie-automation/corelib/dist/dataModel/NrcsIngestDataCache'
1010
import { SofieIngestDataCacheObj } from '@sofie-automation/corelib/dist/dataModel/SofieIngestDataCache'
@@ -310,7 +310,7 @@ export function getMockCollections(): {
310310
Timelines: new MockMongoCollection<TimelineComplete>(CollectionName.Timelines),
311311
TimelineDatastores: new MockMongoCollection<DBTimelineDatastoreEntry>(CollectionName.TimelineDatastore),
312312

313-
ExpectedPackages: new MockMongoCollection<ExpectedPackageDBNew>(CollectionName.ExpectedPackages),
313+
ExpectedPackages: new MockMongoCollection<ExpectedPackageDB>(CollectionName.ExpectedPackages),
314314
PackageInfos: new MockMongoCollection(CollectionName.PackageInfos),
315315

316316
ExternalMessageQueue: new MockMongoCollection(CollectionName.ExternalMessageQueue),
@@ -364,7 +364,7 @@ export interface IMockCollections {
364364
Timelines: MockMongoCollection<TimelineComplete>
365365
TimelineDatastores: MockMongoCollection<DBTimelineDatastoreEntry>
366366

367-
ExpectedPackages: MockMongoCollection<ExpectedPackageDBNew>
367+
ExpectedPackages: MockMongoCollection<ExpectedPackageDB>
368368
PackageInfos: MockMongoCollection<PackageInfoDB>
369369

370370
ExternalMessageQueue: MockMongoCollection<ExternalMessageQueueObj>

‎packages/job-worker/src/blueprints/context/watchedPackages.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import {
1010
stripExpectedPackageDBToIngestExpectedPackage,
1111
type IngestExpectedPackage,
1212
} from '../../ingest/model/IngestExpectedPackage'
13-
import { ExpectedPackageDBNew } from '@sofie-automation/corelib/dist/dataModel/ExpectedPackages'
13+
import { ExpectedPackageDB } from '@sofie-automation/corelib/dist/dataModel/ExpectedPackages'
1414

1515
/**
1616
* This is a helper class to simplify exposing packageInfo to various places in the blueprints
@@ -41,7 +41,7 @@ export class WatchedPackagesHelper {
4141
*/
4242
static async create(
4343
context: JobContext,
44-
filter: FilterQuery<Omit<ExpectedPackageDBNew, 'studioId'>>
44+
filter: FilterQuery<Omit<ExpectedPackageDB, 'studioId'>>
4545
): Promise<WatchedPackagesHelper> {
4646
// Load all the packages and the infos that are watched
4747
const watchedPackages = await context.directCollections.ExpectedPackages.findFetch({

‎packages/job-worker/src/db/collections.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import { DBShowStyleVariant } from '@sofie-automation/corelib/dist/dataModel/Sho
3636
import { DBStudio } from '@sofie-automation/corelib/dist/dataModel/Studio'
3737
import { TimelineComplete } from '@sofie-automation/corelib/dist/dataModel/Timeline'
3838
import { DBTimelineDatastoreEntry } from '@sofie-automation/corelib/dist/dataModel/TimelineDatastore'
39-
import { ExpectedPackageDBNew } from '@sofie-automation/corelib/dist/dataModel/ExpectedPackages'
39+
import { ExpectedPackageDB } from '@sofie-automation/corelib/dist/dataModel/ExpectedPackages'
4040
import { PackageInfoDB } from '@sofie-automation/corelib/dist/dataModel/PackageInfos'
4141
import { ProtectedString } from '@sofie-automation/corelib/dist/protectedString'
4242
import { literal } from '@sofie-automation/corelib/dist/lib'
@@ -120,7 +120,7 @@ export interface IDirectCollections {
120120
Timelines: ICollection<TimelineComplete>
121121
TimelineDatastores: ICollection<DBTimelineDatastoreEntry>
122122

123-
ExpectedPackages: ICollection<ExpectedPackageDBNew>
123+
ExpectedPackages: ICollection<ExpectedPackageDB>
124124
PackageInfos: IReadOnlyCollection<PackageInfoDB>
125125

126126
ExternalMessageQueue: ICollection<ExternalMessageQueueObj>

0 commit comments

Comments
 (0)