danak/dsc-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: order the taskPhases by order attr in projectDetail API

Browse Source
This commit is contained in:
realrafi
2026-07-12 14:52:24 +03:30
parent 1440b62373
commit 8e23a06793
1 changed files with 22 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/task-manager/repositories/project.repository.ts
+22 -30
View File
@@ -5,21 +5,19 @@ import { TMProject } from "../entities/project.entity";
@Injectable() @Injectable()
export class ProjectRepository extends Repository<TMProject> { export class ProjectRepository extends Repository<TMProject> {
constructor( constructor(@InjectRepository(TMProject) projectRepository: Repository<TMProject>) {
@InjectRepository(TMProject) projectRepository: Repository<TMProject>,
) {
super(projectRepository.target, projectRepository.manager, projectRepository.queryRunner); super(projectRepository.target, projectRepository.manager, projectRepository.queryRunner);
} }
async findUserProjects(userId: string, wsId: string, skip?: number, take?: number): Promise<[TMProject[], number]> { async findUserProjects(userId: string, wsId: string, skip?: number, take?: number): Promise<[TMProject[], number]> {
return this.createQueryBuilder('project') return this.createQueryBuilder("project")
.innerJoin('project.workspace', 'workspace') .innerJoin("project.workspace", "workspace")
.innerJoin('project.users', 'user') .innerJoin("project.users", "user")
.where('workspace.id = :wsId', {wsId}) .where("workspace.id = :wsId", { wsId })
.andWhere('user.id = :userId', {userId}) .andWhere("user.id = :userId", { userId })
.skip(skip ?? 0) .skip(skip ?? 0)
.take(take ?? 10) .take(take ?? 10)
.getManyAndCount(); .getManyAndCount();
} }
async getProjectDetail(projectId: string): Promise<TMProject | null> { async getProjectDetail(projectId: string): Promise<TMProject | null> {
@@ -27,31 +25,23 @@ export class ProjectRepository extends Repository<TMProject> {
.leftJoinAndSelect("project.taskPhases", "taskPhase") .leftJoinAndSelect("project.taskPhases", "taskPhase")
.leftJoinAndSelect("taskPhase.tasks", "task") .leftJoinAndSelect("taskPhase.tasks", "task")
.leftJoinAndSelect("task.remarks", "remark") .leftJoinAndSelect("task.remarks", "remark")
.loadRelationCountAndMap( .loadRelationCountAndMap("task.attachmentCount", "task.attachments")
"task.attachmentCount",
"task.attachments", .loadRelationCountAndMap("task.checkListItemCount", "task.checkListItems")
.loadRelationCountAndMap("task.completedCheckListItemCount", "task.checkListItems", "completedCheckListItems", (qb) =>
qb.where("completedCheckListItems.isDone = :isDone", { isDone: true }),
) )
.loadRelationCountAndMap(
"task.checkListItemCount",
"task.checkListItems",
)
.loadRelationCountAndMap(
"task.completedCheckListItemCount",
"task.checkListItems",
"completedCheckListItems",
(qb) => qb.where("completedCheckListItems.isDone = :isDone", { isDone: true }),
)
.where("project.id = :projectId", { projectId }) .where("project.id = :projectId", { projectId })
.select([ .select([
"project.id", "project.id",
"project.name", "project.name",
"taskPhase.id", "taskPhase.id",
"taskPhase.name", "taskPhase.name",
"taskPhase.order",
"task.id", "task.id",
"task.title", "task.title",
"task.startDate", "task.startDate",
@@ -59,7 +49,9 @@ export class ProjectRepository extends Repository<TMProject> {
"remark.title", "remark.title",
"remark.color", "remark.color",
]) ])
.orderBy("taskPhase.order", "ASC")
.getOne(); .getOne();
} }
} }