From d93e4be6ef2ad541f5455db553902ba736cd5cf0 Mon Sep 17 00:00:00 2001
From: realrafi <mahdi47rafie@gmail.com>
Date: Sat, 11 Jul 2026 11:36:17 +0330
Subject: [PATCH 1/2] refactor: made the findOne project by id to return users
 of each project as well

---
 .../task-manager/providers/project.service.ts      | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/modules/task-manager/providers/project.service.ts b/src/modules/task-manager/providers/project.service.ts
index 384d6f6..9d33041 100644
--- a/src/modules/task-manager/providers/project.service.ts
+++ b/src/modules/task-manager/providers/project.service.ts
@@ -21,7 +21,19 @@ export class ProjectService {
   ) {}
 
   async findOneOrFail(id: string): Promise<TMProject> {
-    const project = await this.projectRepository.findOne({ where: { id } });
+    const project = await this.projectRepository.findOne({
+      where: { id },
+      relations: {
+        users: true,
+      },
+      select: {
+        users: {
+          id: true,
+          firstName: true,
+          lastName: true
+        }
+      }
+    });
     if (!project) throw new NotFoundException(ProjectMessage.PROJECT_NOT_FOUND);
     return project;
   }

From 1440b6237359ae2b12065ecfb560d58e05bf4559 Mon Sep 17 00:00:00 2001
From: realrafi <mahdi47rafie@gmail.com>
Date: Sat, 11 Jul 2026 12:38:00 +0330
Subject: [PATCH 2/2] fix: fixing getTaskDetail returning null

---
 ...3759715100-TMChangingFewLastPermissions.ts | 20 +++++++++++++++++++
 .../repositories/task.repository.ts           |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 database/migrations/1783759715100-TMChangingFewLastPermissions.ts

diff --git a/database/migrations/1783759715100-TMChangingFewLastPermissions.ts b/database/migrations/1783759715100-TMChangingFewLastPermissions.ts
new file mode 100644
index 0000000..5e8d4db
--- /dev/null
+++ b/database/migrations/1783759715100-TMChangingFewLastPermissions.ts
@@ -0,0 +1,20 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class TMChangingFewLastPermissions1783759715100 implements MigrationInterface {
+    name = 'TMChangingFewLastPermissions1783759715100'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TYPE "public"."permission_name_enum" RENAME TO "permission_name_enum_old"`);
+        await queryRunner.query(`CREATE TYPE "public"."permission_name_enum" AS ENUM('services', 'customers', 'agents', 'developers', 'invoices', 'transactions', 'discounts', 'admins', 'tickets', 'criticisms', 'contacts_us', 'advertisements', 'announcements', 'blogs', 'learnings', 'logs', 'settings', 'bank_accounts', 'payments', 'manage_sso_clients', 'support_plan', 'dmenu', 'dkala', 'dpage', 'dmail', 'reseller', 'workspace', 'view_all_workspaces', 'project', 'view_all_projects', 'task', 'task_phase')`);
+        await queryRunner.query(`ALTER TABLE "permission" ALTER COLUMN "name" TYPE "public"."permission_name_enum" USING "name"::"text"::"public"."permission_name_enum"`);
+        await queryRunner.query(`DROP TYPE "public"."permission_name_enum_old"`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`CREATE TYPE "public"."permission_name_enum_old" AS ENUM('admins', 'advertisements', 'agents', 'announcements', 'bank_accounts', 'blogs', 'contacts_us', 'criticisms', 'customers', 'developers', 'discounts', 'dkala', 'dmail', 'dmenu', 'dpage', 'invoices', 'learnings', 'logs', 'manage_sso_clients', 'payments', 'project', 'remark', 'reseller', 'services', 'settings', 'support_plan', 'task', 'task_phase', 'tickets', 'transactions', 'view_all_projects', 'view_all_workspaces', 'workspace')`);
+        await queryRunner.query(`ALTER TABLE "permission" ALTER COLUMN "name" TYPE "public"."permission_name_enum_old" USING "name"::"text"::"public"."permission_name_enum_old"`);
+        await queryRunner.query(`DROP TYPE "public"."permission_name_enum"`);
+        await queryRunner.query(`ALTER TYPE "public"."permission_name_enum_old" RENAME TO "permission_name_enum"`);
+    }
+
+}
diff --git a/src/modules/task-manager/repositories/task.repository.ts b/src/modules/task-manager/repositories/task.repository.ts
index 68af884..bff2359 100644
--- a/src/modules/task-manager/repositories/task.repository.ts
+++ b/src/modules/task-manager/repositories/task.repository.ts
@@ -23,6 +23,8 @@ export class TaskRepository extends Repository<TMTask> {
       )
 
       .select([
+        "task",
+
         "remark.id",
         "remark.title",
         "remark.color",