tests passing

Author: shoshannaTM

package-lock.json

@@ -29,6 +29,7 @@
   },
   "dependencies": {
     "@apollo/server": "^4.10.4",
+    "@aws-sdk/client-s3": "^3.965.0",
     "@mikro-orm/better-sqlite": "^6.6.2",
     "@mikro-orm/core": "^6.6.2",
     "@mikro-orm/migrations": "^6.6.2",
@@ -51,7 +52,6 @@
     "@sentry/node": "^7.55.2",
     "@sentry/tracing": "^7.55.2",
     "adorable-avatars": "^0.5.0",
-    "aws-sdk": "^2.1397.0",
     "bcryptjs": "^2.4.3",
     "better-sqlite3": "^12.5.0",
     "class-transformer": "^0.5.1",
@@ -71,7 +71,7 @@
     "jpeg-js": "^0.4.4",
     "lodash": "^4.17.21",
     "nestjs-pino": "^3.3.0",
-    "nestjs-s3": "^1.0.1",
+    "nestjs-s3": "^3.0.1",
     "node-datetime": "^2.1.2",
     "nodemailer": "^6.9.3",
     "nodemailer-mailgun-transport": "^2.1.5",

package.json

@@ -12,13 +12,13 @@ import { JoinUserHub } from '../dal/entity/joinUserHub.entity';
 import { JwtModule } from '@nestjs/jwt';
 import { S3Module, S3ModuleOptions } from 'nestjs-s3';
 import { ImageFileService } from '../file/image-file/image-file.service';
-import { FILE_SERVICE } from '../file/file-service.token';
 import { getRepositoryToken } from '@mikro-orm/nestjs';
 import { EntityManager, EntityRepository } from '@mikro-orm/core';
 import { Block } from '../dal/entity/block.entity';
 import { File } from '../dal/entity/file.entity';
 import { JoinEventFile } from '../dal/entity/joinEventFile.entity';
 import { JoinHubFile } from '../dal/entity/joinHubFile.entity';
+import { FileService } from '../file/file-service.abstract';
 
 describe('AuthService', () => {
   let service: AuthService;
@@ -55,7 +55,7 @@ describe('AuthService', () => {
         UserService,
         ImageFileService,
         {
-          provide: FILE_SERVICE,
+          provide: FileService,
           useClass: S3FileService,
         },
         {

src/auth/auth.service.spec.ts

@@ -5,7 +5,6 @@ import { Test, TestingModule } from '@nestjs/testing';
 import { ImageFileService } from '../file/image-file/image-file.service';
 import { Event } from '../dal/entity/event.entity';
 import { JoinUserEvent } from '../dal/entity/joinUserEvent.entity';
-import { FILE_SERVICE } from '../file/file-service.token';
 import { LocalFileService } from '../file/local-file/local-file.service';
 import { EventResolver } from './event.resolver';
 import { EventService } from './event.service';
@@ -18,6 +17,7 @@ import { File } from '../dal/entity/file.entity';
 import { EventGeofenceService } from './event-geofence/event-geofence.service';
 import { JoinEventFile } from '../dal/entity/joinEventFile.entity';
 import { EntityManager } from '@mikro-orm/core';
+import { FileService } from '../file/file-service.abstract';
 
 describe('EventResolver', () => {
   let resolver: EventResolver;
@@ -38,7 +38,7 @@ describe('EventResolver', () => {
         ImageFileService,
         NotificationService,
         {
-          provide: FILE_SERVICE,
+          provide: FileService,
           useClass: LocalFileService,
         },
         {

src/event/event.resolver.spec.ts

@@ -1,7 +1,6 @@
 import { getRepositoryToken } from '@mikro-orm/nestjs';
 import { EntityRepository } from '@mikro-orm/postgresql';
 import { Test, TestingModule } from '@nestjs/testing';
-import { FILE_SERVICE } from '../file/file-service.token';
 import { LocalFileService } from '../file/local-file/local-file.service';
 import { Event } from '../dal/entity/event.entity';
 import { JoinUserEvent } from '../dal/entity/joinUserEvent.entity';
@@ -16,6 +15,7 @@ import { UserDevice } from '../dal/entity/userDevice.entity';
 import { File } from '../dal/entity/file.entity';
 import { JoinEventFile } from '../dal/entity/joinEventFile.entity';
 import { EntityManager } from '@mikro-orm/core';
+import { FileService } from '../file/file-service.abstract';
 
 describe('EventService', () => {
   let service: EventService;
@@ -34,7 +34,7 @@ describe('EventService', () => {
         ImageFileService,
         NotificationService,
         {
-          provide: FILE_SERVICE,
+          provide: FileService,
           useClass: LocalFileService,
         },
         {

src/event/event.service.spec.ts

@@ -6,18 +6,17 @@ import { v4 as uuid } from 'uuid';
 import { Event } from '../dal/entity/event.entity';
 import { JoinUserEvent, RSVP } from '../dal/entity/joinUserEvent.entity';
 import { User } from '../dal/entity/user.entity';
-import { FILE_SERVICE } from '../file/file-service.token';
-import { FileServiceInterface } from '../file/interfaces/file-service.interface';
 import { NotificationService } from '../notification/notification.service';
 import { JoinEventFile } from '../dal/entity/joinEventFile.entity';
+import { FileService } from '../file/file-service.abstract';
 
 @Injectable()
 export class EventService {
     private readonly logger = new Logger(EventService.name);
 
     constructor(
-        @Inject(FILE_SERVICE)
-        private readonly fileService: FileServiceInterface,
+        @Inject()
+        private readonly fileService: FileService,
         @InjectRepository(JoinUserEvent)
         private readonly joinUserEventRepository: EntityRepository<JoinUserEvent>,
         @InjectRepository(Event)

src/event/event.service.ts

@@ -1,25 +1,36 @@
 import { ConfigService } from '@nestjs/config';
 import { Test, TestingModule } from '@nestjs/testing';
-import { FILE_SERVICE } from '../file-service.token';
 import { FileController } from './file.controller';
 import { ImageFileService } from '../image-file/image-file.service';
 import { LocalFileService } from '../local-file/local-file.service';
 import { getRepositoryToken } from '@mikro-orm/nestjs';
 import { File } from '../../dal/entity/file.entity';
 import { EntityManager, EntityRepository } from '@mikro-orm/core';
+import { FileService } from '../file-service.abstract';
+import fs from 'fs';
+
+jest.mock('fs');
 
 describe('FileController', () => {
   let controller: FileController;
 
   beforeEach(async () => {
+    (fs.existsSync as jest.Mock).mockReturnValue(true);
+    // eslint-disable-next-line @typescript-eslint/no-empty-function
+    (fs.mkdirSync as jest.Mock).mockImplementation(() => {});
     const module: TestingModule = await Test.createTestingModule({
       controllers: [FileController],
       providers: [
         {
-          provide: FILE_SERVICE,
+          provide: FileService,
           useClass: LocalFileService,
         },
-        ConfigService,
+        {
+          provide: ConfigService,
+          useValue: {
+            getOrThrow: jest.fn(() => ''),
+          },
+        },
         ImageFileService,
         {
           provide: getRepositoryToken(File),

src/file/controller/file.controller.spec.ts

@@ -1,8 +1,5 @@
 import { Controller, Get, Header, Inject, Logger, Param, Res } from '@nestjs/common';
 import { Response } from 'express';
-import { join } from 'path';
-import sharp from 'sharp';
-import { FILE_SERVICE } from '../file-service.token';
 import { ImageFileService } from '../image-file/image-file.service';
 import { FileService } from '../file-service.abstract';
 
@@ -11,7 +8,7 @@ export class FileController {
   private logger = new Logger(FileController.name);
 
   constructor(
-    @Inject(FILE_SERVICE)
+    @Inject()
     private readonly fileService: FileService,
     private readonly imageService: ImageFileService,
   ) {}

src/file/controller/file.controller.ts

@@ -5,9 +5,10 @@ import { join } from 'path';
 import sharp from 'sharp';
 import { File } from 'src/dal/entity/file.entity';
 import Stream, { Readable } from 'stream';
-import { Observable } from 'rxjs';
-import { MultipartFileStream } from '@proventuslabs/nestjs-multipart-form';
 import { FileServiceInterface } from './interfaces/file-service.interface';
+import { FileUpload } from './interfaces/file-upload.interface';
+import { ReadStream } from 'fs';
+
 
 @Injectable()
 export abstract class FileService implements FileServiceInterface {
@@ -18,13 +19,13 @@ export abstract class FileService implements FileServiceInterface {
   constructor(readonly configService: ConfigService) {}
 
   abstract storeImageFromFileUpload(
-    upload$: Observable<MultipartFileStream>,
+    upload: Promise<FileUpload> | FileUpload,
     userId: any,
   ): Promise<File>;
   abstract delete(fileName: string): Promise<void>;
   abstract deleteById(fileId: any, userId: any): Promise<any>;
-  abstract get(fileName: string): Promise<Readable | undefined>;
-  abstract getByShareableId(shareableId: string): Promise<Readable | undefined>;
+  abstract get(fileName: string): Promise<Readable>;
+  abstract getByShareableId(shareableId: string): Promise<Readable>;
 
   async getWatermark() {
     return sharp(

src/file/file-service.abstract.ts

@@ -1,6 +1,5 @@
 import { FactoryProvider, Logger, Module } from '@nestjs/common';
 import { ConfigService } from '@nestjs/config';
-import { FILE_SERVICE } from './file-service.token';
 import { FileController } from './controller/file.controller';
 import { ImageFileService } from './image-file/image-file.service';
 import { LocalFileService } from './local-file/local-file.service';
@@ -10,9 +9,10 @@ import * as path from 'path';
 import { MikroOrmModule } from '@mikro-orm/nestjs';
 import { File } from '../dal/entity/file.entity';
 import { FileResolver } from './resolver/file.resolver';
+import { FileService } from './file-service.abstract';
 
 export const fileServiceFactory = {
-  provide: FILE_SERVICE,
+  provide: FileService,
   useFactory: (
     configService: ConfigService,
     localFileService: LocalFileService,
@@ -56,7 +56,7 @@ export const fileServiceFactory = {
     FileUrlService,
     FileResolver,
   ],
-  exports: [FILE_SERVICE, FileUrlService],
+  exports: [FileService, FileUrlService],
 })
 export class FileModule {
   public static logger = new Logger(FileModule.name);