houseassassin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drop nestjs-query IDField from standalone DTOs/entities (#22881)

Browse Source 
## What

Replaces `@IDField(() => UUIDScalarType)` from
`@ptc-org/nestjs-query-graphql` with the native `@Field(() =>
UUIDScalarType)` (`@nestjs/graphql`) across 50 DTOs and entities that
are **not** wired to a nestjs-query auto-resolver.

This continues the incremental migration off `@ptc-org/nestjs-query`.

## Why

These 50 types only used `IDField` to type their `id` column as a UUID
scalar. Since none of them are attached to a
`NestjsQueryGraphQLModule.forFeature` resolver, `IDField` carries no
extra behavior here — it's a plain field decorator.

Co-authored-by: Abdul Rahman <abdulrahmancodes@users.noreply.github.com>
This commit is contained in:
Abdul Rahman
2026-07-14 20:46:59 +05:30
committed by GitHub
parent 75d9e0b93a
commit 58fcb3cb0f
50 changed files with 70 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/twenty-server/src/engine/core-modules/api-key/api-key.entity.ts
+1 -3
View File
@@ -1,6 +1,4 @@
import { Field, ObjectType } from '@nestjs/graphql';
import { IDField } from '@ptc-org/nestjs-query-graphql';
import {
Column,
CreateDateColumn,
@@ -17,7 +15,7 @@ import { WorkspaceRelatedEntity } from 'src/engine/workspace-manager/types/works
@Entity({ name: 'apiKey', schema: 'core' })
@ObjectType('ApiKey')
export class ApiKeyEntity extends WorkspaceRelatedEntity {
@IDField(() => UUIDScalarType)
@Field(() => UUIDScalarType)
@PrimaryGeneratedColumn('uuid')
id: string;
packages/twenty-server/src/engine/core-modules/application/application-registration-variable/application-registration-variable.entity.ts
+1 -3
View File
@@ -1,6 +1,4 @@
import { Field, ObjectType } from '@nestjs/graphql';
import { IDField } from '@ptc-org/nestjs-query-graphql';
import {
Check,
Column,
@@ -41,7 +39,7 @@ import { type EncryptedString } from 'src/engine/core-modules/secret-encryption/
`"encryptedValue" = '' OR "encryptedValue" LIKE 'enc:v2:%'`,
)
export class ApplicationRegistrationVariableEntity {
@IDField(() => UUIDScalarType)
@Field(() => UUIDScalarType)
@PrimaryGeneratedColumn('uuid')
id: string;
packages/twenty-server/src/engine/core-modules/application/application-registration-variable/dtos/application-registration-variable.dto.ts
+1 -2
View File
@@ -1,13 +1,12 @@
import { Field, ObjectType } from '@nestjs/graphql';
import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
import { IsBoolean, IsOptional, IsString } from 'class-validator';
import { IDField } from '@ptc-org/nestjs-query-graphql';
import { GraphQLJSON } from 'graphql-type-json';
import { type ApplicationVariableOption } from 'twenty-shared/application';
@ObjectType()
export class ApplicationRegistrationVariableDTO {
@IDField(() => UUIDScalarType)
@Field(() => UUIDScalarType)
id: string;
@IsString()
packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.entity.ts
+1 -3
View File
@@ -1,6 +1,4 @@
import { Field, ObjectType } from '@nestjs/graphql';
import { IDField } from '@ptc-org/nestjs-query-graphql';
import {
Check,
Column,
@@ -53,7 +51,7 @@ import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.ent
`"sourceType" <> 'npm' OR "sourcePackage" IS NOT NULL`,
)
export class ApplicationRegistrationEntity {
@IDField(() => UUIDScalarType)
@Field(() => UUIDScalarType)
@PrimaryGeneratedColumn('uuid')
id: string;
packages/twenty-server/src/engine/core-modules/application/application-variable/application-variable.entity.ts
+2 -4
View File
@@ -1,6 +1,4 @@
import { ObjectType } from '@nestjs/graphql';
import { IDField } from '@ptc-org/nestjs-query-graphql';
import { Field, ObjectType } from '@nestjs/graphql';
import {
Check,
Column,
@@ -34,7 +32,7 @@ import { SyncableEntity } from 'src/engine/workspace-manager/types/syncable-enti
`"value" = '' OR "value" LIKE 'enc:v2:%'`,
)
export class ApplicationVariableEntity extends SyncableEntity {
@IDField(() => UUIDScalarType)
@Field(() => UUIDScalarType)
@PrimaryGeneratedColumn('uuid')
id: string;
packages/twenty-server/src/engine/core-modules/application/application-variable/dtos/application-variable.dto.ts
+1 -2
View File
@@ -2,14 +2,13 @@ import { Field, ObjectType } from '@nestjs/graphql';
import { IsBoolean, IsOptional, IsString } from 'class-validator';
import { GraphQLJSON } from 'graphql-type-json';
import { IDField } from '@ptc-org/nestjs-query-graphql';
import { type ApplicationVariableOption } from 'twenty-shared/application';
import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
@ObjectType('ApplicationVariable')
export class ApplicationVariableEntityDTO {
@IDField(() => UUIDScalarType)
@Field(() => UUIDScalarType)
id: string;
@IsString()
packages/twenty-server/src/engine/core-modules/application/connection-provider/dtos/application-connection-provider.dto.ts
+1 -3
View File
@@ -1,7 +1,5 @@
import { Field, ObjectType } from '@nestjs/graphql';
import { IDField } from '@ptc-org/nestjs-query-graphql';
import { type ConnectionProviderType } from 'twenty-shared/application';
import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
@@ -20,7 +18,7 @@ export class ApplicationConnectionProviderOAuthConfigDTO {
@ObjectType('ApplicationConnectionProvider')
export class ApplicationConnectionProviderDTO {
@IDField(() => UUIDScalarType)
@Field(() => UUIDScalarType)
id: string;
@Field()
packages/twenty-server/src/engine/core-modules/approved-access-domain/dtos/approved-access-domain.dto.ts
+1 -3
View File
@@ -1,12 +1,10 @@
import { Field, ObjectType } from '@nestjs/graphql';
import { IDField } from '@ptc-org/nestjs-query-graphql';
import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
@ObjectType('ApprovedAccessDomain')
export class ApprovedAccessDomainDTO {
@IDField(() => UUIDScalarType)
@Field(() => UUIDScalarType)
id: string;
@Field({ nullable: false })
packages/twenty-server/src/engine/core-modules/billing/dtos/billing-subscription-item.dto.ts
+1 -3
View File
@@ -2,14 +2,12 @@
import { Field, ObjectType } from '@nestjs/graphql';
import { IDField } from '@ptc-org/nestjs-query-graphql';
import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
import { BillingProductDTO } from 'src/engine/core-modules/billing/dtos/billing-product.dto';
@ObjectType('BillingSubscriptionItem')
export class BillingSubscriptionItemDTO {
@IDField(() => UUIDScalarType)
@Field(() => UUIDScalarType)
id: string;
@Field(() => Boolean)
packages/twenty-server/src/engine/core-modules/billing/entities/billing-customer.entity.ts
+1 -3
View File
@@ -1,8 +1,6 @@
/* @license Enterprise */
import { Field, ObjectType } from '@nestjs/graphql';
import { IDField } from '@ptc-org/nestjs-query-graphql';
import {
Column,
CreateDateColumn,
@@ -25,7 +23,7 @@ import { WorkspaceRelatedEntity } from 'src/engine/workspace-manager/types/works
unique: true,
})
export class BillingCustomerEntity extends WorkspaceRelatedEntity {
@IDField(() => UUIDScalarType)
@Field(() => UUIDScalarType)
@PrimaryGeneratedColumn('uuid')
id: string;
packages/twenty-server/src/engine/core-modules/billing/entities/billing-entitlement.entity.ts
+1 -3
View File
@@ -1,8 +1,6 @@
/* @license Enterprise */
import { Field, ObjectType } from '@nestjs/graphql';
import { IDField } from '@ptc-org/nestjs-query-graphql';
import {
Column,
CreateDateColumn,
@@ -27,7 +25,7 @@ import { WorkspaceRelatedEntity } from 'src/engine/workspace-manager/types/works
'workspaceId',
])
export class BillingEntitlementEntity extends WorkspaceRelatedEntity {
@IDField(() => UUIDScalarType)
@Field(() => UUIDScalarType)
@PrimaryGeneratedColumn('uuid')
id: string;
packages/twenty-server/src/engine/core-modules/billing/entities/billing-subscription.entity.ts
+1 -3
View File
@@ -1,8 +1,6 @@
/* @license Enterprise */
import { Field, ObjectType, registerEnumType } from '@nestjs/graphql';
import { IDField } from '@ptc-org/nestjs-query-graphql';
import graphqlTypeJson from 'graphql-type-json';
import {
Column,
@@ -56,7 +54,7 @@ registerEnumType(SubscriptionInterval, { name: 'SubscriptionInterval' });
})
@ObjectType('BillingSubscription')
export class BillingSubscriptionEntity extends WorkspaceRelatedEntity {
@IDField(() => UUIDScalarType)
@Field(() => UUIDScalarType)
@PrimaryGeneratedColumn('uuid')
id: string;
packages/twenty-server/src/engine/core-modules/dpa/entities/dpa-agreement.entity.ts
+1 -3
View File
@@ -1,6 +1,4 @@
import { Field, ObjectType, registerEnumType } from '@nestjs/graphql';
import { IDField } from '@ptc-org/nestjs-query-graphql';
import {
Column,
CreateDateColumn,
@@ -29,7 +27,7 @@ registerEnumType(DpaRegion, { name: 'DpaRegion' });
@Index('IDX_DPA_AGREEMENT_WORKSPACE_ID', ['workspaceId'])
@ObjectType('DpaAgreement')
export class DpaAgreementEntity {
@IDField(() => UUIDScalarType)
@Field(() => UUIDScalarType)
@PrimaryGeneratedColumn('uuid')
id: string;
packages/twenty-server/src/engine/core-modules/emailing-domain/dtos/emailing-domain.dto.ts
+1 -3
View File
@@ -1,7 +1,5 @@
import { Field, ObjectType, registerEnumType } from '@nestjs/graphql';
import { IDField } from '@ptc-org/nestjs-query-graphql';
import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
import { EmailingDomainStatus } from 'src/engine/core-modules/emailing-domain/drivers/types/emailing-domain-status.type';
import { VerificationRecordDTO } from 'src/engine/core-modules/emailing-domain/dtos/verification-record.dto';
@@ -12,7 +10,7 @@ registerEnumType(EmailingDomainStatus, {
@ObjectType('EmailingDomain')
export class EmailingDomainDTO {
@IDField(() => UUIDScalarType)
@Field(() => UUIDScalarType)
id: string;
@Field(() => Date)
packages/twenty-server/src/engine/core-modules/emailing-domain/dtos/unsubscribe-topic.dto.ts
+1 -3
View File
@@ -1,7 +1,5 @@
import { Field, ObjectType, registerEnumType } from '@nestjs/graphql';
import { IDField } from '@ptc-org/nestjs-query-graphql';
import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
import { UnsubscribeTopicVisibility } from 'src/engine/core-modules/emailing-domain/types/unsubscribe-topic-visibility.type';
@@ -11,7 +9,7 @@ registerEnumType(UnsubscribeTopicVisibility, {
@ObjectType('UnsubscribeTopic')
export class UnsubscribeTopicDTO {
@IDField(() => UUIDScalarType)
@Field(() => UUIDScalarType)
id: string;
@Field(() => Date)
packages/twenty-server/src/engine/core-modules/public-domain/dtos/public-domain.dto.ts
+1 -3
View File
@@ -1,12 +1,10 @@
import { Field, ObjectType } from '@nestjs/graphql';
import { IDField } from '@ptc-org/nestjs-query-graphql';
import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
@ObjectType('PublicDomain')
export class PublicDomainDTO {
@IDField(() => UUIDScalarType)
@Field(() => UUIDScalarType)
id: string;
@Field({ nullable: false })
packages/twenty-server/src/engine/core-modules/sso/workspace-sso-identity-provider.entity.ts
+2 -4
View File
@@ -1,8 +1,6 @@
/* @license Enterprise */
import { ObjectType, registerEnumType } from '@nestjs/graphql';
import { IDField } from '@ptc-org/nestjs-query-graphql';
import { Field, ObjectType, registerEnumType } from '@nestjs/graphql';
import {
Column,
CreateDateColumn,
@@ -45,7 +43,7 @@ registerEnumType(SSOIdentityProviderStatus, {
@ObjectType('WorkspaceSSOIdentityProvider')
export class WorkspaceSSOIdentityProviderEntity extends WorkspaceRelatedEntity {
// COMMON
@IDField(() => UUIDScalarType)
@Field(() => UUIDScalarType)
@PrimaryGeneratedColumn('uuid')
id: string;
packages/twenty-server/src/engine/core-modules/user/dtos/deleted-workspace-member.dto.ts
+1 -3
View File
@@ -1,13 +1,11 @@
import { Field, ObjectType } from '@nestjs/graphql';
import { IDField } from '@ptc-org/nestjs-query-graphql';
import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
import { FullNameDTO } from 'src/engine/core-modules/user/dtos/workspace-member.dto';
@ObjectType('DeletedWorkspaceMember')
export class DeletedWorkspaceMemberDTO {
@IDField(() => UUIDScalarType)
@Field(() => UUIDScalarType)
id: string;
@Field(() => FullNameDTO)
packages/twenty-server/src/engine/core-modules/user/dtos/workspace-member.dto.ts
+1 -3
View File
@@ -1,6 +1,4 @@
import { Field, Int, ObjectType } from '@nestjs/graphql';
import { IDField } from '@ptc-org/nestjs-query-graphql';
import { Max, Min } from 'class-validator';
import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
@@ -22,7 +20,7 @@ export class FullNameDTO {
@ObjectType('WorkspaceMember')
export class WorkspaceMemberDTO {
@IDField(() => UUIDScalarType)
@Field(() => UUIDScalarType)
id: string;
@Field(() => FullNameDTO)
packages/twenty-server/src/engine/core-modules/workspace-invitation/dtos/workspace-invitation.dto.ts
+1 -3
View File
@@ -1,12 +1,10 @@
import { Field, ObjectType } from '@nestjs/graphql';
import { IDField } from '@ptc-org/nestjs-query-graphql';
import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
@ObjectType('WorkspaceInvitation')
export class WorkspaceInvitation {
@IDField(() => UUIDScalarType)
@Field(() => UUIDScalarType)
id: string;
@Field({ nullable: false })