Merge pull request #94 from Axinom/releases/iteration-73-merge

libs/media-messages/package.json

@@ -21,8 +21,8 @@
     "build:compile": "tsc"
   },
   "devDependencies": {
-    "@axinom/mosaic-cli": "0.18.3",
-    "@axinom/mosaic-message-bus-abstractions": "0.5.4",
+    "@axinom/mosaic-cli": "0.18.4",
+    "@axinom/mosaic-message-bus-abstractions": "0.5.5",
     "@types/glob": "^7.2.0",
     "concurrently": "^5.3.0",
     "rimraf": "^3.0.2",

libs/media-messages/schemas/payloads/publish/common.json

@@ -199,6 +199,27 @@
         }
       }
     },
+    "cue_point":{
+      "description":"Cue point metadata.",
+      "type": "object",
+      "title":"cue_point",
+      "additionalProperties": false,
+      "required":["cue_point_type_key", "time_in_seconds"],
+      "properties": {
+        "cue_point_type_key": {
+          "description": "Key of the cue point type.",
+          "type": "string"
+        },
+        "time_in_seconds": {
+          "description": "Time in seconds at which the cue point is triggered within the video.",
+          "type": "number"
+        },
+        "value": {
+          "description": "Additional data associated with the cue point.",
+          "type": ["string", "null"]
+        }
+      }
+    },
     "video": {
       "description": "Video metadata.",
       "type": "object",
@@ -254,6 +275,13 @@
             "$ref": "#/definitions/video_stream"
           }
         },
+        "cue_points": {
+          "description": "Cue points associated with video.",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/cue_point"
+          }
+        },
         "is_protected": {
           "description": "Indicates whether a stream is protected with DRM.",
           "type": "boolean"
@@ -330,6 +358,13 @@
             "$ref": "#/definitions/video_stream"
           }
         },
+        "cue_points": {
+          "description": "Cue points associated with video.",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/cue_point"
+          }
+        },
         "is_protected": {
           "description": "Indicates whether a stream is protected with DRM.",
           "type": "boolean"

libs/media-messages/src/generated/schemas/payloads/publish/events/episode-published-event.json

@@ -357,6 +357,37 @@
               }
             }
           },
+          "cue_points": {
+            "description": "Cue points associated with video.",
+            "type": "array",
+            "items": {
+              "description": "Cue point metadata.",
+              "type": "object",
+              "title": "cue_point",
+              "additionalProperties": false,
+              "required": [
+                "cue_point_type_key",
+                "time_in_seconds"
+              ],
+              "properties": {
+                "cue_point_type_key": {
+                  "description": "Key of the cue point type.",
+                  "type": "string"
+                },
+                "time_in_seconds": {
+                  "description": "Time in seconds at which the cue point is triggered within the video.",
+                  "type": "number"
+                },
+                "value": {
+                  "description": "Additional data associated with the cue point.",
+                  "type": [
+                    "string",
+                    "null"
+                  ]
+                }
+              }
+            }
+          },
           "is_protected": {
             "description": "Indicates whether a stream is protected with DRM.",
             "type": "boolean"

libs/media-messages/src/generated/schemas/payloads/publish/events/movie-published-event.json

@@ -347,6 +347,37 @@
               }
             }
           },
+          "cue_points": {
+            "description": "Cue points associated with video.",
+            "type": "array",
+            "items": {
+              "description": "Cue point metadata.",
+              "type": "object",
+              "title": "cue_point",
+              "additionalProperties": false,
+              "required": [
+                "cue_point_type_key",
+                "time_in_seconds"
+              ],
+              "properties": {
+                "cue_point_type_key": {
+                  "description": "Key of the cue point type.",
+                  "type": "string"
+                },
+                "time_in_seconds": {
+                  "description": "Time in seconds at which the cue point is triggered within the video.",
+                  "type": "number"
+                },
+                "value": {
+                  "description": "Additional data associated with the cue point.",
+                  "type": [
+                    "string",
+                    "null"
+                  ]
+                }
+              }
+            }
+          },
           "is_protected": {
             "description": "Indicates whether a stream is protected with DRM.",
             "type": "boolean"

libs/media-messages/src/generated/schemas/payloads/publish/events/season-published-event.json

@@ -346,6 +346,37 @@
               }
             }
           },
+          "cue_points": {
+            "description": "Cue points associated with video.",
+            "type": "array",
+            "items": {
+              "description": "Cue point metadata.",
+              "type": "object",
+              "title": "cue_point",
+              "additionalProperties": false,
+              "required": [
+                "cue_point_type_key",
+                "time_in_seconds"
+              ],
+              "properties": {
+                "cue_point_type_key": {
+                  "description": "Key of the cue point type.",
+                  "type": "string"
+                },
+                "time_in_seconds": {
+                  "description": "Time in seconds at which the cue point is triggered within the video.",
+                  "type": "number"
+                },
+                "value": {
+                  "description": "Additional data associated with the cue point.",
+                  "type": [
+                    "string",
+                    "null"
+                  ]
+                }
+              }
+            }
+          },
           "is_protected": {
             "description": "Indicates whether a stream is protected with DRM.",
             "type": "boolean"

libs/media-messages/src/generated/schemas/payloads/publish/events/tvshow-published-event.json

@@ -346,6 +346,37 @@
               }
             }
           },
+          "cue_points": {
+            "description": "Cue points associated with video.",
+            "type": "array",
+            "items": {
+              "description": "Cue point metadata.",
+              "type": "object",
+              "title": "cue_point",
+              "additionalProperties": false,
+              "required": [
+                "cue_point_type_key",
+                "time_in_seconds"
+              ],
+              "properties": {
+                "cue_point_type_key": {
+                  "description": "Key of the cue point type.",
+                  "type": "string"
+                },
+                "time_in_seconds": {
+                  "description": "Time in seconds at which the cue point is triggered within the video.",
+                  "type": "number"
+                },
+                "value": {
+                  "description": "Additional data associated with the cue point.",
+                  "type": [
+                    "string",
+                    "null"
+                  ]
+                }
+              }
+            }
+          },
           "is_protected": {
             "description": "Indicates whether a stream is protected with DRM.",
             "type": "boolean"

libs/media-messages/src/generated/types/payloads/publish/types/cue-point.ts

@@ -0,0 +1,17 @@
+/**
+ * Cue point metadata.
+ */
+export interface CuePoint {
+  /**
+   * Key of the cue point type.
+   */
+  cue_point_type_key: string;
+  /**
+   * Time in seconds at which the cue point is triggered within the video.
+   */
+  time_in_seconds: number;
+  /**
+   * Additional data associated with the cue point.
+   */
+  value?: string | null;
+}

libs/media-messages/src/generated/types/payloads/publish/types/index.ts

@@ -1,3 +1,4 @@
+export * from './cue-point';
 export * from './format';
 export * from './genre';
 export * from './image';

libs/media-messages/src/generated/types/payloads/publish/types/video.ts

@@ -1,3 +1,4 @@
+import { CuePoint } from './cue-point';
 import { Format } from './format';
 import { VideoStream } from './video-stream';
 import { VideoUsageType } from './video-usage-type';
@@ -41,6 +42,10 @@ export interface Video {
    * Video Streams
    */
   video_streams?: Array<VideoStream>;
+  /**
+   * Cue points associated with video.
+   */
+  cue_points?: Array<CuePoint>;
   /**
    * Indicates whether a stream is protected with DRM.
    */

package.json

@@ -43,7 +43,7 @@
     "build:media-workflows:prod": "yarn && wsrun -trm -p media-workflows -c build && pilet pack services/media/workflows"
   },
   "devDependencies": {
-    "@axinom/mosaic-cli": "0.18.3",
+    "@axinom/mosaic-cli": "0.18.4",
     "@dbeining/react-atom": "^4.1.21",
     "@jest/globals": "^29.1.2",
     "@libre/atom": "^1.3.3",

services/catalog/service/migrations/committed/000008-add-video-cue-points-tables.sql

@@ -0,0 +1,52 @@
+--! Previous: sha1:ac06834674084dc237f4ac9168dfc87d7e85931c
+--! Hash: sha1:75abcc71fe97b30f08804271eb66200151400e8c
+--! Message: add-video-cue-points-tables
+
+DROP TABLE IF EXISTS app_public.movie_video_cue_points CASCADE;
+CREATE TABLE app_public.movie_video_cue_points(
+  id INTEGER PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY,
+  movie_video_id INTEGER REFERENCES movie_videos ON DELETE CASCADE,
+  cue_point_type_key TEXT NOT NULL,
+  time_in_seconds NUMERIC(13,5) NOT NULL,
+  value TEXT
+);
+SELECT ax_define.define_index('movie_video_id', 'movie_video_cue_points', 'app_public');
+
+
+DROP TABLE IF EXISTS app_public.episode_video_cue_points CASCADE;
+CREATE TABLE app_public.episode_video_cue_points(
+  id INTEGER PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY,
+  episode_video_id INTEGER REFERENCES episode_videos ON DELETE CASCADE,
+  cue_point_type_key TEXT NOT NULL,
+  time_in_seconds NUMERIC(13,5) NOT NULL,
+  value TEXT
+);
+SELECT ax_define.define_index('episode_video_id', 'episode_video_cue_points', 'app_public');
+
+
+DROP TABLE IF EXISTS app_public.season_video_cue_points CASCADE;
+CREATE TABLE app_public.season_video_cue_points(
+  id INTEGER PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY,
+  season_video_id INTEGER REFERENCES season_videos ON DELETE CASCADE,
+  cue_point_type_key TEXT NOT NULL,
+  time_in_seconds NUMERIC(13,5) NOT NULL,
+  value TEXT
+);
+SELECT ax_define.define_index('season_video_id', 'season_video_cue_points', 'app_public');
+
+
+DROP TABLE IF EXISTS app_public.tvshow_video_cue_points CASCADE;
+CREATE TABLE app_public.tvshow_video_cue_points(
+  id INTEGER PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY,
+  tvshow_video_id INTEGER REFERENCES tvshow_videos ON DELETE CASCADE,
+  cue_point_type_key TEXT NOT NULL,
+  time_in_seconds NUMERIC(13,5) NOT NULL,
+  value TEXT
+);
+SELECT ax_define.define_index('tvshow_video_id', 'tvshow_video_cue_points', 'app_public');
+
+GRANT SELECT, INSERT, UPDATE, DELETE ON
+  app_public.movie_video_cue_points,
+  app_public.episode_video_cue_points,
+  app_public.season_video_cue_points,
+  app_public.tvshow_video_cue_points TO ":DATABASE_GQL_ROLE";

services/catalog/service/package.json

@@ -41,10 +41,10 @@
     "util:define-func-migration": "yarn mosaic generate-define-func-migration"
   },
   "dependencies": {
-    "@axinom/mosaic-db-common": "0.24.3",
-    "@axinom/mosaic-message-bus": "0.14.4",
-    "@axinom/mosaic-message-bus-abstractions": "0.5.4",
-    "@axinom/mosaic-service-common": "0.32.0",
+    "@axinom/mosaic-db-common": "0.25.0",
+    "@axinom/mosaic-message-bus": "0.14.5",
+    "@axinom/mosaic-message-bus-abstractions": "0.5.5",
+    "@axinom/mosaic-service-common": "0.33.0",
     "@graphile-contrib/pg-simplify-inflector": "^6.1.0",
     "add": "^2.0.6",
     "amqplib": "^0.6.0",

services/catalog/service/src/domains/movies/handlers/movie-published-event-handler.db.spec.ts

@@ -70,7 +70,7 @@ describe('MoviePublishEventHandler', () => {
       const expectedVideos = message.videos.map((video) => {
         return Object.fromEntries(
           Object.entries(video).filter(
-            ([key, _value]) => key !== 'video_streams',
+            ([key, _value]) => key !== 'video_streams' && key !== 'cue_points',
           ),
         );
       });
@@ -88,6 +88,15 @@ describe('MoviePublishEventHandler', () => {
         message.videos[0].video_streams!,
       );
 
+      const videoCuePoints = (
+        await select('movie_video_cue_points', {
+          movie_video_id: videos[0].id,
+        }).run(ctx.ownerPool)
+      ).map(({ id, movie_video_id, ...cuePoint }) => cuePoint);
+      expect(videoCuePoints).toIncludeSameMembers(
+        message.videos[0].cue_points!,
+      );
+
       const licenses = await select('movie_licenses', {
         movie_id: message.content_id,
       }).run(ctx.ownerPool);

services/catalog/service/src/domains/movies/handlers/movie-published-event-handler.ts

@@ -8,6 +8,7 @@ import * as db from 'zapatos/db';
 import {
   movie_images,
   movie_licenses,
+  movie_video_cue_points,
   movie_video_streams,
 } from 'zapatos/schema';
 import { Config } from '../../../common';
@@ -49,7 +50,7 @@ export class MoviePublishedEventHandler extends MessageHandler<MoviePublishedEve
         if (payload.videos) {
           for (const video of payload.videos) {
             // Remove `video_streams` array from `video` object
-            const { video_streams, ...videoToInsert } = video;
+            const { video_streams, cue_points, ...videoToInsert } = video;
 
             const movieVideo = await db
               .insert('movie_videos', {
@@ -71,6 +72,20 @@ export class MoviePublishedEventHandler extends MessageHandler<MoviePublishedEve
                 )
                 .run(txnClient);
             }
+
+            if (cue_points !== undefined) {
+              await db
+                .insert(
+                  'movie_video_cue_points',
+                  cue_points.map(
+                    (cuePoint): movie_video_cue_points.Insertable => ({
+                      movie_video_id: movieVideo.id,
+                      ...cuePoint,
+                    }),
+                  ),
+                )
+                .run(txnClient);
+            }
           }
         }