The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
chore(server): remove nestjs-query from user-workspace module (#22591)
Abdul Rahmanf90137b536ad
diff --git a/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.entity.ts b/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.entity.tsindex 668fa27a548..9dc03a3f1b5 100644--- a/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.entity.ts+++ b/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.entity.ts@@ -1,6 +1,5 @@import { Field, ObjectType, registerEnumType } from '@nestjs/graphql';-import { IDField } from '@ptc-org/nestjs-query-graphql';import {PermissionFlagType,PermissionsOnAllObjectRecords,@@ -48,7 +47,7 @@ registerEnumType(PermissionsOnAllObjectRecords, {@Index('IDX_USER_WORKSPACE_USER_ID', ['userId'])@Index('IDX_USER_WORKSPACE_WORKSPACE_ID', ['workspaceId'])export class UserWorkspaceEntity extends WorkspaceRelatedEntity {- @IDField(() => UUIDScalarType)+ @Field(() => UUIDScalarType)@PrimaryGeneratedColumn('uuid')id: string;diff --git a/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.module.ts b/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.module.tsindex d17b93be1a9..bdcbe19a459 100644--- a/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.module.ts+++ b/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.module.ts@@ -1,7 +1,5 @@import { Module } from '@nestjs/common';--import { NestjsQueryGraphQLModule } from '@ptc-org/nestjs-query-graphql';-import { NestjsQueryTypeOrmModule } from '@ptc-org/nestjs-query-typeorm';+import { TypeOrmModule } from '@nestjs/typeorm';import { TypeORMModule } from 'src/database/typeorm/typeorm.module';import { CoreEntityCacheModule } from 'src/engine/core-entity-cache/core-entity-cache.module';@@ -17,11 +15,8 @@ import { UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/userimport { UserWorkspaceService } from 'src/engine/core-modules/user-workspace/user-workspace.service';import { UserEntity } from 'src/engine/core-modules/user/user.entity';import { WorkspaceInvitationModule } from 'src/engine/core-modules/workspace-invitation/workspace-invitation.module';-import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';-import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';import { RoleTargetEntity } from 'src/engine/metadata-modules/role-target/role-target.entity';-import { RoleEntity } from 'src/engine/metadata-modules/role/role.entity';import { RoleValidationModule } from 'src/engine/metadata-modules/role-validation/role-validation.module';import { UserRoleModule } from 'src/engine/metadata-modules/user-role/user-role.module';import { TwentyORMModule } from 'src/engine/twenty-orm/twenty-orm.module';@@ -29,34 +24,26 @@ import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/works@Module({imports: [- NestjsQueryGraphQLModule.forFeature({- imports: [- NestjsQueryTypeOrmModule.forFeature([- UserEntity,- UserWorkspaceEntity,- WorkspaceEntity,- RoleTargetEntity,- RoleEntity,- ]),- RoleValidationModule,- NestjsQueryTypeOrmModule.forFeature([ObjectMetadataEntity]),- TypeORMModule,- WorkspaceDataSourceModule,- ApprovedAccessDomainModule,- WorkspaceInvitationModule,- WorkspaceDomainsModule,- TwentyORMModule,- UserRoleModule,- FileModule,- TokenModule,- PermissionsModule,- OnboardingModule,- EnterpriseModule,- FeatureFlagModule,- CoreEntityCacheModule,- ],- services: [UserWorkspaceService],- }),+ TypeOrmModule.forFeature([+ UserWorkspaceEntity,+ UserEntity,+ RoleTargetEntity,+ ]),+ RoleValidationModule,+ TypeORMModule,+ WorkspaceDataSourceModule,+ ApprovedAccessDomainModule,+ WorkspaceInvitationModule,+ WorkspaceDomainsModule,+ TwentyORMModule,+ UserRoleModule,+ FileModule,+ TokenModule,+ PermissionsModule,+ OnboardingModule,+ EnterpriseModule,+ FeatureFlagModule,+ CoreEntityCacheModule,],exports: [UserWorkspaceService],providers: [UserWorkspaceService, UserWorkspaceEntityCacheProviderService],diff --git a/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.service.ts b/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.service.tsindex 9ed996285df..30ad075f63a 100644--- a/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.service.ts+++ b/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.service.ts@@ -1,7 +1,6 @@import { Logger } from '@nestjs/common';import { InjectRepository } from '@nestjs/typeorm';-import { TypeOrmQueryService } from '@ptc-org/nestjs-query-typeorm';import { type APP_LOCALES, SOURCE_LOCALE } from 'twenty-shared/translations';import { FileFolder } from 'twenty-shared/types';import { assertIsDefinedOrThrow, isDefined } from 'twenty-shared/utils';@@ -44,7 +43,7 @@ import { type WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-membeimport { assert } from 'src/utils/assert';import { getDomainFromEmailOrThrow } from 'src/utils/get-domain-from-email-or-throw';-export class UserWorkspaceService extends TypeOrmQueryService<UserWorkspaceEntity> {+export class UserWorkspaceService {private readonly logger = new Logger(UserWorkspaceService.name);constructor(@@ -67,8 +66,10 @@ export class UserWorkspaceService extends TypeOrmQueryService<UserWorkspaceEntitprivate readonly fileUrlService: FileUrlService,private readonly onboardingService: OnboardingService,private readonly coreEntityCacheService: CoreEntityCacheService,- ) {- super(userWorkspaceRepository);+ ) {}++ async findById(id: string): Promise<UserWorkspaceEntity | null> {+ return this.userWorkspaceRepository.findOne({ where: { id } });}async updateUserWorkspaceLocaleForUserWorkspace({