From a0c6242bde094523009d3e2db9408d7c0765d54c Mon Sep 17 00:00:00 2001 From: Reshzera Date: Wed, 7 Aug 2024 14:57:16 -0300 Subject: [PATCH 1/2] feat: ajusts quary to make it the same as allProjects query --- src/repositories/projectRepository.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/repositories/projectRepository.ts b/src/repositories/projectRepository.ts index a00fedd7c..0160d7eb0 100644 --- a/src/repositories/projectRepository.ts +++ b/src/repositories/projectRepository.ts @@ -437,7 +437,10 @@ export const totalProjectsPerDate = async ( } if (onlyListed) { - query.andWhere(`project."reviewStatus" = 'Listed'`); + query.andWhere( + `project.statusId = ${ProjStatus.active} AND project.reviewStatus = :reviewStatus`, + { reviewStatus: ReviewStatus.Listed }, + ); } if (networkId) { From 3eae98b1ee40ee58640fb46109a78389c6614f47 Mon Sep 17 00:00:00 2001 From: Reshzera Date: Thu, 22 Aug 2024 17:59:57 -0300 Subject: [PATCH 2/2] feat: add filter by active projects by default --- src/repositories/projectRepository.ts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/repositories/projectRepository.ts b/src/repositories/projectRepository.ts index 0160d7eb0..053b1c8cb 100644 --- a/src/repositories/projectRepository.ts +++ b/src/repositories/projectRepository.ts @@ -424,6 +424,8 @@ export const totalProjectsPerDate = async ( ): Promise => { const query = Project.createQueryBuilder('project'); + query.andWhere(`project.statusId = ${ProjStatus.active}`); + if (fromDate) { query.andWhere(`project."creationDate" >= '${fromDate}'`); } @@ -437,10 +439,9 @@ export const totalProjectsPerDate = async ( } if (onlyListed) { - query.andWhere( - `project.statusId = ${ProjStatus.active} AND project.reviewStatus = :reviewStatus`, - { reviewStatus: ReviewStatus.Listed }, - ); + query.andWhere(`project.reviewStatus = :reviewStatus`, { + reviewStatus: ReviewStatus.Listed, + }); } if (networkId) {