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-01T18:00:00')
+@Migration('2023-09-05T19:00:00')
 export class DetectExistingMediaMigration extends BaseMigration {
   constructor(
     private readonly mediaService: MediaService,
@@ -16,8 +16,9 @@ export class DetectExistingMediaMigration extends BaseMigration {
   }
 
   async up() {
+    await this.dropAllDuplicatedMedia();
+
     const detect = async (f: FileVersion) => {
-      this.logger.info('Detecting', f);
       try {
         const result = await this.mediaService.detectAndSave(f);
         this.logger.info('Detected and saved media', {
@@ -80,4 +81,14 @@ export class DetectExistingMediaMigration extends BaseMigration {
       // eslint-disable-next-line no-constant-condition
     } while (true);
   }
+
+  private async dropAllDuplicatedMedia() {
+    await this.db.query().raw`
+      match (fv:FileVersion)-->(media:Media)
+      with fv, collect(media) as medias
+      where size(medias) > 1
+      unwind medias as media
+      detach delete media
+    `.executeAndLogStats();
+  }
 }

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

@@ -1,17 +1,10 @@
 import { Injectable } from '@nestjs/common';
 import { inArray, node, or, Query, relation } from 'cypher-query-builder';
-import { Except, RequireAtLeastOne } from 'type-fest';
-import { ID, ServerException } from '~/common';
+import { RequireAtLeastOne } from 'type-fest';
+import { EnhancedResource, generateId, ID, ServerException } from '~/common';
 import { CommonRepository } from '~/core';
-import {
-  ACTIVE,
-  apoc,
-  createNode,
-  createRelationships,
-  merge,
-  variable,
-} from '~/core/database/query';
-import { AnyMedia, Media, MediaUserMetadata, resolveMedia } from './media.dto';
+import { ACTIVE, apoc, merge } from '~/core/database/query';
+import { AnyMedia, MediaUserMetadata, resolveMedia } from './media.dto';
 
 @Injectable()
 export class MediaRepository extends CommonRepository {
@@ -50,19 +43,33 @@ export class MediaRepository extends CommonRepository {
       );
   }
 
-  async create(input: Except<AnyMedia, 'id'>) {
+  async save(
+    input: RequireAtLeastOne<Pick<AnyMedia, 'id' | 'file'>> & Partial<AnyMedia>,
+  ) {
+    const res = input.__typename
+      ? EnhancedResource.of(resolveMedia(input as AnyMedia))
+      : undefined;
     const query = this.db
       .query()
-      .matchNode('fv', 'FileVersion', { id: input.file })
-      .apply(
-        await createNode(resolveMedia(input), {
-          baseNodeProps: toDbShape(input),
-        }),
-      )
-      .apply(
-        createRelationships(Media, 'in', {
-          media: variable('fv'),
-        }),
+      .merge([
+        node('fv', 'FileVersion', input.file ? { id: input.file } : {}),
+        relation('out', '', 'media'),
+        node('node', 'Media', input.id ? { id: input.id } : {}),
+      ])
+      .onCreate.set({
+        values: { 'node.id': await generateId() },
+        variables: { 'node.createdAt': 'datetime()' },
+      })
+      .setValues({ node: toDbShape(input) }, true)
+      .with('node, fv')
+      // Update the labels if typename is given, and maybe changed.
+      .apply((q) =>
+        res
+          ? q.raw(
+              'CALL apoc.create.setLabels(node, $newLabels) yield node as labelsAdded',
+              { newLabels: res.dbLabels },
+            )
+          : q,
       )
       // Grab the previous media node or null
       .subQuery('fv', (sub) =>
@@ -81,7 +88,7 @@ export class MediaRepository extends CommonRepository {
           ])
           .return('prevMedia')
           .orderBy('fvs.createdAt', 'DESC')
-          .limit(1),
+          .raw('LIMIT 1'),
       )
       // Use previous user metadata as defaults for new media
       .with('node, fv, prevMedia')
@@ -100,26 +107,6 @@ export class MediaRepository extends CommonRepository {
       )
       .apply(this.hydrate());
 
-    const result = await query.first();
-    if (!result) {
-      throw new ServerException('Failed to create media info');
-    }
-    return result.dto;
-  }
-
-  async update(
-    input: RequireAtLeastOne<Pick<AnyMedia, 'id' | 'file'>> & Partial<AnyMedia>,
-  ) {
-    const query = this.db
-      .query()
-      .match([
-        node('fv', 'FileVersion', input.file ? { id: input.file } : {}),
-        relation('out', '', 'media'),
-        node('node', 'Media', input.id ? { id: input.id } : {}),
-      ])
-      .setValues({ node: toDbShape(input) }, true)
-      .apply(this.hydrate());
-
     const result = await query.first();
     if (!result) {
       throw new ServerException('Failed to save media info');

src/components/file/media/media.service.ts

@@ -18,7 +18,7 @@ export class MediaService {
     if (!media) {
       return null;
     }
-    return await this.repo.create({
+    return await this.repo.save({
       file: file.id as IdOf<FileVersion>,
       mimeType: file.mimeType,
       ...media,
@@ -30,7 +30,7 @@ export class MediaService {
     input: RequireAtLeastOne<Pick<AnyMedia, 'id' | 'file'>> & MediaUserMetadata,
   ) {
     try {
-      return await this.repo.update(input);
+      return await this.repo.save(input);
     } catch (e) {
       if (e instanceof ServerException) {
         const exists = await this.repo.getBaseNode(