Make it prettier, make it better?

src/api/app.module.ts

@@ -22,11 +22,9 @@ import { BatchModule } from '../batch/batch.module'
     configureLoggerModule(),
     AuthModule,
     FileModule,
-    BatchModule,
+    BatchModule
   ],
   controllers: [RedirectController, HealthController, DecisionController],
-  providers: [
-    BucketHealthIndicator,
-  ]
+  providers: [BucketHealthIndicator]
 })
 export class AppModule {}

src/api/domain/decisions/repositories/decision.repository.ts

@@ -5,9 +5,7 @@ export interface DecisionRepository {
     jsonS3Key: string
   ): Promise<void>
 
-  deleteDataDecisionIntegre(
-    jsonS3Key: string
-  ): Promise<void>
+  deleteDataDecisionIntegre(jsonS3Key: string): Promise<void>
 
   uploadFichierDecisionIntegre(
     fichierDecisionIntegre: Express.Multer.File | Buffer,

src/api/infrastructure/controllers/decision/decision.controller.ts

@@ -98,7 +98,10 @@ export class DecisionController {
     description: "Une erreur inattendue liée à une dépendance de l'API a été rencontrée. "
   })
   @HttpCode(HttpStatus.NO_CONTENT)
-  async deleteDecision(@Param('decisionId') decisionId: string, @Req() request: Request) : Promise<DeleteDecisionResponse> {
+  async deleteDecision(
+    @Param('decisionId') decisionId: string,
+    @Req() request: Request
+  ): Promise<DeleteDecisionResponse> {
     const routePath = request.method + ' ' + request.path
     const decisionUseCase = new DeleteDecisionUsecase(new DecisionS3Repository(this.logger))
     const formatLogs: LogsFormat = {
@@ -152,29 +155,29 @@ export class DecisionController {
   @ApiConsumes('multipart/form-data')
   @ApiBody({
     description:
-      'Les ressources pour modifier des décisions intègres sont :\n* PUT : envoi d\'une décision intègre',
+      "Les ressources pour modifier des décisions intègres sont :\n* PUT : envoi d'une décision intègre",
     type: ReceiveDto
   })
   @ApiCreatedResponse({ description: 'La requête a été acceptée et va être traitée.' })
   @ApiBadRequestResponse({
-    description: 'La requête n\'est pas correcte'
+    description: "La requête n'est pas correcte"
   })
   @ApiInternalServerErrorResponse({
-    description: 'Une erreur interne s\'est produite'
+    description: "Une erreur interne s'est produite"
   })
   @ApiUnauthorizedResponse({
-    description: 'La requête n\'est pas autorisée'
+    description: "La requête n'est pas autorisée"
   })
   @ApiServiceUnavailableResponse({
-    description: 'Une erreur inattendue liée à une dépendance de l\'API a été rencontrée. '
+    description: "Une erreur inattendue liée à une dépendance de l'API a été rencontrée. "
   })
   @HttpCode(HttpStatus.CREATED)
   @UseInterceptors(FileInterceptor('fichierDecisionIntegre'))
   async receiveDecision(
     @UploadedFile() fichierDecisionIntegre: Express.Multer.File,
     @Body('texteDecisionIntegre') texteDecisionIntegre: string,
     @Body('metadonnees', new StringToJsonPipe(), new ValidateDtoPipe())
-      metadonneeDto: MetadonneeDto,
+    metadonneeDto: MetadonneeDto,
     @Req() request: Request
   ): Promise<DecisionResponse> {
     if (!fichierDecisionIntegre || !isPdfFile(fichierDecisionIntegre.mimetype)) {

src/api/main.ts

@@ -187,7 +187,7 @@ db.saveClient({
 
 async function bootstrap() {
   const appOptions = {
-    logger: ['log', 'error', 'warn'],
+    logger: ['log', 'error', 'warn']
   } as NestApplicationOptions
 
   const app = await NestFactory.create(AppModule, appOptions)

src/api/usecase/deleteDecision.usecase.ts

@@ -1,18 +1,12 @@
 import { DecisionRepository } from '../domain/decisions/repositories/decision.repository'
 
 export class DeleteDecisionUsecase {
+  constructor(private decisionsRepository: DecisionRepository) {}
 
-  constructor(private decisionsRepository: DecisionRepository) {
-  }
-
-  async deleteDecision(
-    decisionId: string
-  ): Promise<string> {
+  async deleteDecision(decisionId: string): Promise<string> {
     const jsonFileName = `${decisionId}.json`
 
-    await this.decisionsRepository.deleteDataDecisionIntegre(
-      jsonFileName
-    )
+    await this.decisionsRepository.deleteDataDecisionIntegre(jsonFileName)
 
     return jsonFileName
   }

src/api/usecase/saveDecision.usecase.spec.ts

@@ -5,7 +5,6 @@ import { DecisionRepository } from '../domain/decisions/repositories/decision.re
 import { MetadonneeDto } from '../../shared/infrastructure/dto/metadonnee.dto'
 import * as fs from 'fs'
 
-
 const fakeFilename = 'test'
 jest.mock('uuid', () => ({ v4: () => fakeFilename }))
 jest.mock('fs', () => ({
@@ -32,8 +31,7 @@ describe('SaveDecision Usecase', () => {
       path: ''
     } as unknown as Express.Multer.File
     const metadonnees = new MockUtils().metadonneeDtoMock as unknown as MetadonneeDto
-    (fs.writeFileSync as jest.Mock).mockImplementation(() => {
-    })
+    ;(fs.writeFileSync as jest.Mock).mockImplementation(() => {})
     await usecase.putDecision(fichierDecisionIntegre, 'test', metadonnees)
 
     const requestDto = {

src/api/usecase/saveDecision.usecase.ts

@@ -7,8 +7,7 @@ import { CollectDto } from 'src/shared/infrastructure/dto/collect.dto'
 export class SaveDecisionUsecase {
   private readonly fileService: FileService = new FileService()
 
-  constructor(private decisionsRepository: DecisionRepository) {
-  }
+  constructor(private decisionsRepository: DecisionRepository) {}
 
   async putDecision(
     fichierDecisionIntegre: Express.Multer.File,

src/batch/batch.module.ts

@@ -3,11 +3,8 @@ import { BatchService } from './batch.service'
 import { ScheduleModule } from '@nestjs/schedule'
 
 @Module({
-  imports: [
-    ScheduleModule.forRoot()
-  ],
+  imports: [ScheduleModule.forRoot()],
   providers: [BatchService],
   exports: [BatchService]
 })
-export class BatchModule {
-}
+export class BatchModule {}

src/batch/batch.service.spec.ts

@@ -26,8 +26,10 @@ describe('BatchService', () => {
   let schedulerRegistry: jest.Mocked<SchedulerRegistry>
 
   const mockFolderPath = '/mock-folder'
-  const mockFileNames = ['05526bff-58be-4f35-b0a9-b3bfbdd9e1ea_file_1.pdf',
-    'c5e1783b-9fa4-4147-9b16-90b902060866_file2.pdf']
+  const mockFileNames = [
+    '05526bff-58be-4f35-b0a9-b3bfbdd9e1ea_file_1.pdf',
+    'c5e1783b-9fa4-4147-9b16-90b902060866_file2.pdf'
+  ]
   const mockFileData = Buffer.from('mock file data')
 
   beforeEach(() => {
@@ -47,20 +49,19 @@ describe('BatchService', () => {
       addCronJob: jest.fn()
     } as unknown as jest.Mocked<SchedulerRegistry>
 
+    batchService = new BatchService(schedulerRegistry)
+    ;(batchService as any).decisionsRepository = decisionRepository
+    ;(batchService as any).logger = logger
 
-    batchService = new BatchService(schedulerRegistry);
-    (batchService as any).decisionsRepository = decisionRepository;
-    (batchService as any).logger = logger;
-
-    (fs.readdirSync as jest.Mock).mockReturnValue(mockFileNames)
+    ;(fs.readdirSync as jest.Mock).mockReturnValue(mockFileNames)
   })
 
   afterEach(() => {
     jest.clearAllMocks()
   })
 
   it('should log an error if reading files fails', async () => {
-    (fs.readdirSync as jest.Mock).mockImplementation(() => {
+    ;(fs.readdirSync as jest.Mock).mockImplementation(() => {
       throw new Error('File read error')
     })
 
@@ -74,48 +75,54 @@ describe('BatchService', () => {
   })
 
   it('should process files in the folder and upload them', async () => {
-    (path.join as jest.Mock).mockImplementation((folder, file) => `${folder}/${file}`);
-    (fs.statSync as jest.Mock).mockReturnValue({ isFile: () => true });
-    (fs.readFileSync as jest.Mock).mockReturnValue(mockFileData);
-    (fs.unlinkSync as jest.Mock).mockImplementation(() => {
-    })
+    ;(path.join as jest.Mock).mockImplementation((folder, file) => `${folder}/${file}`)
+    ;(fs.statSync as jest.Mock).mockReturnValue({ isFile: () => true })
+    ;(fs.readFileSync as jest.Mock).mockReturnValue(mockFileData)
+    ;(fs.unlinkSync as jest.Mock).mockImplementation(() => {})
 
     await batchService.archiveFilesToS3()
 
     mockFileNames.forEach((filename) => {
-      expect(decisionRepository.uploadFichierDecisionIntegre).toHaveBeenCalledTimes(mockFileNames.length)
+      expect(decisionRepository.uploadFichierDecisionIntegre).toHaveBeenCalledTimes(
+        mockFileNames.length
+      )
       expect(fs.unlinkSync).toHaveBeenCalledWith(`${mockFolderPath}/${filename}`)
     })
 
-    expect(logger.log).toHaveBeenCalledWith({ msg: 'Starting scan', operationName: 'archiveFilesToS3' })
-    expect(logger.log).toHaveBeenCalledWith({ msg: 'End of scan', operationName: 'archiveFilesToS3' })
+    expect(logger.log).toHaveBeenCalledWith({
+      msg: 'Starting scan',
+      operationName: 'archiveFilesToS3'
+    })
+    expect(logger.log).toHaveBeenCalledWith({
+      msg: 'End of scan',
+      operationName: 'archiveFilesToS3'
+    })
   })
 
   it('should skip non-file entries in the folder', async () => {
-    const mockEntries = ['file1.pdf', 'file2.pdf'];
+    const mockEntries = ['file1.pdf', 'file2.pdf']
 
-    (fs.readdirSync as jest.Mock).mockReturnValue(mockEntries);
-    (path.join as jest.Mock).mockImplementation((folder, file) => `${folder}/${file}`);
-    (fs.statSync as jest.Mock).mockImplementation(() => {
+    ;(fs.readdirSync as jest.Mock).mockReturnValue(mockEntries)
+    ;(path.join as jest.Mock).mockImplementation((folder, file) => `${folder}/${file}`)
+    ;(fs.statSync as jest.Mock).mockImplementation(() => {
       return {
         isFile: () => true
       }
-    });
-    (fs.readFileSync as jest.Mock).mockReturnValue(mockFileData);
-    (fs.unlinkSync as jest.Mock).mockImplementation(() => {
     })
+    ;(fs.readFileSync as jest.Mock).mockReturnValue(mockFileData)
+    ;(fs.unlinkSync as jest.Mock).mockImplementation(() => {})
 
     await batchService.archiveFilesToS3()
 
     expect(fs.unlinkSync).toHaveBeenCalledWith(`${mockFolderPath}/file1.pdf`)
   })
 
   it('should throw and log an error if upload fails', async () => {
-    (path.join as jest.Mock).mockImplementation((folder, file) => `${folder}/${file}`);
-    (fs.statSync as jest.Mock).mockReturnValue({ isFile: () => true });
-    (fs.readFileSync as jest.Mock).mockReturnValue(mockFileData);
+    ;(path.join as jest.Mock).mockImplementation((folder, file) => `${folder}/${file}`)
+    ;(fs.statSync as jest.Mock).mockReturnValue({ isFile: () => true })
+    ;(fs.readFileSync as jest.Mock).mockReturnValue(mockFileData)
 
-    (decisionRepository.uploadFichierDecisionIntegre as jest.Mock).mockImplementation(() => {
+    ;(decisionRepository.uploadFichierDecisionIntegre as jest.Mock).mockImplementation(() => {
       throw new Error('Upload error')
     })
 
@@ -126,6 +133,5 @@ describe('BatchService', () => {
       msg: 'Upload error',
       operationName: 'archiveFilesToS3'
     })
-
   })
 })

src/batch/batch.service.ts

@@ -6,27 +6,29 @@ import { DecisionRepository } from '../api/domain/decisions/repositories/decisio
 import { DecisionS3Repository } from '../shared/infrastructure/repositories/decisionS3.repository'
 import { CronJob } from 'cron'
 
-
 @Injectable()
 export class BatchService implements OnModuleInit {
   private readonly folderPath = process.env.AV_PDF_PATH
   private readonly separator = process.env.S3_PDF_FILE_NAME_SEPARATOR
   private readonly logger: Logger = new Logger(BatchService.name)
   private readonly decisionsRepository: DecisionRepository = new DecisionS3Repository(this.logger)
 
-  constructor(private schedulerRegistry: SchedulerRegistry) {
-  }
+  constructor(private schedulerRegistry: SchedulerRegistry) {}
 
   onModuleInit() {
-    this.addCronJob(`archive_files_to_s3`, process.env.S3_ARCHIVE_SCHEDULE, this.archiveFilesToS3.bind(this))
+    this.addCronJob(
+      `archive_files_to_s3`,
+      process.env.S3_ARCHIVE_SCHEDULE,
+      this.archiveFilesToS3.bind(this)
+    )
   }
 
   async archiveFilesToS3() {
     this.logger.log({ operationName: 'archiveFilesToS3', msg: `Starting scan` })
 
     try {
       const fileNames = fs.readdirSync(this.folderPath)
-      fileNames.forEach(filename => {
+      fileNames.forEach((filename) => {
         const filePath = path.join(this.folderPath, filename)
         const stats = fs.statSync(filePath)
 
@@ -47,7 +49,6 @@ export class BatchService implements OnModuleInit {
         const filePath = path.join(this.folderPath, filename)
         fs.unlinkSync(filePath) // file deletion
       })
-
     } catch (error) {
       this.logger.error({ operationName: 'archiveFilesToS3', msg: error.message, data: error })
     }
@@ -70,7 +71,8 @@ export class BatchService implements OnModuleInit {
     this.schedulerRegistry.addCronJob(name, job)
     job.start()
 
-    this.logger.log(`The cron job ${name} has been added with the following cron expression : ${cronExpression}`)
+    this.logger.log(
+      `The cron job ${name} has been added with the following cron expression : ${cronExpression}`
+    )
   }
-
 }

src/shared/infrastructure/files/file.service.spec.ts

@@ -22,17 +22,16 @@ describe('FileService', () => {
   })
 
   it('should create the upload directory if it does not exist', () => {
-    (fs.existsSync as jest.Mock).mockReturnValue(false);
-    (fs.mkdirSync as jest.Mock).mockImplementation(() => {
-    })
+    ;(fs.existsSync as jest.Mock).mockReturnValue(false)
+    ;(fs.mkdirSync as jest.Mock).mockImplementation(() => {})
 
     new FileService()
 
     expect(fs.existsSync).toHaveBeenCalledWith(mockUploadPath)
   })
 
   it('should not create the upload directory if it already exists', () => {
-    (fs.existsSync as jest.Mock).mockReturnValue(true)
+    ;(fs.existsSync as jest.Mock).mockReturnValue(true)
 
     new FileService()
 
@@ -41,9 +40,8 @@ describe('FileService', () => {
 
   it('should save the file successfully and return the file path and name', () => {
     const mockFilename = 'uniqueFile.pdf'
-    const mockFullPath = `${mockUploadPath}/${mockFilename}`;
-    (fs.writeFileSync as jest.Mock).mockImplementation(() => {
-    })
+    const mockFullPath = `${mockUploadPath}/${mockFilename}`
+    ;(fs.writeFileSync as jest.Mock).mockImplementation(() => {})
 
     const result = fileService.saveFile(mockFile, mockFilename)
 
@@ -55,13 +53,11 @@ describe('FileService', () => {
   })
 
   it('should throw an InternalServerErrorException if saving the file fails', () => {
-    const mockFilename = 'uniqueFile.pdf';
-    (fs.writeFileSync as jest.Mock).mockImplementation(() => {
+    const mockFilename = 'uniqueFile.pdf'
+    ;(fs.writeFileSync as jest.Mock).mockImplementation(() => {
       throw new Error('Write failed')
     })
 
-    expect(() => fileService.saveFile(mockFile, mockFilename)).toThrow(
-      InternalServerErrorException
-    )
+    expect(() => fileService.saveFile(mockFile, mockFilename)).toThrow(InternalServerErrorException)
   })
 })

src/shared/infrastructure/files/file.service.ts

@@ -26,11 +26,7 @@ export class FileService {
         path: fullPath
       }
     } catch (error) {
-      throw new InternalServerErrorException(
-        'Error saving file'
-      )
+      throw new InternalServerErrorException('Error saving file')
     }
   }
-
-
-}
+}

src/shared/infrastructure/repositories/decisionS3.repository.ts

@@ -67,9 +67,7 @@ export class DecisionS3Repository implements DecisionRepository {
     }
   }
 
-  async deleteDataDecisionIntegre(
-    jsonS3Key: string
-  ): Promise<void> {
+  async deleteDataDecisionIntegre(jsonS3Key: string): Promise<void> {
     const reqParamsMarkForDeletion = {
       Body: JSON.stringify({
         date: new Date()