Merge pull request #8239 from ever-co/fix/async-await-conflict-deletion

[Fix] async-await handling in conflict deletion to ensure proper command execution
ever-co · Sep 23, 2024 · 54d8c81 · 54d8c81
2 parents c61f9ae + ed0f9ce
commit 54d8c81
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/packages/core/src/time-tracking/timer/timer.service.ts b/packages/core/src/time-tracking/timer/timer.service.ts
@@ -378,11 +378,11 @@ export class TimerService {
 
 				// Delete conflicts
 				await Promise.all(
-					await conflicts.flatMap((timeLog: ITimeLog) => {
+					conflicts.flatMap((timeLog: ITimeLog) => {
 						const { timeSlots = [] } = timeLog;
-						timeSlots.map(async (timeSlot: ITimeSlot) => {
-							await this.commandBus.execute(new DeleteTimeSpanCommand(times, timeLog, timeSlot));
-						});
+						return timeSlots.map((timeSlot: ITimeSlot) =>
+							this.commandBus.execute(new DeleteTimeSpanCommand(times, timeLog, timeSlot))
+						);
 					})
 				);
 			}