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

[OBJECT_CACHE_FLUSH_REQUIRED_WHEN_RELEASED] Remove FlatObjectMetadata custom fieldMetadataIds fk aggregator property (#17438)

Browse Source 
# Introduction
Currently refactoring `flatEntity` typing, encountering some tsc errors
due to this fk aggregator custom override
It shall now follow generic pattern leading to be named `fieldIds`

Needs to flush object cache when released
This commit is contained in:
Paul Rastoin
2026-01-26 14:33:07 +01:00
committed by GitHub
parent 4a5ffcc9d2
commit d0bc9a94c0
69 changed files with 93 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-metadata-relations.constant.ts
+1 -1
View File
@@ -113,7 +113,7 @@ export const ALL_METADATA_RELATIONS = {
manyToOne: {
object: {
metadataName: 'objectMetadata',
flatEntityForeignKeyAggregator: 'fieldMetadataIds',
flatEntityForeignKeyAggregator: 'fieldIds',
foreignKey: 'objectMetadataId',
},
workspace: null,
packages/twenty-server/src/engine/metadata-modules/flat-entity/utils/__tests__/add-flat-entity-to-flat-entity-and-related-entity-maps-through-mutation-or-throw.spec.ts
+1 -1
View File
@@ -20,7 +20,7 @@ describe('addFlatEntityToFlatEntityAndRelatedEntityMapsThroughMutationOrThrow',
id: objectMetadataId,
universalIdentifier: 'object-universal-1',
viewIds: [],
fieldMetadataIds: [],
fieldIds: [],
workspaceId,
imageIdentifierFieldMetadataId: '20202020-9d65-415f-b0e1-216a2e257ea4',
labelIdentifierFieldMetadataId: '20202020-1a62-405c-87fa-4d4fd215851b',
packages/twenty-server/src/engine/metadata-modules/flat-entity/utils/__tests__/delete-flat-entity-from-flat-entity-and-related-entity-maps-through-mutation-or-throw.spec.ts
+1 -1
View File
@@ -21,7 +21,7 @@ describe('deleteFlatEntityFromFlatEntityAndRelatedEntityMapsThroughMutationOrThr
id: objectMetadataId,
universalIdentifier: 'object-universal-1',
viewIds: [viewId, 'something-else'],
fieldMetadataIds: [],
fieldIds: [],
workspaceId,
imageIdentifierFieldMetadataId: '20202020-9d65-415f-b0e1-216a2e257ea4',
labelIdentifierFieldMetadataId: '20202020-1a62-405c-87fa-4d4fd215851b',
packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/find-all-others-morph-relation-flat-field-metadatas-or-throw.util.ts
+1 -1
View File
@@ -33,7 +33,7 @@ export const findAllOthersMorphRelationFlatFieldMetadatasOrThrow = ({
const objectFlatFieldMetadatas =
findManyFlatEntityByIdInFlatEntityMapsOrThrow({
flatEntityMaps: flatFieldMetadataMaps,
flatEntityIds: flatObjectMetadata.fieldMetadataIds,
flatEntityIds: flatObjectMetadata.fieldIds,
});
return objectFlatFieldMetadatas.filter(
packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/from-delete-field-input-to-flat-field-metadatas-to-delete.util.ts
+1 -1
View File
@@ -143,7 +143,7 @@ export const fromDeleteFieldInputToFlatFieldMetadatasToDelete = ({
const objectFlatFieldMetadatas =
findManyFlatEntityByIdInFlatEntityMapsOrThrow({
flatEntityMaps: existingFlatFieldMetadataMaps,
flatEntityIds: flatObjectMetadata.fieldMetadataIds,
flatEntityIds: flatObjectMetadata.fieldIds,
});
const newIndex = generateFlatIndexMetadataWithNameOrThrow({
packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/get-object-field-names-and-join-column-names.util.ts
+1 -1
View File
@@ -23,7 +23,7 @@ export const getObjectFieldNamesAndJoinColumnNames = ({
const objectFlatFieldMetadatas =
findManyFlatEntityByIdInFlatEntityMapsOrThrow({
flatEntityMaps: flatFieldMetadataMaps,
flatEntityIds: flatObjectMetadata.fieldMetadataIds,
flatEntityIds: flatObjectMetadata.fieldIds,
});
const initialAccumulator: ObjectFieldNamesAndJoinColumnNames = {
joinColumnNames: [],
packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/handle-label-identifier-changes-during-field-update.util.ts
+1 -1
View File
@@ -36,7 +36,7 @@ export const handleLabelIdentifierChangesDuringFieldUpdate = ({
const objectFlatFieldMetadatas =
findManyFlatEntityByIdInFlatEntityMapsOrThrow({
flatEntityMaps: flatFieldMetadataMaps,
flatEntityIds: flatObjectMetadata.fieldMetadataIds,
flatEntityIds: flatObjectMetadata.fieldIds,
});
const searchVectorField = findOrThrow(
packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/recompute-index-on-flat-field-metadata-name-update.util.ts
+1 -1
View File
@@ -26,7 +26,7 @@ export const recomputeIndexOnFlatFieldMetadataNameUpdate = ({
const objectFlatFieldMetadatas =
findManyFlatEntityByIdInFlatEntityMapsOrThrow({
flatEntityMaps: flatFieldMetadataMaps,
flatEntityIds: flatObjectMetadata.fieldMetadataIds,
flatEntityIds: flatObjectMetadata.fieldIds,
});
const optimisticObjectFlatFieldMetadatas = objectFlatFieldMetadatas.map(
(flatFieldMetadata) => {
packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/validators/utils/validate-flat-field-metadata-name-availability.util.ts
+1 -1
View File
@@ -51,7 +51,7 @@ export const validateFlatFieldMetadataNameAvailability = ({
const objectFlatFieldMetadatas =
findManyFlatEntityByIdInFlatEntityMapsOrThrow({
flatEntityMaps: flatFieldMetadataMaps,
flatEntityIds: flatObjectMetadata.fieldMetadataIds,
flatEntityIds: flatObjectMetadata.fieldIds,
});
const reservedCompositeFieldsNames = getReservedCompositeFieldNames(
objectFlatFieldMetadatas,
packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/__mocks__/get-flat-object-metadata.mock.ts
+1 -1
View File
@@ -14,7 +14,7 @@ export const getFlatObjectMetadataMock = (
return {
viewIds: [],
indexMetadataIds: [],
fieldMetadataIds: [],
fieldIds: [],
description: 'default flat object metadata description',
icon: 'icon',
id: faker.string.uuid(),
packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type.ts
+2 -4
View File
@@ -2,7 +2,5 @@ import { type FlatEntityFrom } from 'src/engine/metadata-modules/flat-entity/typ
import { type ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
export type FlatObjectMetadata = FlatEntityFrom<
Omit<ObjectMetadataEntity, 'targetRelationFields' | 'dataSourceId' | 'fields'>
> & {
fieldMetadataIds: string[];
};
Omit<ObjectMetadataEntity, 'targetRelationFields' | 'dataSourceId'>
>;
packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/utils/from-create-object-input-to-flat-object-metadata-and-flat-field-metadatas-to-create.util.ts
+1 -1
View File
@@ -69,7 +69,7 @@ export const fromCreateObjectInputToFlatObjectMetadataAndFlatFieldMetadatasToCre
nameField?.id ?? defaultFlatFieldForCustomObjectMaps.fields.idField.id;
const flatObjectMetadataToCreate: FlatObjectMetadata = {
fieldMetadataIds: [],
fieldIds: [],
viewIds: [],
indexMetadataIds: [],
createdAt,
packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/utils/from-delete-object-input-to-flat-field-metadatas-to-delete.util.ts
+1 -1
View File
@@ -55,7 +55,7 @@ export const fromDeleteObjectInputToFlatFieldMetadatasToDelete = ({
const objectFlatFieldMetadatas =
findManyFlatEntityByIdInFlatEntityMapsOrThrow({
flatEntityMaps: flatFieldMetadataMaps,
flatEntityIds: flatObjectMetadataToDelete.fieldMetadataIds,
flatEntityIds: flatObjectMetadataToDelete.fieldIds,
});
const flatFieldMetadatasToDelete = objectFlatFieldMetadatas.flatMap(
(flatFieldMetadata) => {
packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/utils/from-object-metadata-entity-to-flat-object-metadata.util.ts
+1 -3
View File
@@ -22,8 +22,6 @@ export const fromObjectMetadataEntityToFlatObjectMetadata = (
indexMetadataIds: objectMetadataEntity.indexMetadatas.map(
(indexEntity) => indexEntity.id,
),
fieldMetadataIds: objectMetadataEntity.fields.map(
(fieldEntity) => fieldEntity.id,
),
fieldIds: objectMetadataEntity.fields.map((fieldEntity) => fieldEntity.id),
};
};
packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/utils/recompute-index-after-flat-object-metadata-singular-name-update.util.ts
+1 -1
View File
@@ -32,7 +32,7 @@ export const recomputeIndexAfterFlatObjectMetadataSingularNameUpdate = ({
const objectFlatFieldMetadatas =
findManyFlatEntityByIdInFlatEntityMapsOrThrow({
flatEntityMaps: flatFieldMetadataMaps,
flatEntityIds: optimisticFlatObjectMetadata.fieldMetadataIds,
flatEntityIds: optimisticFlatObjectMetadata.fieldIds,
});
return allRelatedFlatIndexMetadata.map<FlatIndexMetadata>((flatIndex) => {
packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/utils/recompute-search-vector-field-after-label-identifier-update.util.ts
+1 -1
View File
@@ -29,7 +29,7 @@ export const recomputeSearchVectorFieldAfterLabelIdentifierUpdate = ({
const objectFlatFieldMetadatas =
findManyFlatEntityByIdInFlatEntityMapsOrThrow({
flatEntityMaps: flatFieldMetadataMaps,
flatEntityIds: existingFlatObjectMetadata.fieldMetadataIds,
flatEntityIds: existingFlatObjectMetadata.fieldIds,
});
const searchVectorField = findOrThrow(
packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/utils/rename-related-morph-field-on-object-names-update.util.ts
+1 -1
View File
@@ -85,7 +85,7 @@ export const renameRelatedMorphFieldOnObjectNamesUpdate = ({
const objectFlatFieldMetadatas =
findManyFlatEntityByIdInFlatEntityMapsOrThrow({
flatEntityMaps: flatFieldMetadataMaps,
flatEntityIds: fromFlatObjectMetadata.fieldMetadataIds,
flatEntityIds: fromFlatObjectMetadata.fieldIds,
});
const allMorphRelationFlatFieldMetadatas =
packages/twenty-server/src/engine/metadata-modules/object-permission/__tests__/object-permission.service.spec.ts
+2 -2
View File
@@ -115,7 +115,7 @@ describe('ObjectPermissionService', () => {
id: systemObjectMetadataId,
isSystem: true,
workspaceId,
fieldMetadataIds: [],
fieldIds: [],
indexMetadataIds: [],
viewIds: [],
universalIdentifier: systemObjectMetadataId,
@@ -172,7 +172,7 @@ describe('ObjectPermissionService', () => {
id: customObjectMetadataId,
isSystem: false,
workspaceId,
fieldMetadataIds: [],
fieldIds: [],
indexMetadataIds: [],
viewIds: [],
universalIdentifier: customObjectMetadataId,
packages/twenty-server/src/engine/metadata-modules/object-permission/field-permission/__tests__/field-permissions.service.spec.ts
+4 -4
View File
@@ -154,7 +154,7 @@ describe('FieldPermissionService', () => {
[testObjectMetadataId]: {
...objectMetadataItemMock,
id: testObjectMetadataId,
fieldMetadataIds: [testFieldMetadataId],
fieldIds: [testFieldMetadataId],
indexMetadataIds: [],
viewIds: [],
universalIdentifier: testObjectMetadataId,
@@ -163,7 +163,7 @@ describe('FieldPermissionService', () => {
[fieldRelationMock.objectMetadataId]: {
...objectMetadataItemMock,
id: fieldRelationMock.objectMetadataId,
fieldMetadataIds: [fieldRelationMock.id],
fieldIds: [fieldRelationMock.id],
indexMetadataIds: [],
viewIds: [],
universalIdentifier: fieldRelationMock.objectMetadataId,
@@ -444,7 +444,7 @@ describe('FieldPermissionService', () => {
[testObjectMetadataId]: {
...systemObjectMetadata,
id: testObjectMetadataId,
fieldMetadataIds: [],
fieldIds: [],
indexMetadataIds: [],
viewIds: [],
universalIdentifier: testObjectMetadataId,
@@ -490,7 +490,7 @@ describe('FieldPermissionService', () => {
[testObjectMetadataId]: {
...objectMetadataItemMock,
id: testObjectMetadataId,
fieldMetadataIds: [],
fieldIds: [],
indexMetadataIds: [],
viewIds: [],
universalIdentifier: testObjectMetadataId,