OV-423: * pass scene instead of composition

BinaryStudioAcademy · Sep 26, 2024 · 501b067 · 501b067
1 parent 163b7bf
commit 501b067
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 8 deletions.
diff --git a/backend/src/bundles/videos/types/types.ts b/backend/src/bundles/videos/types/types.ts
@@ -1,5 +1,6 @@
 export {
     type CreateVideoRequestDto,
+    type Scene,
     type UpdateVideoRequestDto,
     type UserGetCurrentResponseDto,
     type VideoGetAllItemResponseDto,

diff --git a/backend/src/bundles/videos/video.repository.ts b/backend/src/bundles/videos/video.repository.ts
@@ -1,4 +1,7 @@
-import { type UpdateVideoRequestDto } from '~/bundles/videos/types/types.js';
+import {
+    type Scene,
+    type UpdateVideoRequestDto,
+} from '~/bundles/videos/types/types.js';
 import { VideoEntity } from '~/bundles/videos/video.entity.js';
 import { type VideoModel } from '~/bundles/videos/video.model.js';
 import { type ImageService } from '~/common/services/image/image.service.js';
@@ -65,7 +68,7 @@ class VideoRepository implements Repository {
         if (payload.composition) {
             data.composition = payload.composition;
             data.previewUrl = await this.imageService.generatePreview(
-                payload.composition,
+                payload.composition.scenes[0] as Scene,
             );
         }
 

diff --git a/backend/src/bundles/videos/video.service.ts b/backend/src/bundles/videos/video.service.ts
@@ -8,6 +8,7 @@ import { type Service } from '~/common/types/types.js';
 import { VideoValidationMessage } from './enums/enums.js';
 import {
     type CreateVideoRequestDto,
+    type Scene,
     type UpdateVideoRequestDto,
     type VideoGetAllItemResponseDto,
     type VideoGetAllResponseDto,
@@ -61,7 +62,7 @@ class VideoService implements Service {
         payload: CreateVideoRequestDto & { userId: string },
     ): Promise<VideoGetAllItemResponseDto> {
         const previewUrl = await this.imageService.generatePreview(
-            payload.composition,
+            payload.composition.scenes[0] as Scene,
         );
 
         const video = await this.videoRepository.create(

diff --git a/backend/src/common/services/image/image.service.ts b/backend/src/common/services/image/image.service.ts
@@ -4,7 +4,7 @@ import { type FileService } from '~/common/services/file/file.service.js';
 
 import { PREVIEW_HEIGHT, PREVIEW_WIDTH } from './constants/constants.js';
 import { type ImageApi } from './image-base.js';
-import { type Composition } from './types/types.js';
+import { type Scene } from './types/types.js';
 
 type Constructor = {
     fileService: FileService;
@@ -20,9 +20,9 @@ class ImageService {
         this.imageApi = imageApi;
     }
 
-    public async generatePreview(composition: Composition): Promise<string> {
-        const avatarImage = composition.scenes[0]?.avatar?.url ?? '';
-        const background = composition.scenes[0]?.background;
+    public async generatePreview(scene: Scene): Promise<string> {
+        const avatarImage = scene.avatar?.url ?? '';
+        const background = scene.background;
 
         if (background?.url) {
             const backgroundImageBuffer = await this.imageApi.getImageBuffer(

diff --git a/backend/src/common/services/image/types/types.ts b/backend/src/common/services/image/types/types.ts
@@ -1 +1 @@
-export { type Composition } from 'shared';
+export { type Scene } from 'shared';
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		export { type Composition } from 'shared';
		export { type Scene } from 'shared';