Merge pull request #8809 from ever-co/fix/alter-entity-subscription-e…

…ntity [Refactor] Rename "Subscription" to "EntitySubscription"
ever-co · Feb 28, 2025 · 26f568c · 26f568c
2 parents 590cf1c + cbd1a57
commit 26f568c
Show file tree

Hide file tree

Showing 51 changed files with 954 additions and 475 deletions.
diff --git a/packages/contracts/src/index.ts b/packages/contracts/src/index.ts
@@ -125,7 +125,7 @@ export * from './lib/shared-types';
 export * from './lib/skill-entity.model';
 export * from './lib/sms.model';
 export * from './lib/social-account.model';
-export * from './lib/subscription.model';
+export * from './lib/entity-subscription.model';
 export * from './lib/tag.model';
 export * from './lib/task-estimation.model';
 export * from './lib/task-linked-issue.model';

diff --git a/packages/contracts/src/lib/entity-subscription.model.ts b/packages/contracts/src/lib/entity-subscription.model.ts
@@ -0,0 +1,18 @@
+import { IBasePerEntityType, OmitFields } from './base-entity.model';
+import { IEmployeeEntityInput } from './employee.model';
+
+export interface IEntitySubscription extends IBasePerEntityType, IEmployeeEntityInput {
+	type: EntitySubscriptionTypeEnum;
+}
+
+export enum EntitySubscriptionTypeEnum {
+	MANUAL = 'manual',
+	MENTION = 'mention',
+	ASSIGNMENT = 'assignment',
+	COMMENT = 'comment',
+	CREATED_ENTITY = 'created-entity'
+}
+
+export interface IEntitySubscriptionCreateInput extends OmitFields<IEntitySubscription> {}
+
+export interface IEntitySubscriptionFindInput extends Partial<IEntitySubscription> {}
diff --git a/packages/contracts/src/lib/subscription.model.ts b/packages/contracts/src/lib/subscription.model.ts
diff --git a/packages/core/src/lib/app/app.module.ts b/packages/core/src/lib/app/app.module.ts
@@ -157,7 +157,7 @@ import { ApiCallLogModule } from '../api-call-log/api-call-log.module'; // Globa
 import { TaskViewModule } from '../tasks/views/view.module';
 import { ResourceLinkModule } from '../resource-link/resource-link.module';
 import { MentionModule } from '../mention/mention.module';
-import { SubscriptionModule } from '../subscription/subscription.module';
+import { EntitySubscriptionModule } from '../entity-subscription/entity-subscription.module';
 import { DashboardModule } from '../dashboard/dashboard.module';
 import { DashboardWidgetModule } from '../dashboard/dashboard-widget/dashboard-widget.module';
 import { TenantApiKeyModule } from '../tenant-api-key/tenant-api-key.module';
@@ -469,7 +469,7 @@ if (environment.THROTTLE_ENABLED) {
 		TaskViewModule,
 		ResourceLinkModule,
 		MentionModule,
-		SubscriptionModule,
+		EntitySubscriptionModule,
 		DashboardModule,
 		DashboardWidgetModule,
 		EmployeeNotificationModule,

diff --git a/packages/core/src/lib/comment/comment.service.ts b/packages/core/src/lib/comment/comment.service.ts
@@ -3,15 +3,15 @@ import { BadRequestException, Injectable, NotFoundException } from '@nestjs/comm
 import { UpdateResult } from 'typeorm';
 import {
 	BaseEntityEnum,
+	EntitySubscriptionTypeEnum,
 	IComment,
 	ICommentCreateInput,
 	ICommentUpdateInput,
-	ID,
-	SubscriptionTypeEnum
+	ID
 } from '@gauzy/contracts';
 import { TenantAwareCrudService } from './../core/crud';
 import { RequestContext } from '../core/context';
-import { CreateSubscriptionEvent } from '../subscription/events';
+import { CreateEntitySubscriptionEvent } from '../entity-subscription/events';
 import { EmployeeService } from '../employee/employee.service';
 import { MentionService } from '../mention/mention.service';
 import { Comment } from './comment.entity';
@@ -83,10 +83,11 @@ export class CommentService extends TenantAwareCrudService<Comment> {
 
 			// Subscribe the comment creator to the entity.
 			this._eventBus.publish(
-				new CreateSubscriptionEvent({
+				new CreateEntitySubscriptionEvent({
 					entity: input.entity,
 					entityId: input.entityId,
-					type: SubscriptionTypeEnum.COMMENT,
+					employeeId,
+					type: EntitySubscriptionTypeEnum.COMMENT,
 					organizationId: comment.organizationId,
 					tenantId: comment.tenantId
 				})

diff --git a/packages/core/src/lib/core/entities/index.ts b/packages/core/src/lib/core/entities/index.ts
@@ -131,7 +131,7 @@ import {
 	Screenshot,
 	Skill,
 	SocialAccount,
-	Subscription,
+	EntitySubscription,
 	Tag,
 	TagType,
 	Task,
@@ -292,7 +292,7 @@ export const coreEntities = [
 	Screenshot,
 	Skill,
 	SocialAccount,
-	Subscription,
+	EntitySubscription,
 	Tag,
 	TagType,
 	Task,

diff --git a/packages/core/src/lib/core/entities/internal.ts b/packages/core/src/lib/core/entities/internal.ts
@@ -131,7 +131,7 @@ export * from '../../resource-link/resource-link.entity';
 export * from '../../role-permission/role-permission.entity';
 export * from '../../role/role.entity';
 export * from '../../skills/skill.entity';
-export * from '../../subscription/subscription.entity';
+export * from '../../entity-subscription/entity-subscription.entity';
 export * from '../../tags/tag.entity';
 export * from '../../tag-type/tag-type.entity';
 export * from '../../tasks/daily-plan/daily-plan.entity';

diff --git a/packages/core/src/lib/core/seeds/seeder.module.ts b/packages/core/src/lib/core/seeds/seeder.module.ts
@@ -7,7 +7,7 @@ import { LanguagesEnum } from '@gauzy/contracts';
 import { DatabaseModule } from './../../database/database.module';
 import { ActivityLogModule } from '../../activity-log/activity-log.module';
 import { MentionModule } from '../../mention/mention.module';
-import { SubscriptionModule } from '../../subscription/subscription.module';
+import { EntitySubscriptionModule } from '../../entity-subscription/entity-subscription.module';
 import { SeedDataService } from './seed-data.service';
 
 /**
@@ -42,7 +42,7 @@ export class SeederModule {
 				DatabaseModule,
 				ActivityLogModule,
 				MentionModule,
-				SubscriptionModule,
+				EntitySubscriptionModule,
 				...getDynamicPluginsModules()
 			]
 		};