Merge branch 'master' into s3-integration

Author: suratdas

.env

@@ -12,14 +12,13 @@ POSTGRES_USER=postgres
 POSTGRES_PASSWORD=postgres
 POSTGRES_DB=vrt_db_dev
 
-#If you store your images in AWS S3 bucket, then you can give this config and it will take that config. A small amout of data is needed to temporarily keep the downloaded images. You can configure the size of that below.
-USE_AWS_S3_BUCKET=false
-AWS_ACCESS_KEY_ID=
-AWS_SECRET_ACCESS_KEY=
-AWS_REGION=
-AWS_S3_BUCKET_NAME=
-# Below is the maximum allowed usage of local space to optimize/prevent multiple download from S3 bucket. Give the value in MB. E.g. enter 1024 for 1GB
-MAX_TEMP_STORAGE_FOR_S3_DOWNLOAD=
+# static 
+STATIC_SERVICE=hdd # hdd | s3 - hdd as default if not provided
+
+# AWS_ACCESS_KEY_ID=
+# AWS_SECRET_ACCESS_KEY=
+# AWS_REGION=
+# AWS_S3_BUCKET_NAME=
 
 # optional
 #HTTPS_KEY_PATH='./secrets/ssl.key'

.vscode/settings.json

@@ -3,5 +3,6 @@
         "**/.git/objects/**": true,
         "**/.git/subtree-cache/**": true,
         "**/.hg/store/**": true
-    }
+    },
+    "jest.runMode":"on-demand"
 }

package-lock.json

@@ -68,7 +68,6 @@
     "@nestjs/testing": "^10.2.5",
     "@types/bcryptjs": "^2.4.4",
     "@types/cache-manager": "^3.4.3",
-    "@types/cron": "^2.4.0",
     "@types/express": "^4.17.17",
     "@types/jest": "^29.5.5",
     "@types/lodash": "^4.14.198",

package.json

@@ -3,24 +3,11 @@ import { CompareService } from './compare.service';
 import { LookSameService } from './libs/looks-same/looks-same.service';
 import { OdiffService } from './libs/odiff/odiff.service';
 import { PixelmatchService } from './libs/pixelmatch/pixelmatch.service';
-import { AWSS3Service } from '../shared/static/aws-s3.servce.';
-import { HardDiskService } from '../shared/static/hard-disk.service';
-import { STATIC_SERVICE, StaticService } from '../shared/static/static-service.interface';
+import { StaticModule } from '../static/static.module';
 
 @Module({
-  providers: [
-    {
-      provide: STATIC_SERVICE,
-      useFactory: (): StaticService => {
-        const isAWSDefined = process.env.USE_AWS_S3_BUCKET?.trim().toLowerCase() === 'true';
-        return isAWSDefined ? new AWSS3Service() : new HardDiskService();
-      },
-    },
-    CompareService,
-    PixelmatchService,
-    LookSameService,
-    OdiffService,
-  ],
+  providers: [CompareService, PixelmatchService, LookSameService, OdiffService],
+  imports: [StaticModule],
   exports: [CompareService],
 })
 export class CompareModule {}

src/compare/compare.module.ts

@@ -4,25 +4,15 @@ import { CompareService } from './compare.service';
 import { LookSameService } from './libs/looks-same/looks-same.service';
 import { OdiffService } from './libs/odiff/odiff.service';
 import { PixelmatchService } from './libs/pixelmatch/pixelmatch.service';
-import { HardDiskService } from '../shared/static/hard-disk.service';
-import { STATIC_SERVICE } from '../shared/static/static-service.interface';
+import { StaticModule } from '../static/static.module';
 
 describe('CompareService', () => {
   let service: CompareService;
 
   beforeEach(async () => {
     const module: TestingModule = await Test.createTestingModule({
-      providers: [
-        {
-          provide: STATIC_SERVICE,
-          useClass: HardDiskService,
-        },
-        CompareService,
-        OdiffService,
-        PixelmatchService,
-        LookSameService,
-        PrismaService,
-      ],
+      providers: [CompareService, OdiffService, PixelmatchService, LookSameService, PrismaService],
+      imports: [StaticModule],
     }).compile();
 
     service = module.get<CompareService>(CompareService);

src/compare/compare.service.spec.ts

@@ -1,19 +1,17 @@
 import { TestingModule, Test } from '@nestjs/testing';
 import { TestStatus } from '@prisma/client';
 import { PNG } from 'pngjs';
+import { StaticService } from '../../../static/static.service';
 import { DIFF_DIMENSION_RESULT, EQUAL_RESULT, NO_BASELINE_RESULT } from '../consts';
 import { DEFAULT_CONFIG, LookSameService } from './looks-same.service';
 import { LooksSameConfig } from './looks-same.types';
-import { HardDiskService } from '../../../shared/static/hard-disk.service';
-import { STATIC_SERVICE } from '../../../shared/static/static-service.interface';
 
 const initService = async ({ getImageMock = jest.fn(), saveImageMock = jest.fn(), deleteImageMock = jest.fn() }) => {
   const module: TestingModule = await Test.createTestingModule({
     providers: [
       LookSameService,
       {
-        provide: STATIC_SERVICE,
-        useClass: HardDiskService,
+        provide: StaticService,
         useValue: {
           getImage: getImageMock,
           saveImage: saveImageMock,

src/compare/libs/looks-same/looks-same.service.spec.ts

@@ -1,7 +1,7 @@
-import { Inject, Injectable, Logger } from '@nestjs/common';
+import { Injectable, Logger } from '@nestjs/common';
 import { TestStatus } from '@prisma/client';
 import { PNG } from 'pngjs';
-import { STATIC_SERVICE, StaticService } from '../../../shared/static/static-service.interface';
+import { StaticService } from '../../../static/static.service';
 import { DiffResult } from '../../../test-runs/diffResult';
 import { applyIgnoreAreas, parseConfig } from '../../utils';
 import { ImageComparator } from '../image-comparator.interface';
@@ -21,7 +21,7 @@ export const DEFAULT_CONFIG: LooksSameConfig = {
 export class LookSameService implements ImageComparator {
   private readonly logger: Logger = new Logger(LookSameService.name);
 
-  constructor(@Inject(STATIC_SERVICE) private staticService: StaticService) {}
+  constructor(private staticService: StaticService) {}
 
   parseConfig(configJson: string): LooksSameConfig {
     return parseConfig(configJson, DEFAULT_CONFIG, this.logger);

src/compare/libs/looks-same/looks-same.service.ts

@@ -1,12 +1,11 @@
 import { TestingModule, Test } from '@nestjs/testing';
 import { TestStatus } from '@prisma/client';
 import { IgnoreAreaDto } from 'src/test-runs/dto/ignore-area.dto';
+import { StaticService } from '../../../static/static.service';
 import { DIFF_DIMENSION_RESULT, NO_BASELINE_RESULT } from '../consts';
 import { OdiffService, DEFAULT_CONFIG, ignoreAreaToRegionMapper } from './odiff.service';
 import { OdiffConfig, OdiffIgnoreRegions } from './odiff.types';
 import { compare } from 'odiff-bin';
-import { HardDiskService } from '../../../shared/static/hard-disk.service';
-import { STATIC_SERVICE } from '../../../shared/static/static-service.interface';
 
 jest.mock('odiff-bin', () => ({
   compare: jest.fn(),
@@ -23,8 +22,7 @@ const initService = async ({
     providers: [
       OdiffService,
       {
-        provide: STATIC_SERVICE,
-        useClass: HardDiskService,
+        provide: StaticService,
         useValue: {
           deleteImage: deleteImageMock,
           generateNewImage: generateNewImageMock,

src/compare/libs/odiff/odiff.service.spec.ts

@@ -1,6 +1,6 @@
-import { Inject, Injectable, Logger } from '@nestjs/common';
+import { Injectable, Logger } from '@nestjs/common';
 import { TestStatus } from '@prisma/client';
-import { STATIC_SERVICE, StaticService } from '../../../shared/static/static-service.interface';
+import { StaticService } from '../../../static/static.service';
 import { DiffResult } from '../../../test-runs/diffResult';
 import { parseConfig } from '../../utils';
 import { ImageComparator } from '../image-comparator.interface';
@@ -9,6 +9,8 @@ import { DIFF_DIMENSION_RESULT, NO_BASELINE_RESULT } from '../consts';
 import { compare } from 'odiff-bin';
 import { IgnoreAreaDto } from 'src/test-runs/dto/ignore-area.dto';
 import { OdiffConfig, OdiffIgnoreRegions, OdiffResult } from './odiff.types';
+import { HddService } from 'src/static/hdd/hdd.service';
+import { isHddStaticServiceConfigured } from '../../../static/utils';
 
 export const DEFAULT_CONFIG: OdiffConfig = {
   outputDiffMask: true,
@@ -20,8 +22,14 @@ export const DEFAULT_CONFIG: OdiffConfig = {
 @Injectable()
 export class OdiffService implements ImageComparator {
   private readonly logger: Logger = new Logger(OdiffService.name);
+  private readonly hddService: HddService;
 
-  constructor(@Inject(STATIC_SERVICE) private staticService: StaticService) {}
+  constructor(private staticService: StaticService) {
+    if (!isHddStaticServiceConfigured()) {
+      throw new Error('OdiffService can only be used with HddService');
+    }
+    this.hddService = this.staticService as unknown as HddService;
+  }
 
   parseConfig(configJson: string): OdiffConfig {
     return parseConfig(configJson, DEFAULT_CONFIG, this.logger);
@@ -37,10 +45,10 @@ export class OdiffService implements ImageComparator {
     }
 
     // compare
-    const diff = this.staticService.generateNewImage('diff');
+    const diff = this.hddService.generateNewImage('diff');
     const compareResult = (await compare(
-      this.staticService.getImagePath(data.baseline),
-      this.staticService.getImagePath(data.image),
+      this.hddService.getImagePath(data.baseline),
+      this.hddService.getImagePath(data.image),
       diff.imagePath,
       {
         ...config,