Merge pull request #1145 from Giveth/hotfix_qfround_sorting_to_includ…

…e_non_donated_yet change to leftJoin on estimatedMatchingTable
Giveth · Oct 5, 2023 · 1cca468 · 1cca468
2 parents 6821e05 + fb0c892
commit 1cca468
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/repositories/projectRepository.ts b/src/repositories/projectRepository.ts
@@ -97,12 +97,12 @@ export const filterProjectsQuery = (params: FilterProjectQueryInputParams) => {
       `project.statusId = ${ProjStatus.active} AND project.reviewStatus = :reviewStatus`,
       { reviewStatus: ReviewStatus.Listed },
     );
-  if (qfRoundId) {
+  if (qfRoundId || activeQfRoundId) {
     query.innerJoinAndSelect(
       'project.qfRounds',
       'qf_rounds',
       'qf_rounds.id = :qfRoundId',
-      { qfRoundId },
+      { qfRoundId: qfRoundId ? qfRoundId : activeQfRoundId },
     );
   }
   if (!sortingBy || sortingBy === SortingField.InstantBoosting) {
@@ -168,7 +168,7 @@ export const filterProjectsQuery = (params: FilterProjectQueryInputParams) => {
     case SortingField.ActiveQfRoundRaisedFunds:
       if (activeQfRoundId) {
         query
-          .innerJoin(
+          .leftJoin(
             'project.projectEstimatedMatchingView',
             'projectEstimatedMatchingView',
           )