ammar/zod-backend
1
0
Fork 0
mirror of https://github.com/HamzaSha1/zod-backend.git synced 2025-07-15 18:07:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

hotfix: fix task completed filter

Browse Source
This commit is contained in:
Abdalhamid Alhamad
2025-01-07 14:44:58 +03:00
parent ee433a5c8c
commit 1fd1704da2
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/task/repositories/task.repository.ts
View File

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