Merge branch 'develop'

Author: CarsonF

src/components/file/media/detect-existing-media.migration.ts

@@ -6,7 +6,7 @@ import { FileVersion } from '../dto';
 import { FileRepository } from '../file.repository';
 import { MediaService } from './media.service';
 
-@Migration('2023-09-05T19:00:00')
+@Migration('2023-09-06T13:00:00')
 export class DetectExistingMediaMigration extends BaseMigration {
   constructor(
     private readonly mediaService: MediaService,
@@ -16,6 +16,9 @@ export class DetectExistingMediaMigration extends BaseMigration {
   }
 
   async up() {
+    await this.fixVideoLabels();
+    await this.fixVideoBuggedDuration();
+    await this.fixFileVersionFromBuggedMediaMerge();
     await this.dropAllDuplicatedMedia();
 
     const detect = async (f: FileVersion) => {
@@ -82,6 +85,33 @@ export class DetectExistingMediaMigration extends BaseMigration {
     } while (true);
   }
 
+  private async fixVideoLabels() {
+    await this.db.query().raw`
+      match (v:Video)
+      set v:VisualMedia:TemporalMedia:Media
+    `.executeAndLogStats();
+  }
+
+  private async fixVideoBuggedDuration() {
+    await this.db.query().raw`
+      match (v:Video)
+      where v.duration is null
+      set v.duration = 0
+    `.executeAndLogStats();
+  }
+
+  private async fixFileVersionFromBuggedMediaMerge() {
+    await this.db.query().raw`
+      match (badFv:FileVersion)
+      where not badFv:BaseNode
+      with badFv
+      match (realFv:FileVersion:BaseNode { id: badFv.id }),
+        (badFv)-->(media:Media)
+      merge (realFv)-[:media]->(media)
+      detach delete badFv
+    `.executeAndLogStats();
+  }
+
   private async dropAllDuplicatedMedia() {
     await this.db.query().raw`
       match (fv:FileVersion)-->(media:Media)

src/components/file/media/media.dto.ts

@@ -120,6 +120,7 @@ export class Image extends VisualMedia {
 @ObjectType({
   implements: [VisualMedia, TemporalMedia, Media],
 })
+@DbLabel('Video', 'VisualMedia', 'TemporalMedia', 'Media') // IntersectionType blocks label inheritance
 export class Video extends IntersectionType(VisualMedia, TemporalMedia) {
   static readonly Props = keysOf<Video>();
   static readonly SecuredProps = keysOf<SecuredProps<Video>>();

src/components/file/media/media.repository.ts

@@ -49,17 +49,27 @@ export class MediaRepository extends CommonRepository {
     const res = input.__typename
       ? EnhancedResource.of(resolveMedia(input as AnyMedia))
       : undefined;
+    const tempId = await generateId();
     const query = this.db
       .query()
-      .merge([
-        node('fv', 'FileVersion', input.file ? { id: input.file } : {}),
-        relation('out', '', 'media'),
-        node('node', 'Media', input.id ? { id: input.id } : {}),
+      .match([
+        input.file ? [node('fv', 'FileVersion', { id: input.file })] : [],
+        input.id ? [node('node', 'Media', { id: input.id })] : [],
       ])
-      .onCreate.set({
-        values: { 'node.id': await generateId() },
-        variables: { 'node.createdAt': 'datetime()' },
-      })
+      .apply((q) =>
+        input.file
+          ? q
+              .merge([
+                node('fv'),
+                relation('out', '', 'media'),
+                node('node', input.id ? undefined : 'Media'),
+              ])
+              .onCreate.set({
+                values: { 'node.id': tempId },
+                variables: { 'node.createdAt': 'datetime()' },
+              })
+          : q,
+      )
       .setValues({ node: toDbShape(input) }, true)
       .with('node, fv')
       // Update the labels if typename is given, and maybe changed.
@@ -126,7 +136,7 @@ const toDbShape = (input: Partial<AnyMedia>) => ({
           ? input.dimensions
           : // If not visual, ensure dimensions get cleared
             { width: null, height: null }),
-        ...(input.__typename === 'Audio'
+        ...(input.__typename === 'Audio' || input.__typename === 'Video'
           ? { duration: input.duration }
           : // If not temporal, ensure duration gets cleared
             { duration: null }),