mirror of
https://github.com/HamzaSha1/zod-backend.git
synced 2025-07-10 07:07:23 +00:00
hotfix: fix task completed filter
This commit is contained in:
@ -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');
|
||||
|
Reference in New Issue
Block a user