Merge branch 'next' of https://github.com/BinaryStudioAcademy/bsa-2024-outreachvids into task/OV-307-show-video-thumbnails

Author: lfelix3011

backend/.env.example

@@ -26,6 +26,7 @@ AWS_SECRET_ACCESS_KEY=see-in-slack
 AWS_S3_REGION=eu-north-1
 AWS_S3_BUCKET_NAME=bsa-2024-outreachvids
 AWS_CLOUDFRONT_DOMAIN_ID=d2tm5q3cg1nlwf
+AWS_CLOUDFRONT_DOMAIN_ID_FOR_RENDERED_VIDEO=SOME_SECRET_KEY
 
 #
 # OPEN AI
@@ -48,3 +49,10 @@ ORIGIN=http://localhost:3000
 AZURE_SUBSCRIPTION_KEY=see-in-slack
 AZURE_SERVICE_REGION=see-in-slack
 AZURE_SERVICE_ENDPOINT=see-in-slack
+
+#
+# REMOTION
+#
+REMOTION_LAMBDA_FUNCTION_NAME=SOME_SECRET_KEY
+REMOTION_SERVE_URL=SOME_SECRET_KEY
+REMOTION_BUCKET_NAME=SOME_SECRET_KEY

backend/package.json

@@ -38,6 +38,7 @@
         "@fastify/static": "7.0.4",
         "@fastify/swagger": "8.15.0",
         "@fastify/swagger-ui": "4.0.1",
+        "@remotion/lambda": "4.0.201",
         "bcrypt": "5.1.1",
         "convict": "6.2.4",
         "dotenv": "16.4.5",

backend/src/bundles/auth/auth.controller.ts

@@ -10,7 +10,7 @@ import {
     BaseController,
 } from '~/common/controller/controller.js';
 import { ApiPath } from '~/common/enums/enums.js';
-import { HttpCode, HTTPMethod } from '~/common/http/http.js';
+import { HTTPCode, HTTPMethod } from '~/common/http/http.js';
 import { type Logger } from '~/common/logger/logger.js';
 
 import { type AuthService } from './auth.service.js';
@@ -95,7 +95,7 @@ class AuthController extends BaseController {
     ): Promise<ApiHandlerResponse> {
         return {
             payload: await this.authService.signIn(options.body),
-            status: HttpCode.OK,
+            status: HTTPCode.OK,
         };
     }
 
@@ -144,7 +144,7 @@ class AuthController extends BaseController {
         }>,
     ): Promise<ApiHandlerResponse> {
         return {
-            status: HttpCode.CREATED,
+            status: HTTPCode.CREATED,
             payload: await this.authService.signUp(options.body),
         };
     }

backend/src/bundles/auth/auth.service.ts

@@ -7,7 +7,7 @@ import {
     type UserSignInRequestDto,
     type UserSignInResponseDto,
 } from '~/bundles/users/users.js';
-import { HttpCode, HttpError } from '~/common/http/http.js';
+import { HTTPCode, HttpError } from '~/common/http/http.js';
 import { cryptService, tokenService } from '~/common/services/services.js';
 
 import { UserValidationMessage } from './enums/enums.js';
@@ -28,21 +28,21 @@ class AuthService {
         if (!user) {
             throw new HttpError({
                 message: UserValidationMessage.WRONG_CREDENTIALS,
-                status: HttpCode.BAD_REQUEST,
+                status: HTTPCode.BAD_REQUEST,
             });
         }
 
         const { passwordHash } = user.toNewObject();
 
-        const isPwdCorrect = cryptService.compareSyncPassword(
+        const isPasswordCorrect = cryptService.compareSyncPassword(
             password,
             passwordHash,
         );
 
-        if (!isPwdCorrect) {
+        if (!isPasswordCorrect) {
             throw new HttpError({
                 message: UserValidationMessage.WRONG_CREDENTIALS,
-                status: HttpCode.BAD_REQUEST,
+                status: HTTPCode.BAD_REQUEST,
             });
         }
 
@@ -60,7 +60,7 @@ class AuthService {
         if (emailExists) {
             throw new HttpError({
                 message: UserValidationMessage.EMAIL_ALREADY_EXISTS,
-                status: HttpCode.BAD_REQUEST,
+                status: HTTPCode.BAD_REQUEST,
             });
         }
         const user = await this.userService.create(userRequestDto);

backend/src/bundles/avatar-videos/avatar-videos.controller.ts

@@ -5,7 +5,7 @@ import {
     type ApiHandlerResponse,
 } from '~/common/controller/controller.js';
 import { BaseController } from '~/common/controller/controller.js';
-import { HttpCode, HTTPMethod } from '~/common/http/http.js';
+import { HTTPCode, HTTPMethod } from '~/common/http/http.js';
 import { type Logger } from '~/common/logger/logger.js';
 
 import { type AvatarVideoService } from './avatar-videos.service.js';
@@ -77,24 +77,28 @@ class AvatarVideoController extends BaseController {
         }>,
     ): Promise<ApiHandlerResponse> {
         const userId = (options.user as UserGetCurrentResponseDto).id;
-        const videoRecord = await this.avatarVideoService.createVideo({
-            ...options.body,
-            userId,
-        });
+        const { composition, name, videoId } = options.body;
 
-        const avatarsConfigs = this.avatarVideoService.getAvatarsConfigs(
-            options.body.composition,
-        );
+        const videoPayload = {
+            name,
+            composition,
+        };
+
+        const videoRecord = await (videoId
+            ? this.avatarVideoService.updateVideo({ ...videoPayload, videoId })
+            : this.avatarVideoService.createVideo({ ...videoPayload, userId }));
+
+        const avatarsConfigs =
+            this.avatarVideoService.getAvatarsConfigs(composition);
 
         await this.avatarVideoService.submitAvatarsConfigs(
             avatarsConfigs,
-            userId,
             videoRecord.id,
         );
 
         return {
             payload: { status: ResponseStatus.SUBMITTED },
-            status: HttpCode.CREATED,
+            status: HTTPCode.CREATED,
         };
     }
 }