Merge pull request #8537 from ever-co/fix/add-all-task-data

[Enhancement] Add All task Data
ever-co · Nov 15, 2024 · 8f97921 · 8f97921
2 parents a0af6b3 + 375f11d
commit 8f97921
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 31 deletions.
diff --git a/packages/contracts/src/task.model.ts b/packages/contracts/src/task.model.ts
@@ -28,6 +28,8 @@ export interface ITask
 	status?: TaskStatusEnum;
 	priority?: TaskPriorityEnum;
 	size?: TaskSizeEnum;
+	startDate?: Date;
+	resolvedAt?: Date;
 	dueDate?: Date;
 	estimate?: number;
 	tags?: ITag[];
@@ -41,6 +43,7 @@ export interface ITask
 	creatorId?: ID;
 	isDraft?: boolean; // Define if task is still draft (E.g : Task description not completed yet)
 
+	version?: string;
 	issueType?: string;
 
 	parent?: ITask;

diff --git a/packages/core/src/time-tracking/time-log/time-log.service.ts b/packages/core/src/time-tracking/time-log/time-log.service.ts
@@ -90,22 +90,7 @@ export class TimeLogService extends TenantAwareCrudService<TimeLog> {
 					imageUrl: true,
 					membersCount: true
 				},
-				task: {
-					id: true,
-					title: true,
-					estimate: true,
-					taskStatus: {
-						name: true,
-						value: true,
-						description: true,
-						icon: true,
-						color: true,
-						order: true,
-						isCollapsed: true,
-						isDefault: true
-					},
-					issueType: true
-				},
+				task: TimeLogService.TASK_SELECT_FIELDS,
 				organizationContact: {
 					id: true,
 					name: true,
@@ -355,21 +340,7 @@ export class TimeLogService extends TenantAwareCrudService<TimeLog> {
 						imageUrl: true
 					}
 				},
-				task: {
-					id: true,
-					title: true,
-					taskStatus: {
-						name: true,
-						value: true,
-						description: true,
-						icon: true,
-						color: true,
-						order: true,
-						isCollapsed: true,
-						isDefault: true
-					},
-					issueType: true
-				},
+				task: TimeLogService.TASK_SELECT_FIELDS,
 				timeSlots: {
 					id: true,
 					overall: true,
@@ -1282,4 +1253,35 @@ export class TimeLogService extends TenantAwareCrudService<TimeLog> {
 		// Check if the end date is on or before the current date
 		return moment(end).isSameOrBefore(moment());
 	}
+
+	private static readonly TASK_SELECT_FIELDS = {
+		id: true,
+		isActive: true,
+		isArchived: true,
+		tenantId: true,
+		organizationId: true,
+		number: true,
+		prefix: true,
+		title: true,
+		description: true,
+		status: true,
+		priority: true,
+		size: true,
+		issueType: true,
+		estimate: true,
+		dueDate: true,
+		startDate: true,
+		resolvedAt: true,
+		version: true,
+		taskStatus: {
+			name: true,
+			value: true,
+			description: true,
+			icon: true,
+			color: true,
+			order: true,
+			isCollapsed: true,
+			isDefault: true
+		}
+	} as const;
 }