Merge pull request #8736 from ever-co/fix/create-mention-from-comment…

…-missing-organizationId Fix/create mention from comment missing organization
ever-co · Jan 17, 2025 · c637575 · c637575
2 parents fbbe7bb + 8c0a804
commit c637575
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 15 deletions.
diff --git a/packages/core/src/lib/comment/comment.service.ts b/packages/core/src/lib/comment/comment.service.ts
@@ -64,7 +64,9 @@ export class CommentService extends TenantAwareCrudService<Comment> {
 						mentionedUserId,
 						mentionById: user.id,
 						parentEntityId: comment.entityId,
-						parentEntityType: comment.entity
+						parentEntityType: comment.entity,
+						organizationId: comment.organizationId,
+						tenantId
 					})
 				)
 			);

diff --git a/packages/core/src/lib/tasks/commands/handlers/task-create.handler.ts b/packages/core/src/lib/tasks/commands/handlers/task-create.handler.ts
@@ -1,6 +1,14 @@
 import { CommandHandler, ICommandHandler, EventBus as CqrsEventBus } from '@nestjs/cqrs';
 import { HttpException, HttpStatus, Logger } from '@nestjs/common';
-import { BaseEntityEnum, ActorTypeEnum, ITask, ActionTypeEnum, SubscriptionTypeEnum, ID, IEmployee } from '@gauzy/contracts';
+import {
+	BaseEntityEnum,
+	ActorTypeEnum,
+	ITask,
+	ActionTypeEnum,
+	SubscriptionTypeEnum,
+	ID,
+	IEmployee
+} from '@gauzy/contracts';
 import { EventBus } from '../../../event-bus';
 import { TaskEvent } from '../../../event-bus/events';
 import { BaseEntityEventTypeEnum } from '../../../event-bus/base-entity-event';
@@ -88,7 +96,9 @@ export class TaskCreateHandler implements ICommandHandler<TaskCreateCommand> {
 							entity: BaseEntityEnum.Task,
 							entityId: task.id,
 							mentionedUserId,
-							mentionById: task.creatorId
+							mentionById: task.creatorId,
+							organizationId,
+							tenantId
 						})
 					)
 				);
@@ -121,16 +131,18 @@ export class TaskCreateHandler implements ICommandHandler<TaskCreateCommand> {
 
 					// Publish subscription events for each employee
 					await Promise.all(
-						employees.map(({ userId }: IEmployee) => this._cqrsEventBus.publish(
-							new CreateSubscriptionEvent({
-								entity: BaseEntityEnum.Task,
-								entityId: task.id,
-								userId,
-								type: SubscriptionTypeEnum.ASSIGNMENT,
-								organizationId,
-								tenantId
-							})
-						))
+						employees.map(({ userId }: IEmployee) =>
+							this._cqrsEventBus.publish(
+								new CreateSubscriptionEvent({
+									entity: BaseEntityEnum.Task,
+									entityId: task.id,
+									userId,
+									type: SubscriptionTypeEnum.ASSIGNMENT,
+									organizationId,
+									tenantId
+								})
+							)
+						)
 					);
 				} catch (error) {
 					this.logger.error('Error while subscribing members to task', error);

diff --git a/packages/core/src/lib/tasks/task.service.ts b/packages/core/src/lib/tasks/task.service.ts
@@ -901,8 +901,6 @@ export class TaskService extends TenantAwareCrudService<Task> {
 						qb.andWhere(p(`"${query.alias}"."organizationSprintId" = :organizationSprintId`), {
 							organizationSprintId
 						});
-					} else {
-						qb.andWhere(p(`"${query.alias}"."organizationSprintId" IS NULL`));
 					}
 					qb.andWhere(p(`"${query.alias}"."isScreeningTask" = :isScreeningTask`), { isScreeningTask });
 				})