From a22d6ceb8162b18fa29dc01aebb2bcee74eb4975 Mon Sep 17 00:00:00 2001 From: realrafi Date: Tue, 7 Jul 2026 12:03:42 +0330 Subject: [PATCH] refactor: making the checklistitem service to use enum messages --- src/common/enums/message.enum.ts | 4 ++++ .../controllers/check-list-item.controller.ts | 2 +- .../providers/check-list-item.service.ts | 19 +++++++++---------- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/common/enums/message.enum.ts b/src/common/enums/message.enum.ts index 467513c..3cd2337 100755 --- a/src/common/enums/message.enum.ts +++ b/src/common/enums/message.enum.ts @@ -947,6 +947,10 @@ export const enum remarkMessage { REMARK_NOT_FOUND = "برچسب مورد نظر پیدا نشد!" } +export const enum checkListItemMessage { + CHECKLISTITEM_NOT_FOUND = "آیتم چک لیست پیدا نشد!" +} + export const enum attachmentMessage { ATTACHMENT_NOT_FOUND = "ضمیمه پیدا نشد!" } \ No newline at end of file diff --git a/src/modules/task-manager/controllers/check-list-item.controller.ts b/src/modules/task-manager/controllers/check-list-item.controller.ts index 45a9f40..2e38072 100644 --- a/src/modules/task-manager/controllers/check-list-item.controller.ts +++ b/src/modules/task-manager/controllers/check-list-item.controller.ts @@ -32,7 +32,7 @@ export class CheckListItemController { @ApiResponse({ status: 200, description: "CheckListItem found", type: TMCheckListItem }) @ApiResponse({ status: 404, description: "CheckListItem not found" }) findOne(@Param("id") id: string): Promise { - return this.checkListItemService.findOne(id); + return this.checkListItemService.findOneOrFail(id); } @Post() diff --git a/src/modules/task-manager/providers/check-list-item.service.ts b/src/modules/task-manager/providers/check-list-item.service.ts index 95cc633..0a8fb8e 100644 --- a/src/modules/task-manager/providers/check-list-item.service.ts +++ b/src/modules/task-manager/providers/check-list-item.service.ts @@ -1,18 +1,19 @@ import { Injectable, NotFoundException } from '@nestjs/common'; import { CheckListItemRepository } from '../repositories/check-list-item.repository'; -import { TaskRepository } from '../repositories/task.repository'; import { TMCheckListItem } from '../entities/check-list-item.entity'; import { CreateCheckListItemDto } from '../dto/check-list-item/create-check-list-item.dto'; import { UpdateCheckListItemDto } from '../dto/check-list-item/update-check-list-item.dto'; import { CursorPaginationDto } from '../../../common/DTO/cursor-pagination.dto'; import { CursorPaginatedResult } from '../../../common/interfaces/cursor-paginated-result.interface'; import { buildCursorPageFormat } from '../../../common/helpers/cursor-paginated.helper'; +import { checkListItemMessage } from '../../../common/enums/message.enum'; +import { TaskService } from './task.service'; @Injectable() export class CheckListItemService { constructor( private readonly checkListItemRepository: CheckListItemRepository, - private readonly taskRepository: TaskRepository, + private readonly taskService: TaskService, ) {} async findAll(pagination: CursorPaginationDto): Promise> { @@ -36,26 +37,24 @@ export class CheckListItemService { return buildCursorPageFormat(data, limit, cursorDate); } - async findOne(id: string): Promise { + async findOneOrFail(id: string): Promise { const checkListItem = await this.checkListItemRepository.findOneById(id); - if (!checkListItem) throw new NotFoundException(`CheckListItem #${id} not found`); + if (!checkListItem) throw new NotFoundException(checkListItemMessage.CHECKLISTITEM_NOT_FOUND); return checkListItem; } async create(dto: CreateCheckListItemDto): Promise { - const task = await this.taskRepository.findOneById(dto.taskId); - if (!task) throw new NotFoundException(`Task #${dto.taskId} not found`); + await this.taskService.findOneOrFail(dto.taskId); const checkListItem = this.checkListItemRepository.create(dto); return this.checkListItemRepository.save(checkListItem); } async update(id: string, dto: UpdateCheckListItemDto): Promise { - const checkListItem = await this.findOne(id); + const checkListItem = await this.findOneOrFail(id); if (dto.taskId) { - const task = await this.taskRepository.findOneById(dto.taskId); - if (!task) throw new NotFoundException(`Task #${dto.taskId} not found`); + await this.taskService.findOneOrFail(dto.taskId); } Object.assign(checkListItem, dto); @@ -63,7 +62,7 @@ export class CheckListItemService { } async remove(id: string): Promise { - const checkListItem = await this.findOne(id); + const checkListItem = await this.findOneOrFail(id); await this.checkListItemRepository.delete(id); return checkListItem; }