feat: [develop] fix #444

code4romania · Oct 8, 2024 · 79b4f0e · 79b4f0e
1 parent 4ccf14e
commit 79b4f0e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/backend/src/modules/documents/repositories/document-contract.repository.ts b/backend/src/modules/documents/repositories/document-contract.repository.ts
@@ -1,7 +1,7 @@
 import { Injectable } from '@nestjs/common';
 import { DocumentContractEntity } from '../entities/document-contract.entity';
 import { InjectRepository } from '@nestjs/typeorm';
-import { LessThanOrEqual, MoreThanOrEqual, Repository } from 'typeorm';
+import { In, LessThanOrEqual, MoreThanOrEqual, Not, Repository } from 'typeorm';
 import { RepositoryWithPagination } from 'src/infrastructure/base/repository-with-pagination.class';
 import {
   CreateDocumentContractOptions,
@@ -75,6 +75,12 @@ export class DocumentContractRepositoryService extends RepositoryWithPagination<
         volunteerId: options.volunteerId,
         documentStartDate: LessThanOrEqual(options.documentEndDate),
         documentEndDate: MoreThanOrEqual(options.documentStartDate),
+        status: Not(
+          In([
+            DocumentContractStatus.REJECTED_NGO,
+            DocumentContractStatus.REJECTED_VOLUNTEER,
+          ]),
+        ),
       },
     });
 

diff --git a/backend/src/modules/documents/services/document-pdf-generator.ts b/backend/src/modules/documents/services/document-pdf-generator.ts
@@ -62,8 +62,6 @@ export class DocumentPDFGenerator {
         documentContractId,
       );
 
-    console.log(documentContract);
-
     const contractPDFVariables: ContractPDFVariables = {
       documentContractNumber: documentContract.documentNumber,
       documentContractDate: format(documentContract.documentDate, 'dd-MM-yyyy'),