Moved logic to static service

Author: suratdas

src/static/aws/s3.service.ts

@@ -3,6 +3,7 @@ import { Logger } from '@nestjs/common';
 import { Static } from '../static.interface';
 import { DeleteObjectCommand, GetObjectCommand, PutObjectCommand, S3Client } from '@aws-sdk/client-s3';
 import { Readable } from 'stream';
+import { getSignedUrl } from '@aws-sdk/s3-request-presigner';
 
 export class AWSS3Service implements Static {
   private readonly logger: Logger = new Logger(AWSS3Service.name);
@@ -53,6 +54,14 @@ export class AWSS3Service implements Static {
     }
   }
 
+  async getImageUrl(imageName: string): Promise<string> {
+    const command = new GetObjectCommand({
+      Bucket: `${this.AWS_S3_BUCKET_NAME}`,
+      Key: imageName,
+    });
+    return getSignedUrl(this.s3Client, command, { expiresIn: 3600 });
+  }
+
   async deleteImage(imageName: string): Promise<boolean> {
     if (!imageName) return false;
     try {

src/static/hdd/hdd.service.ts

@@ -21,6 +21,10 @@ export class HddService implements Static {
     return path.resolve(HDD_IMAGE_PATH, imageName);
   }
 
+  getImageUrl(imageName: string): Promise<string> {
+    return Promise.resolve('/' + imageName);
+  }
+
   async saveImage(type: 'screenshot' | 'diff' | 'baseline', imageBuffer: Buffer): Promise<string> {
     try {
       new PNG().parse(imageBuffer);

src/static/static.controller.ts

@@ -1,41 +1,20 @@
 import { Controller, Get, Logger, Param, Res } from '@nestjs/common';
 import { Response } from 'express';
 import { ApiOkResponse, ApiTags } from '@nestjs/swagger';
-import { isHddStaticServiceConfigured, isS3ServiceConfigured } from './utils';
-import { GetObjectCommand, S3Client } from '@aws-sdk/client-s3';
-import { getSignedUrl } from '@aws-sdk/s3-request-presigner';
+import { StaticService } from './static.service';
 
 @ApiTags('images')
 @Controller('images')
 export class StaticController {
   private readonly logger: Logger = new Logger(StaticController.name);
+  constructor(private staticService: StaticService) {}
 
   @Get('/:fileName')
   @ApiOkResponse()
   async getUrlAndRedirect(@Param('fileName') fileName: string, @Res() res: Response) {
     try {
-      if (isHddStaticServiceConfigured()) {
-        res.redirect('/' + fileName);
-      }
-      if (isS3ServiceConfigured()) {
-        const AWS_ACCESS_KEY_ID = process.env.AWS_ACCESS_KEY_ID;
-        const AWS_SECRET_ACCESS_KEY = process.env.AWS_SECRET_ACCESS_KEY;
-        const AWS_REGION = process.env.AWS_REGION;
-        const AWS_S3_BUCKET_NAME = process.env.AWS_S3_BUCKET_NAME;
-
-        const s3Client = new S3Client({
-          credentials: {
-            accessKeyId: `${AWS_ACCESS_KEY_ID}`,
-            secretAccessKey: `${AWS_SECRET_ACCESS_KEY}`,
-          },
-          region: `${AWS_REGION}`,
-        });
-        const command = new GetObjectCommand({
-          Bucket: `${AWS_S3_BUCKET_NAME}`,
-          Key: fileName,
-        });
-        res.redirect(await getSignedUrl(s3Client, command, { expiresIn: 3600 }));
-      }
+      const url = await this.staticService.getImageUrl(fileName);
+      res.redirect(url);
     } catch (error) {
       this.logger.error('Error fetching file from S3:' + fileName, error);
       res.status(500).send('Error occurred while getting the file.');

src/static/static.interface.ts

@@ -4,4 +4,5 @@ export interface Static {
   saveImage(type: 'screenshot' | 'diff' | 'baseline', imageBuffer: Buffer): Promise<string>;
   getImage(fileName: string): Promise<PNGWithMetadata>;
   deleteImage(imageName: string): Promise<boolean>;
+  getImageUrl(imageName: string): Promise<string>;
 }

src/static/static.service.ts

@@ -23,4 +23,8 @@ export class StaticService {
   async deleteImage(imageName: string): Promise<boolean> {
     return this.staticService.deleteImage(imageName);
   }
+
+  async getImageUrl(imageName: string): Promise<string> {
+    return this.staticService.getImageUrl(imageName);
+  }
 }