From db02a28b4d5e802e0fb58304b40eb107f8c7b58e Mon Sep 17 00:00:00 2001
From: Abdalhamid Alhamad <aahalhmad@gmail.com>
Date: Tue, 7 Jan 2025 14:18:08 +0300
Subject: [PATCH] hotfix: fix completed task filter

---
 src/task/repositories/task.repository.ts | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/task/repositories/task.repository.ts b/src/task/repositories/task.repository.ts
index a80a102..e53dc2b 100644
--- a/src/task/repositories/task.repository.ts
+++ b/src/task/repositories/task.repository.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
-import { FindOptionsWhere, Repository } from 'typeorm';
+import { Brackets, FindOptionsWhere, Repository } from 'typeorm';
 import { Roles } from '~/auth/enums';
 import { IJwtPayload } from '~/auth/interfaces';
 import { CreateTaskRequestDto, TasksFilterOptions, TaskSubmissionRequestDto } from '../dtos/request';
@@ -77,8 +77,13 @@ export class TaskRepository {
     }
 
     if (query.status === TaskStatus.COMPLETED) {
-      queryBuilder.andWhere('task.dueDate < :today', { today: new Date() });
-      queryBuilder.orWhere('submission.status = :status', { status: SubmissionStatus.APPROVED });
+      queryBuilder.andWhere(
+        new Brackets((qb) => {
+          qb.where('task.dueDate < :today', { today: new Date() }).orWhere('submission.status = :status', {
+            status: SubmissionStatus.APPROVED,
+          });
+        }),
+      );
     }
 
     queryBuilder.orderBy('task.createdAt', 'DESC');