tests: add tests for new routes

Author: AlbanSdl

prisma/schema.prisma

@@ -171,10 +171,10 @@ model ImageMedia {
   height     Int              @db.UnsignedInt
   uploadedAt DateTime         @default(now())
   isPublic   Boolean          @default(false)
-  uploaderId String
+  uploaderId String?
   preset     ImageMediaPreset
 
-  uploader            User        @relation(fields: [uploaderId], references: [id])
+  uploader            User?       @relation(fields: [uploaderId], references: [id])
   avatarForUsers      UserInfos[]
   logoForAssos        Asso[]      @relation("logo")
   descriptionForAssos Asso[]      @relation("descriptionImages")

src/app.module.ts

@@ -22,6 +22,7 @@ import { ImageMediaModule } from './media/image/imagemedia.module';
     ConfigModule,
     HttpModule,
     PrismaModule,
+    ImageMediaModule,
     SemesterModule,
     AuthModule,
     ProfileModule,
@@ -30,7 +31,6 @@ import { ImageMediaModule } from './media/image/imagemedia.module';
     TimetableModule,
     BranchModule,
     AssosModule,
-    ImageMediaModule,
   ],
   // The providers below are used for all the routes of the api.
   // For example, the JwtGuard is used for all the routes and checks whether the user is authenticated.

src/assos/assos.controller.ts

@@ -81,10 +81,10 @@ export class AssosController {
     if (!(await this.assosService.hasSomeAssoPermission(asso, user.id, 'manage_infos')))
       throw new AppException(ERROR_CODE.FORBIDDEN_ASSOS_PERMISSIONS, asso.id, 'manage_infos');
     for (const key in body.description)
-      if (!isValidLexicalContent(body.description[key]))
+      if (body.description[key] && !isValidLexicalContent(body.description[key]))
         throw new AppException(ERROR_CODE.PARAM_LEXICAL_ILLEGAL, `description.${key}`);
     for (const key in body.descriptionShort)
-      if (!isValidLexicalContent(body.descriptionShort[key]))
+      if (body.descriptionShort[key] && !isValidLexicalContent(body.descriptionShort[key]))
         throw new AppException(ERROR_CODE.PARAM_LEXICAL_ILLEGAL, `descriptionShort.${key}`);
     if (body.logo) {
       const media = await this.mediaService.getMedia(body.logo);

src/assos/assos.module.ts

@@ -1,6 +1,7 @@
 import { Module } from '@nestjs/common';
 import { AssosController } from './assos.controller';
 import { AssosService } from './assos.service';
+import { ImageMediaModule } from '../media/image/imagemedia.module';
 import UsersService from '../users/users.service';
 
 /**
@@ -10,5 +11,6 @@ import UsersService from '../users/users.service';
 @Module({
   controllers: [AssosController],
   providers: [AssosService, UsersService],
+  imports: [ImageMediaModule],
 })
 export class AssosModule {}

src/assos/assos.service.ts

@@ -97,7 +97,7 @@ export class AssosService {
     });
     if (update.description || update.descriptionShort) {
       // Cleanup unused images
-      const regex = /"src": "https:\/\/[^"]+\/media\/image\/([^/]+)\.webp"/g;
+      const regex = /"src":"https:\/\/[^"]+\/media\/image\/([^/]+)\.webp"/g;
       const imagesInUse = new Set<string>();
       for (const field in updated.descriptionTranslation)
         for (const match of (<string>updated.descriptionTranslation[field]).matchAll(regex)) imagesInUse.add(match[1]);
@@ -112,18 +112,25 @@ export class AssosService {
           })
         ).map((m) => m.id),
       );
-      const deletions = currentImages.difference(imagesInUse);
-      const additions = imagesInUse.difference(currentImages);
-      if (deletions.size > 0 || additions.size > 0)
-        // don't wait for this to complete
-        this.prisma.$transaction([
+      const deletions = [...currentImages].filter((x) => !imagesInUse.has(x));
+      const additions = [...imagesInUse].filter((x) => !currentImages.has(x));
+      const existingAdditionIds = new Set(
+        (
+          await this.prisma.imageMedia.findMany({
+            where: { id: { in: additions } },
+            select: { id: true },
+          })
+        ).map((m) => m.id),
+      );
+      if (deletions.length > 0 || additions.length > 0)
+        await this.prisma.$transaction([
           ...Array.from(deletions).map((id) =>
             this.prisma.imageMedia.update({
               where: { id },
               data: { descriptionForAssos: { disconnect: { id: assoId } } },
             }),
           ),
-          ...Array.from(additions).map((id) =>
+          ...Array.from(additions.filter((x) => existingAdditionIds.has(x))).map((id) =>
             this.prisma.imageMedia.update({
               where: { id },
               data: { descriptionForAssos: { connect: { id: assoId } } },

src/assos/dto/req/assos-update-req.dto.ts

@@ -9,7 +9,7 @@ import {
   IsUUID,
   ValidateNested,
 } from 'class-validator';
-import { TranslatedTextDto } from 'src/utils';
+import { TranslatedTextDto } from '../../../utils';
 
 export default class AssosUpdateReqDto {
   @IsOptional()

src/media/image/dto/req/imagemedia-upload-req.dto.ts

@@ -1,35 +1,41 @@
 import { ImageMediaPreset } from '@prisma/client';
+import { Type } from 'class-transformer';
 import { IsBoolean, IsEnum, IsInt, IsOptional, IsString, Max, Min } from 'class-validator';
 
 export default class ImageMediaUploadReqDto {
   @IsOptional()
   @IsInt()
   @Min(100)
   @Max(1920)
+  @Type(() => Number)
   width?: number;
 
   @IsOptional()
   @IsInt()
   @Min(100)
   @Max(1080)
+  @Type(() => Number)
   height?: number;
 
   @IsOptional()
   @IsInt()
   @Min(1)
   @Max(100)
+  @Type(() => Number)
   quality?: number;
 
   @IsOptional()
   @IsInt()
   @Min(0)
   @Max(6)
+  @Type(() => Number)
   effort?: number;
 
   @IsOptional()
   @IsInt()
   @Min(0)
   @Max(3)
+  @Type(() => Number)
   rotation?: 0 | 1 | 2 | 3;
 
   @IsOptional()
@@ -40,5 +46,6 @@ export default class ImageMediaUploadReqDto {
   /** By default, images are NOT public and only accessible to logged users. */
   @IsOptional()
   @IsBoolean()
+  @Type(() => Boolean)
   public?: boolean;
 }

src/media/image/imagemedia.controller.ts

@@ -28,13 +28,14 @@ export class ImageMediaController {
     const media = await this.imageMediaService.getMedia(mediaId);
     if (!media) throw new AppException(ERROR_CODE.NO_SUCH_MEDIA, mediaId);
     if (!media.isPublic && !user) throw new AppException(ERROR_CODE.NOT_LOGGED_IN);
-    try {
-      const stream = this.imageMediaService.readMediaFromDisk(mediaId);
-      response.setHeader('Content-Type', 'image/webp');
-      stream.pipe(response);
-    } catch {
-      throw new AppException(ERROR_CODE.SERVER_DISK_ERROR);
-    }
+    const stream = this.imageMediaService.readMediaFromDisk(mediaId);
+    response.setHeader('Content-Type', 'image/webp');
+    stream.pipe(response);
+    stream.on('error', () => {
+      stream.close();
+      const exception = new AppException(ERROR_CODE.SERVER_DISK_ERROR);
+      response.status(exception.getStatus()).json(exception.getResponse());
+    });
   }
 
   @Post('/')
@@ -55,9 +56,9 @@ export class ImageMediaController {
     const media = await this.imageMediaService.convertMedia(multer, options);
     const savedMedia = await this.imageMediaService.registerMedia(media, user, options.public ?? false);
     try {
-      this.imageMediaService.writeMediaToDisk(savedMedia.id, multer.multer.buffer);
+      await this.imageMediaService.writeMediaToDisk(savedMedia.id, multer.multer.buffer);
     } catch {
-      this.imageMediaService.unRegisterMedia(savedMedia.id);
+      await this.imageMediaService.unRegisterMedia(savedMedia.id);
       throw new AppException(ERROR_CODE.SERVER_DISK_ERROR);
     }
     this.imageMediaService.cleanup();

src/media/image/imagemedia.module.ts

@@ -5,5 +5,6 @@ import { ImageMediaService } from './imagemedia.service';
 @Module({
   controllers: [ImageMediaController],
   providers: [ImageMediaService],
+  exports: [ImageMediaService],
 })
 export class ImageMediaModule {}

src/media/image/imagemedia.service.ts

@@ -32,7 +32,7 @@ export class ImageMediaService {
     if (!(options.preset in presets)) options.preset = ImageMediaPreset.CUSTOM;
     if (options.preset) Object.assign(options, presets[options.preset]);
     let instructions = sharp(file.multer.buffer);
-    const metadata = await instructions.metadata();
+    let metadata = await instructions.metadata();
     const size = [metadata.width, metadata.height];
     if (options.rotation) {
       instructions = instructions.rotate(options.rotation * 90);
@@ -43,16 +43,16 @@ export class ImageMediaService {
     if (options.width && options.height)
       instructions = instructions.resize(options.width, options.height, { fit: 'cover' });
     file.mime = 'image/webp';
-    file.multer.buffer = await instructions
-      .webp({
-        quality: options.quality,
-        effort: options.effort,
-        nearLossless: true,
-        smartSubsample: true,
-        alphaQuality: options.quality,
-      })
-      .toBuffer();
-    return { width: size[0], height: size[1], size: file.multer.buffer.length, preset: options.preset };
+    instructions = instructions.webp({
+      quality: options.quality,
+      effort: options.effort,
+      nearLossless: true,
+      smartSubsample: true,
+      alphaQuality: options.quality,
+    });
+    file.multer.buffer = await instructions.toBuffer();
+    metadata = await sharp(file.multer.buffer).metadata();
+    return { width: metadata.width, height: metadata.height, size: file.multer.buffer.length, preset: options.preset };
   }
 
   async registerMedia(metaData: ImageMetadata, uploader: User, isPublic: boolean): Promise<ImageMedia> {