Merge pull request #13 from deployment-helper/dev

Dev

Author: vinaymavi

app-management/apps/app-management/src/app.module.ts

@@ -1,5 +1,5 @@
 import { Module } from '@nestjs/common';
-import { ConfigModule } from '@nestjs/config';
+import { ConfigModule, ConfigService } from '@nestjs/config';
 
 import { AppController } from './app.controller';
 import { AppService } from './app.service';
@@ -13,10 +13,33 @@ import { OpenapiModule } from './openapi/openapi.module';
 import { WorkflowsController } from './workflows/workflows.controller';
 import { ChatgptService } from '@app/shared/openapi/chatgpt.service';
 import { FirestoreService } from '@app/shared/gcp/firestore.service';
+import { BatchController } from './batch.controller';
+import { BullModule } from '@nestjs/bull';
+import {
+  REDIS_QUEUE_VIDEO_GENERATOR,
+  REDIS_QUEUE_VIDEO_RECORDER,
+} from '@apps/batch-server/constants';
 
 @Module({
   imports: [
     ConfigModule.forRoot({ isGlobal: true }),
+    BullModule.forRootAsync({
+      imports: [ConfigModule],
+      inject: [ConfigService],
+      useFactory: async (config: ConfigService) => ({
+        redis: {
+          host: config.getOrThrow('REDIS_HOST'),
+          port: config.getOrThrow('REDIS_PORT'),
+          password: config.getOrThrow('REDIS_PASS'),
+        },
+      }),
+    }),
+    BullModule.registerQueue({
+      name: REDIS_QUEUE_VIDEO_RECORDER,
+    }),
+    BullModule.registerQueue({
+      name: REDIS_QUEUE_VIDEO_GENERATOR,
+    }),
     AuthModule,
     YoutubeModule,
     SlidesModule,
@@ -25,7 +48,7 @@ import { FirestoreService } from '@app/shared/gcp/firestore.service';
     AiModule,
     OpenapiModule,
   ],
-  controllers: [AppController, WorkflowsController],
+  controllers: [AppController, WorkflowsController, BatchController],
   providers: [AppService, ChatgptService, FirestoreService],
 })
 export class AppModule {}

app-management/apps/app-management/src/aws/s3.service.spec.ts

@@ -1,12 +1,15 @@
 import { Test, TestingModule } from '@nestjs/testing';
 import { S3Service } from './s3.service';
+import { FsService } from '@app/shared/fs/fs.service';
+import { ConfigModule } from '@nestjs/config';
 
 describe('S3Service', () => {
   let service: S3Service;
 
   beforeEach(async () => {
     const module: TestingModule = await Test.createTestingModule({
-      providers: [S3Service],
+      providers: [S3Service, FsService],
+      imports: [ConfigModule.forRoot({ isGlobal: true })],
     }).compile();
 
     service = module.get<S3Service>(S3Service);

app-management/apps/app-management/src/batch.controller.spec.ts

@@ -0,0 +1,63 @@
+import { Test, TestingModule } from '@nestjs/testing';
+import { BatchController } from './batch.controller';
+import { ConfigModule, ConfigService } from '@nestjs/config';
+import {
+  REDIS_QUEUE_VIDEO_GENERATOR,
+  REDIS_QUEUE_VIDEO_RECORDER,
+} from '../../batch-server/src/constants';
+import { BullModule } from '@nestjs/bull';
+import { Queue } from 'bull';
+
+describe('BatchController', () => {
+  let controller: BatchController;
+  let recorderQueueMock: Queue;
+  let generatorQueueMock: Queue;
+
+  beforeEach(async () => {
+    recorderQueueMock = {
+      add: jest.fn(),
+    } as unknown as Queue;
+
+    generatorQueueMock = {
+      add: jest.fn(),
+    } as unknown as Queue;
+
+    const configServiceMock = {
+      getOrThrow: jest.fn(), // Mock the get method
+    } as unknown as ConfigService;
+
+    const module: TestingModule = await Test.createTestingModule({
+      controllers: [BatchController],
+      providers: [
+        ConfigService,
+        {
+          provide: ConfigService,
+          useValue: configServiceMock,
+        },
+        {
+          provide: REDIS_QUEUE_VIDEO_RECORDER,
+          useValue: recorderQueueMock,
+        },
+        {
+          provide: REDIS_QUEUE_VIDEO_GENERATOR,
+          useValue: generatorQueueMock,
+        },
+      ],
+      imports: [
+        ConfigModule.forRoot({ isGlobal: true }),
+        BullModule.registerQueue({
+          name: REDIS_QUEUE_VIDEO_RECORDER,
+        }),
+        BullModule.registerQueue({
+          name: REDIS_QUEUE_VIDEO_GENERATOR,
+        }),
+      ],
+    }).compile();
+
+    controller = module.get<BatchController>(BatchController);
+  });
+
+  it('should be defined', () => {
+    expect(controller).toBeDefined();
+  });
+});

app-management/apps/app-management/src/batch.controller.ts

@@ -0,0 +1,27 @@
+import { Body, Controller, Post, UseGuards } from '@nestjs/common';
+import { AuthGuard } from '@apps/app-management/auth/auth.guard';
+import { InjectQueue } from '@nestjs/bull';
+import {
+  REDIS_QUEUE_VIDEO_GENERATOR,
+  REDIS_QUEUE_VIDEO_RECORDER,
+} from '@app/shared/constants';
+
+import { Queue } from 'bull';
+import { IGenerateVideoDto } from '@apps/batch-server/types';
+
+@Controller('batch')
+@UseGuards(AuthGuard)
+export class BatchController {
+  constructor(
+    @InjectQueue(REDIS_QUEUE_VIDEO_RECORDER)
+    private readonly recorderQueue: Queue,
+    @InjectQueue(REDIS_QUEUE_VIDEO_GENERATOR)
+    private readonly generatorQueue: Queue,
+  ) {}
+
+  @Post('generate/v2')
+  async generateV2(@Body() p: IGenerateVideoDto) {
+    const data = await this.generatorQueue.add(p);
+    return data;
+  }
+}

app-management/apps/app-management/src/constants.ts

@@ -4,3 +4,6 @@ export const DEFAULT_PROJECT_NAME = 'Dream';
 
 // S3 File names
 export const S3_VIDEO_META_DATA_FILE_NAME = 'videoMetaData.json';
+export const REDIS_QUEUE_VIDEO_RECORDER = 'video-recorder';
+export const REDIS_QUEUE_MP3_GENERATOR = 'mp3-generator';
+export const REDIS_QUEUE_VIDEO_GENERATOR = 'video-generator';

app-management/apps/app-management/src/models/user.model.ts

@@ -7,18 +7,18 @@ import {
 import { GetCommand, PutCommand } from '@aws-sdk/lib-dynamodb';
 import { USER_TABLE_NAME } from '@apps/app-management/constants';
 
-export class ProjectModel implements IProject {
-  projectId: string;
+export class ProjectModel implements Partial<IProject> {
+  id: string;
   projectName: string;
 
   constructor(name: string) {
     this.projectName = name;
-    this.projectId = uuid();
+    this.id = uuid();
   }
 
   toJson() {
     return {
-      projectId: this.projectId,
+      projectId: this.id,
       projectName: this.projectName,
     };
   }

app-management/apps/app-management/src/types.ts

@@ -11,7 +11,7 @@ export enum ProjectTypes {
 }
 
 export interface IProject {
-  projectId: string;
+  id: string;
   projectName: string;
   userId: string;
   assets: string[];

app-management/apps/app-management/src/video/project.controller.ts

@@ -10,13 +10,19 @@ import {
 } from '@nestjs/common';
 import { AuthGuard } from '@apps/app-management/auth/auth.guard';
 import { FirestoreService } from '@app/shared/gcp/firestore.service';
-import { filter } from 'rxjs';
 
 @Controller('projects')
 @UseGuards(AuthGuard)
 export class ProjectController {
   constructor(private readonly firestoreService: FirestoreService) {}
-  @Post()
+
+  @Get('/fix')
+  async fixCollection() {
+    await this.firestoreService.fixCreatedAtAndUpdatedAt('project');
+    return 'done';
+  }
+
+  @Post('/')
   // project_name: string
   createProject(
     @Body() data: { projectName: string; projectDesc: string },
@@ -28,7 +34,7 @@ export class ProjectController {
     });
   }
 
-  @Get()
+  @Get('/')
   async getProjects(@Req() req: any) {
     return this.firestoreService.listByFields('project', [
       { field: 'userId', value: req.user.sub },

app-management/apps/app-management/src/video/video.controller.ts

@@ -25,11 +25,30 @@ export class VideoController {
     private readonly gemini: GeminiService,
   ) {}
 
+  @Get('/fix')
+  async fixCollection() {
+    await this.fireStore.fixCreatedAtAndUpdatedAt('video');
+    return 'done';
+  }
+
   // create a video
   @Post('/')
   async createVideo(@Body() data: any, @Req() req: any) {
+    // convert properties to object
+    const obj = {};
+    if (data.properties) {
+      const pairs = data.properties.split('\n');
+
+      pairs.forEach((pair) => {
+        const [key, value] = pair.split('=');
+        obj[key] = value;
+      });
+      delete data.properties;
+    }
+
     const video = await this.fireStore.add('video', {
       ...data,
+      ...obj,
       isDeleted: false,
       userId: req.user.sub,
     });
@@ -89,13 +108,21 @@ export class VideoController {
     @Query('addAfter') addAfter: boolean,
     @Body() data: any,
   ) {
-    return this.fireStore.updateScene(
-      `video/${id}/scenes`,
-      sceneId,
-      data,
-      sceneArrayIndex,
-      addAfter,
-    );
+    if (data?.scenes && Array.isArray(data.scenes)) {
+      return this.fireStore.updateScene(
+        `video/${id}/scenes`,
+        sceneId,
+        data?.scenes,
+      );
+    } else {
+      return this.fireStore.updateScene(
+        `video/${id}/scenes`,
+        sceneId,
+        data,
+        sceneArrayIndex,
+        addAfter,
+      );
+    }
   }
 
   // Delete a scene

app-management/apps/app-management/src/workflows/workflows.controller.spec.ts

@@ -1,12 +1,17 @@
 import { Test, TestingModule } from '@nestjs/testing';
 import { WorkflowsController } from './workflows.controller';
+import { ConfigModule } from '@nestjs/config';
+import { ChatgptService } from '@app/shared/openapi/chatgpt.service';
+import { FirestoreService } from '@app/shared/gcp/firestore.service';
 
 describe('WorkflowsController', () => {
   let controller: WorkflowsController;
 
   beforeEach(async () => {
     const module: TestingModule = await Test.createTestingModule({
       controllers: [WorkflowsController],
+      providers: [ChatgptService, FirestoreService],
+      imports: [ConfigModule.forRoot({ isGlobal: true })],
     }).compile();
 
     controller = module.get<WorkflowsController>(WorkflowsController);