ammar/zod-backend
1
0
Fork 0
mirror of https://github.com/HamzaSha1/zod-backend.git synced 2025-08-26 06:09:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: fix tasks submission journey

Browse Source
This commit is contained in:
Abdalhamid Alhamad
2024-12-12 15:22:04 +03:00
parent 5b7b7ff689
commit 24d990592d
6 changed files with 48 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/task/services/task.service.ts
View File

@ -1,4 +1,5 @@
import { BadRequestException, Injectable } from '@nestjs/common';
import moment from 'moment';
import { FindOptionsWhere } from 'typeorm';
import { IJwtPayload } from '~/auth/interfaces';
import { OciService } from '~/document/services';
@ -11,6 +12,13 @@ import { TaskRepository } from '../repositories';
export class TaskService {
constructor(private readonly taskRepository: TaskRepository, private readonly ociService: OciService) {}
async createTask(userId: string, body: CreateTaskRequestDto) {
if (moment(body.dueDate).isBefore(moment(body.startDate))) {
throw new BadRequestException('TASK.DUE_DATE_BEFORE_START_DATE');
}
if (moment(body.dueDate).isBefore(moment())) {
throw new BadRequestException('TASK.DUE_DATE_IN_PAST');
}
const task = await this.taskRepository.createTask(userId, body);
return this.findTask({ id: task.id });
}
@ -22,12 +30,14 @@ export class TaskService {
throw new BadRequestException('TASK.NOT_FOUND');
}
await this.prepareTasksPictures([task]);
return task;
}
async findTasks(user: IJwtPayload, query: TasksFilterOptions): Promise<[Task[], number]> {
const [tasks, count] = await this.taskRepository.findTasks(user, query);
console.log(tasks);
await this.prepareTasksPictures(tasks);
return [tasks, count];
@ -53,7 +63,7 @@ export class TaskService {
throw new BadRequestException('TASK.NO_SUBMISSION');
}
if (task.submission.status !== SubmissionStatus.PENDING) {
if (task.submission.status == SubmissionStatus.APPROVED) {
throw new BadRequestException('TASK.SUBMISSION_ALREADY_REVIEWED');
}
@ -67,7 +77,7 @@ export class TaskService {
throw new BadRequestException('TASK.NO_SUBMISSION');
}
if (task.submission.status !== SubmissionStatus.PENDING) {
if (task.submission.status == SubmissionStatus.REJECTED) {
throw new BadRequestException('TASK.SUBMISSION_ALREADY_REVIEWED');
}
@ -85,7 +95,7 @@ export class TaskService {
task.image.url = imageUrl;
if (task.submission) {
if (task.submission?.proofOfCompletion) {
task.submission.proofOfCompletion.url = submissionUrl;
}