feat: removed publish validation check if a video is DRM protected

[AB#45197]
Axinom · Aug 13, 2024 · cdabe86 · cdabe86
1 parent 0c43d43
commit cdabe86
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 55 deletions.
diff --git a/services/channel/service/src/domains/channel/publishing/validate-channel.ts b/services/channel/service/src/domains/channel/publishing/validate-channel.ts
@@ -67,7 +67,6 @@ export async function validateChannel(
       publishDto.placeholder_video_id
         ? [{ videoId: publishDto.placeholder_video_id }]
         : [],
-      publishDto.is_drm_protected,
       true,
     ),
     isManagedServiceEnabled(

diff --git a/services/channel/service/src/domains/playlist/publishing/validate-playlist.ts b/services/channel/service/src/domains/playlist/publishing/validate-playlist.ts
@@ -119,7 +119,6 @@ export async function validatePlaylist(
       config.videoServiceBaseUrl,
       jwtToken,
       selectedVideos,
-      channel.is_drm_protected,
       false,
     ),
     isManagedServiceEnabled(

diff --git a/services/channel/service/src/publishing/common/video/get-validation-and-videos.spec.ts b/services/channel/service/src/publishing/common/video/get-validation-and-videos.spec.ts
@@ -70,7 +70,6 @@ describe('getValidationAndVideos', () => {
       authToken,
       [],
       true,
-      true,
     );
 
     // Assert
@@ -88,7 +87,6 @@ describe('getValidationAndVideos', () => {
       endpoint,
       authToken,
       [],
-      true,
       false,
     );
 
@@ -113,7 +111,6 @@ describe('getValidationAndVideos', () => {
       authToken,
       [{ videoId: videoId1 }],
       true,
-      true,
     );
 
     // Assert
@@ -141,7 +138,6 @@ describe('getValidationAndVideos', () => {
       authToken,
       [{ videoId: videoId1 }],
       true,
-      true,
     );
 
     // Assert
@@ -163,7 +159,6 @@ describe('getValidationAndVideos', () => {
       authToken,
       [{ videoId: videoId1 }, { videoId: videoId2 }],
       false,
-      false,
     );
 
     // Assert
@@ -183,13 +178,7 @@ describe('getValidationAndVideos', () => {
 
     // Act
     const error = await rejectionOf(
-      getValidationAndVideos(
-        endpoint,
-        authToken,
-        [{ videoId: '1' }],
-        false,
-        true,
-      ),
+      getValidationAndVideos(endpoint, authToken, [{ videoId: '1' }], true),
     );
 
     // Assert
@@ -218,13 +207,7 @@ describe('getValidationAndVideos', () => {
 
     // Act
     const error = await rejectionOf(
-      getValidationAndVideos(
-        endpoint,
-        authToken,
-        [{ videoId: '1' }],
-        false,
-        true,
-      ),
+      getValidationAndVideos(endpoint, authToken, [{ videoId: '1' }], true),
     );
 
     // Assert
@@ -252,13 +235,7 @@ describe('getValidationAndVideos', () => {
 
     // Act
     const error = await rejectionOf(
-      getValidationAndVideos(
-        endpoint,
-        authToken,
-        [{ videoId: '1' }],
-        false,
-        true,
-      ),
+      getValidationAndVideos(endpoint, authToken, [{ videoId: '1' }], true),
     );
 
     // Assert

diff --git a/services/channel/service/src/publishing/common/video/get-validation-and-videos.ts b/services/channel/service/src/publishing/common/video/get-validation-and-videos.ts
@@ -27,7 +27,6 @@ export const getValidationAndVideos = async (
   videoServiceBaseUrl: string,
   authToken: string,
   selectedVideos: SelectedVideo[],
-  isDrmEnabled: boolean,
   exactlyOneVideo: boolean,
 ): Promise<{
   videos: DetailedVideo[];
@@ -67,32 +66,19 @@ export const getValidationAndVideos = async (
         continue;
       }
 
-      if (gqlVideo.isProtected) {
-        if (isDrmEnabled) {
-          if (
-            gqlVideo.videoStreams.nodes
-              .filter(
-                (s) => s.type !== 'SUBTITLE' && s.type !== 'CLOSED_CAPTION',
-              )
-              .find((s) => !s.keyId)
-          ) {
-            validations.push(
-              createValidationError(
-                `Video "${gqlVideo.title}" with ID ${gqlVideo.id} is protected but no key ids were found.`,
-                'VIDEOS',
-                source,
-              ),
-            );
-          }
-        } else {
-          validations.push(
-            createValidationError(
-              `Video "${gqlVideo.title}" with ID ${gqlVideo.id} is DRM protected.`,
-              'VIDEOS',
-              source,
-            ),
-          );
-        }
+      if (
+        gqlVideo.isProtected &&
+        gqlVideo.videoStreams.nodes
+          .filter((s) => s.type !== 'SUBTITLE' && s.type !== 'CLOSED_CAPTION')
+          .find((s) => !s.keyId)
+      ) {
+        validations.push(
+          createValidationError(
+            `Video "${gqlVideo.title}" with ID ${gqlVideo.id} is protected but no key ids were found.`,
+            'VIDEOS',
+            source,
+          ),
+        );
       }
 
       if (gqlVideo.outputFormat !== 'CMAF') {