Merge branch 'rafi/taskmanager'

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;
   }

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",