From 63558069d97c1c7bbf8fafbc3a596f309c5d4178 Mon Sep 17 00:00:00 2001 From: Gilad Nadav Date: Thu, 20 Oct 2022 11:27:24 +0300 Subject: [PATCH] feat(FEC-12625): add entry id to media metadata (#184) * add entryId to media metaData --- src/k-provider/ott/provider-parser.js | 1 + src/k-provider/ovp/provider-parser.js | 1 + test/src/k-provider/ott/media-config-data.js | 3 +++ test/src/k-provider/ovp/media-config-data.js | 11 +++++++++++ test/src/k-provider/ovp/provider-parser-data.js | 1 + 5 files changed, 17 insertions(+) diff --git a/src/k-provider/ott/provider-parser.js b/src/k-provider/ott/provider-parser.js index d0c7264..a4ba93c 100644 --- a/src/k-provider/ott/provider-parser.js +++ b/src/k-provider/ott/provider-parser.js @@ -113,6 +113,7 @@ export default class OTTProviderParser { const metaData = OTTProviderParser.reconstructMetadata(mediaAsset); metaData.description = mediaAsset.description; metaData.name = mediaAsset.name; + if (mediaAsset.data.entryId) metaData.entryId = mediaAsset.data.entryId; if (mediaAsset.data.epgId) metaData.epgId = mediaAsset.data.epgId; if (mediaAsset.data.recordingId) metaData.recordingId = mediaAsset.data.recordingId; if (requestData && requestData.mediaType) metaData.mediaType = requestData.mediaType; diff --git a/src/k-provider/ovp/provider-parser.js b/src/k-provider/ovp/provider-parser.js index 40f5d7d..c10ce58 100644 --- a/src/k-provider/ovp/provider-parser.js +++ b/src/k-provider/ovp/provider-parser.js @@ -152,6 +152,7 @@ class OVPProviderParser { mediaEntry.duration = entry.duration; mediaEntry.metadata = OVPProviderParser._parseMetadata(metadataList); mediaEntry.metadata.description = entry.description || ''; + mediaEntry.metadata.entryId = entry.id || ''; mediaEntry.metadata.name = entry.name || ''; mediaEntry.metadata.tags = entry.tags || ''; mediaEntry.status = entry.status; diff --git a/test/src/k-provider/ott/media-config-data.js b/test/src/k-provider/ott/media-config-data.js index 5ce4c96..34b38fd 100644 --- a/test/src/k-provider/ott/media-config-data.js +++ b/test/src/k-provider/ott/media-config-data.js @@ -121,6 +121,7 @@ const NoPluginsWithDrm = { metadata: { mediaType: mediaTypeConf, name: 'Trolls', + entryId: '1_tmeqe2n9', epgId: '454032895', recordingId: '774036475', metas: { @@ -488,6 +489,7 @@ const FilteredSourcesByDeviceType = { metadata: { mediaType: KalturaAsset.Type.RECORDING, name: 'Trolls', + entryId: '1_tmeqe2n9', epgId: '454032895', recordingId: '774036475', metas: { @@ -772,6 +774,7 @@ const EntryWithBumper = { dvr: false, vr: null, metadata: { + entryId: '0_tle49uqr', contextType: 'PLAYBACK', mediaType: mediaTypeConf, name: 'avichay series1 VOD', diff --git a/test/src/k-provider/ovp/media-config-data.js b/test/src/k-provider/ovp/media-config-data.js index 9e23391..60b00c6 100644 --- a/test/src/k-provider/ovp/media-config-data.js +++ b/test/src/k-provider/ovp/media-config-data.js @@ -14,6 +14,7 @@ const NoPluginsNoDrm = { type: 'Vod', poster: 'http://kaltura.com/p/1082342/sp/108234200/thumbnail/entry_id/1_rsrdfext/version/100002/width/640/height/360', metadata: { + entryId: '1_rsrdfext', name: 'FO21934-HDTX-SWE', description: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed vel semper libero. Curabitur in felis elementum, porttitor sem ac, volutpat mi. Sed dignissim facilisis magna, ac suscipit orci suscipit id. Suspendisse feugiat sapien laoreet auctor convallis. Cras volutpat dictum massa, in pharetra erat placerat eget. Donec at elit est. Donec id cursus elit. Etiam sit amet sapien sed mi aliquam finibus at lobortis diam. Aenean at gravida libero.', @@ -253,6 +254,7 @@ const RegexAppliedSources = { dvr: false, vr: null, metadata: { + entryId: '1_rsrdfext', name: 'FO21934-HDTX-SWE', description: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed vel semper libero. Curabitur in felis elementum, porttitor sem ac, volutpat mi. Sed dignissim facilisis magna, ac suscipit orci suscipit id. Suspendisse feugiat sapien laoreet auctor convallis. Cras volutpat dictum massa, in pharetra erat placerat eget. Donec at elit est. Donec id cursus elit. Etiam sit amet sapien sed mi aliquam finibus at lobortis diam. Aenean at gravida libero.', @@ -292,6 +294,7 @@ const NoPluginsWithDrm = { type: 'Vod', poster: 'http://kaltura.com/p/1082342/sp/108234200/thumbnail/entry_id/1_rsrdfext/version/100002/width/640/height/360', metadata: { + entryId: '1_rwbj3j0a', name: 'DRM TEST', description: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed vel semper libero. Curabitur in felis elementum, porttitor sem ac, volutpat mi. Sed dignissim facilisis magna, ac suscipit orci suscipit id. Suspendisse feugiat sapien laoreet auctor convallis. Cras volutpat dictum massa, in pharetra erat placerat eget. Donec at elit est. Donec id cursus elit. Etiam sit amet sapien sed mi aliquam finibus at lobortis diam. Aenean at gravida libero.', @@ -353,6 +356,7 @@ const WithPluginsNoDrm = { type: 'Vod', poster: 'http://kaltura.com/p/1082342/sp/108234200/thumbnail/entry_id/1_rsrdfext/version/100002/width/640/height/360', metadata: { + entryId: '1_rsrdfext', name: 'FO21934-HDTX-SWE', description: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed vel semper libero. Curabitur in felis elementum, porttitor sem ac, volutpat mi. Sed dignissim facilisis magna, ac suscipit orci suscipit id. Suspendisse feugiat sapien laoreet auctor convallis. Cras volutpat dictum massa, in pharetra erat placerat eget. Donec at elit est. Donec id cursus elit. Etiam sit amet sapien sed mi aliquam finibus at lobortis diam. Aenean at gravida libero.', @@ -493,6 +497,7 @@ const WithPluginsWithDrm = { type: 'Vod', poster: 'http://kaltura.com/p/1082342/sp/108234200/thumbnail/entry_id/1_rsrdfext/version/100002/width/640/height/360', metadata: { + entryId: '1_rwbj3j0a', name: 'DRM TEST', description: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed vel semper libero. Curabitur in felis elementum, porttitor sem ac, volutpat mi. Sed dignissim facilisis magna, ac suscipit orci suscipit id. Suspendisse feugiat sapien laoreet auctor convallis. Cras volutpat dictum massa, in pharetra erat placerat eget. Donec at elit est. Donec id cursus elit. Etiam sit amet sapien sed mi aliquam finibus at lobortis diam. Aenean at gravida libero.', @@ -553,6 +558,7 @@ const AudioEntryWithoutPlugins = { type: 'Audio', poster: 'http://kaltura.com/p/1082342/sp/108234200/thumbnail/entry_id/1_rsrdfext/version/100002/width/640/height/360', metadata: { + entryId: '0_vyzw3ceu', name: 'TEST_WAESP_PLACINGTEST_DUAL', description: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed vel semper libero. Curabitur in felis elementum, porttitor sem ac, volutpat mi. Sed dignissim facilisis magna, ac suscipit orci suscipit id. Suspendisse feugiat sapien laoreet auctor convallis. Cras volutpat dictum massa, in pharetra erat placerat eget. Donec at elit est. Donec id cursus elit. Etiam sit amet sapien sed mi aliquam finibus at lobortis diam. Aenean at gravida libero.', @@ -612,6 +618,7 @@ const ImageEntryWithoutPlugins = { type: 'Image', poster: 'http://kaltura.com/p/1082342/sp/108234200/thumbnail/entry_id/1_rsrdfext/version/100002/width/640/height/360', metadata: { + entryId: '0_84zz779s', name: 'Channel HU-TEST-STG-Attila-160203 Thumbnail', description: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed vel semper libero. Curabitur in felis elementum, porttitor sem ac, volutpat mi. Sed dignissim facilisis magna, ac suscipit orci suscipit id. Suspendisse feugiat sapien laoreet auctor convallis. Cras volutpat dictum massa, in pharetra erat placerat eget. Donec at elit est. Donec id cursus elit. Etiam sit amet sapien sed mi aliquam finibus at lobortis diam. Aenean at gravida libero.', @@ -979,6 +986,7 @@ const EntryWithBumper = { dvr: false, vr: null, metadata: { + entryId: '0_wifqaipd', name: 'MPEG Dash with MultiAudio New Transcoding', description: '', tags: '', @@ -1093,6 +1101,7 @@ const EntryWithBumperWithKs = { dvr: false, vr: null, metadata: { + entryId: '0_wifqaipd', name: 'MPEG Dash with MultiAudio New Transcoding', description: '', tags: '', @@ -1210,6 +1219,7 @@ const EntryWithNoBumper = { dvr: false, vr: null, metadata: { + entryId: '0_wifqaipd', name: 'MPEG Dash with MultiAudio New Transcoding', description: '', tags: '', @@ -1300,6 +1310,7 @@ const EntryOfPartner0 = { vr: null, metadata: { name: 'Titanic in 5 Seconds', + entryId: '0_pi55vv3r', description: 'Titanic movie summarized in 5 seconds', tags: 'titanic, short' }, diff --git a/test/src/k-provider/ovp/provider-parser-data.js b/test/src/k-provider/ovp/provider-parser-data.js index d61240e..70c9ef2 100644 --- a/test/src/k-provider/ovp/provider-parser-data.js +++ b/test/src/k-provider/ovp/provider-parser-data.js @@ -72,6 +72,7 @@ const youtubeMediaEntryResult = { }, duration: 0, metadata: { + entryId: '1234', description: 'youtube description', name: 'test youtube entry', tags: ''