The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
refactor(server): drop unused flat-metadata params from OpenAPI path builders (#24533)
Félix Malfaitd1fa6682448f
diff --git a/packages/twenty-server/src/engine/core-modules/open-api/open-api.service.ts b/packages/twenty-server/src/engine/core-modules/open-api/open-api.service.tsindex bec634f0277..46e802acc91 100644--- a/packages/twenty-server/src/engine/core-modules/open-api/open-api.service.ts+++ b/packages/twenty-server/src/engine/core-modules/open-api/open-api.service.ts@@ -119,46 +119,16 @@ export class OpenApiService {}schema.paths = flatObjectMetadataArray.reduce((paths, item) => {- paths[`/${item.namePlural}`] = computeManyResultPath(- item,- flatObjectMetadataMaps,- flatFieldMetadataMaps,- );- paths[`/batch/${item.namePlural}`] = computeBatchPath(- item,- flatObjectMetadataMaps,- flatFieldMetadataMaps,- );- paths[`/${item.namePlural}/{id}`] = computeSingleResultPath(- item,- flatObjectMetadataMaps,- flatFieldMetadataMaps,- );- paths[`/${item.namePlural}/duplicates`] = computeDuplicatesResultPath(- item,- flatObjectMetadataMaps,- flatFieldMetadataMaps,- );- paths[`/restore/${item.namePlural}/{id}`] = computeRestoreOneResultPath(- item,- flatObjectMetadataMaps,- flatFieldMetadataMaps,- );- paths[`/restore/${item.namePlural}`] = computeRestoreManyResultPath(- item,- flatObjectMetadataMaps,- flatFieldMetadataMaps,- );- paths[`/${item.namePlural}/merge`] = computeMergeManyResultPath(- item,- flatObjectMetadataMaps,- flatFieldMetadataMaps,- );- paths[`/${item.namePlural}/groupBy`] = computeGroupByResultPath(- item,- flatObjectMetadataMaps,- flatFieldMetadataMaps,- );+ paths[`/${item.namePlural}`] = computeManyResultPath(item);+ paths[`/batch/${item.namePlural}`] = computeBatchPath(item);+ paths[`/${item.namePlural}/{id}`] = computeSingleResultPath(item);+ paths[`/${item.namePlural}/duplicates`] =+ computeDuplicatesResultPath(item);+ paths[`/restore/${item.namePlural}/{id}`] =+ computeRestoreOneResultPath(item);+ paths[`/restore/${item.namePlural}`] = computeRestoreManyResultPath(item);+ paths[`/${item.namePlural}/merge`] = computeMergeManyResultPath(item);+ paths[`/${item.namePlural}/groupBy`] = computeGroupByResultPath(item);return paths;}, schema.paths as OpenAPIV3_1.PathsObject);@@ -194,34 +164,19 @@ export class OpenApiService {DatabaseEventAction.CREATED,item.nameSingular,)- ] = computeWebhooks(- DatabaseEventAction.CREATED,- item,- flatObjectMetadataMaps,- flatFieldMetadataMaps,- );+ ] = computeWebhooks(DatabaseEventAction.CREATED, item);paths[this.createWebhookEventName(DatabaseEventAction.UPDATED,item.nameSingular,)- ] = computeWebhooks(- DatabaseEventAction.UPDATED,- item,- flatObjectMetadataMaps,- flatFieldMetadataMaps,- );+ ] = computeWebhooks(DatabaseEventAction.UPDATED, item);paths[this.createWebhookEventName(DatabaseEventAction.DELETED,item.nameSingular,)- ] = computeWebhooks(- DatabaseEventAction.DELETED,- item,- flatObjectMetadataMaps,- flatFieldMetadataMaps,- );+ ] = computeWebhooks(DatabaseEventAction.DELETED, item);return paths;},diff --git a/packages/twenty-server/src/engine/core-modules/open-api/utils/computeWebhooks.utils.ts b/packages/twenty-server/src/engine/core-modules/open-api/utils/computeWebhooks.utils.tsindex d7c10ae9e8e..afc2cba11a8 100644--- a/packages/twenty-server/src/engine/core-modules/open-api/utils/computeWebhooks.utils.ts+++ b/packages/twenty-server/src/engine/core-modules/open-api/utils/computeWebhooks.utils.ts@@ -2,20 +2,11 @@ import { type OpenAPIV3_1 } from 'openapi-types';import { capitalize } from 'twenty-shared/utils';import { DatabaseEventAction } from 'src/engine/api/graphql/graphql-query-runner/enums/database-event-action';-import { type AllFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/all-flat-entity-maps.type';import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';export const computeWebhooks = (type: DatabaseEventAction,item: Pick<FlatObjectMetadata, 'nameSingular'>,- _flatObjectMetadataMaps: Pick<- AllFlatEntityMaps,- 'flatObjectMetadataMaps'- >['flatObjectMetadataMaps'],- _flatFieldMetadataMaps: Pick<- AllFlatEntityMaps,- 'flatFieldMetadataMaps'- >['flatFieldMetadataMaps'],): OpenAPIV3_1.PathItemObject => {const updatedFields = {type: 'array',diff --git a/packages/twenty-server/src/engine/core-modules/open-api/utils/path.utils.ts b/packages/twenty-server/src/engine/core-modules/open-api/utils/path.utils.tsindex 066ea1a1769..5d0a4c8a93d 100644--- a/packages/twenty-server/src/engine/core-modules/open-api/utils/path.utils.ts+++ b/packages/twenty-server/src/engine/core-modules/open-api/utils/path.utils.ts@@ -24,19 +24,10 @@ import {getUpdateManyResponse200,getUpdateOneResponse200,} from 'src/engine/core-modules/open-api/utils/responses.utils';-import { type AllFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/all-flat-entity-maps.type';import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';export const computeBatchPath = (item: Pick<FlatObjectMetadata, 'nameSingular' | 'namePlural'>,- _flatObjectMetadataMaps: Pick<- AllFlatEntityMaps,- 'flatObjectMetadataMaps'- >['flatObjectMetadataMaps'],- _flatFieldMetadataMaps: Pick<- AllFlatEntityMaps,- 'flatFieldMetadataMaps'- >['flatFieldMetadataMaps'],): OpenAPIV3_1.PathItemObject => {return {post: {@@ -59,14 +50,6 @@ export const computeBatchPath = (export const computeManyResultPath = (item: Pick<FlatObjectMetadata, 'nameSingular' | 'namePlural'>,- _flatObjectMetadataMaps: Pick<- AllFlatEntityMaps,- 'flatObjectMetadataMaps'- >['flatObjectMetadataMaps'],- _flatFieldMetadataMaps: Pick<- AllFlatEntityMaps,- 'flatFieldMetadataMaps'- >['flatFieldMetadataMaps'],): OpenAPIV3_1.PathItemObject => {return {get: {@@ -137,14 +120,6 @@ export const computeManyResultPath = (export const computeSingleResultPath = (item: Pick<FlatObjectMetadata, 'nameSingular' | 'namePlural'>,- _flatObjectMetadataMaps: Pick<- AllFlatEntityMaps,- 'flatObjectMetadataMaps'- >['flatObjectMetadataMaps'],- _flatFieldMetadataMaps: Pick<- AllFlatEntityMaps,- 'flatFieldMetadataMaps'- >['flatFieldMetadataMaps'],): OpenAPIV3_1.PathItemObject => {return {get: {@@ -216,14 +191,6 @@ export const computeOpenApiPath = (export const computeDuplicatesResultPath = (item: Pick<FlatObjectMetadata, 'nameSingular' | 'namePlural'>,- _flatObjectMetadataMaps: Pick<- AllFlatEntityMaps,- 'flatObjectMetadataMaps'- >['flatObjectMetadataMaps'],- _flatFieldMetadataMaps: Pick<- AllFlatEntityMaps,- 'flatFieldMetadataMaps'- >['flatFieldMetadataMaps'],): OpenAPIV3_1.PathItemObject => {return {post: {@@ -244,14 +211,6 @@ export const computeDuplicatesResultPath = (export const computeRestoreOneResultPath = (item: Pick<FlatObjectMetadata, 'nameSingular' | 'namePlural'>,- _flatObjectMetadataMaps: Pick<- AllFlatEntityMaps,- 'flatObjectMetadataMaps'- >['flatObjectMetadataMaps'],- _flatFieldMetadataMaps: Pick<- AllFlatEntityMaps,- 'flatFieldMetadataMaps'- >['flatFieldMetadataMaps'],): OpenAPIV3_1.PathItemObject => {return {patch: {@@ -273,14 +232,6 @@ export const computeRestoreOneResultPath = (export const computeRestoreManyResultPath = (item: Pick<FlatObjectMetadata, 'nameSingular' | 'namePlural'>,- _flatObjectMetadataMaps: Pick<- AllFlatEntityMaps,- 'flatObjectMetadataMaps'- >['flatObjectMetadataMaps'],- _flatFieldMetadataMaps: Pick<- AllFlatEntityMaps,- 'flatFieldMetadataMaps'- >['flatFieldMetadataMaps'],): OpenAPIV3_1.PathItemObject => {return {patch: {@@ -302,14 +253,6 @@ export const computeRestoreManyResultPath = (export const computeMergeManyResultPath = (item: Pick<FlatObjectMetadata, 'nameSingular' | 'namePlural'>,- _flatObjectMetadataMaps: Pick<- AllFlatEntityMaps,- 'flatObjectMetadataMaps'- >['flatObjectMetadataMaps'],- _flatFieldMetadataMaps: Pick<- AllFlatEntityMaps,- 'flatFieldMetadataMaps'- >['flatFieldMetadataMaps'],): OpenAPIV3_1.PathItemObject => {return {patch: {@@ -329,14 +272,6 @@ export const computeMergeManyResultPath = (export const computeGroupByResultPath = (item: Pick<FlatObjectMetadata, 'nameSingular' | 'namePlural'>,- _flatObjectMetadataMaps: Pick<- AllFlatEntityMaps,- 'flatObjectMetadataMaps'- >['flatObjectMetadataMaps'],- _flatFieldMetadataMaps: Pick<- AllFlatEntityMaps,- 'flatFieldMetadataMaps'- >['flatFieldMetadataMaps'],): OpenAPIV3_1.PathItemObject => {return {get: {