Refactor flat entity maps to be universal oriented (#17665)
# Introduction
In preparation of the workspace agnostic builder, we're migrating
`FlatEntityMaps` to be universal identifier oriented and based
As in the builder context there're won't be any ids at all
Please also note that the FlatEntity is a UniversalFlatEntity superset
From
```ts
import { type SyncableFlatEntity } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-from.type';
export type FlatEntityMaps<T extends SyncableFlatEntity> = {
byId: Partial<Record<string, T>>;
idByUniversalIdentifier: Partial<Record<string, string>>;
universalIdentifiersByApplicationId: Partial<Record<string, string[]>>;
};
```
To
```ts
export type FlatEntityMaps<
T extends SyncableFlatEntity | UniversalSyncableFlatEntity,
> = {
byUniversalIdentifier: Partial<Record<string, T>>;
universalIdentifierById: Partial<Record<string, string>>;
universalIdentifiersByApplicationId: Partial<Record<string, string[]>>; // this might make more sense to be migrated to universalIdentifiersByApplicationUniversalIdentifier but it's the main topic of this PR
};
```
## Low level maps tools
Had to refactor find | create | delete | replace | find-many | get-sub
tools ( through mutations and or throw equivalent )
This commit is contained in:
@@ -80,7 +80,7 @@ export class OpenApiService {
|
||||
);
|
||||
|
||||
const flatObjectMetadataArray = Object.values(
|
||||
flatObjectMetadataMaps.byId,
|
||||
flatObjectMetadataMaps.byUniversalIdentifier,
|
||||
).filter(isDefined);
|
||||
|
||||
flatObjectMetadataArray.sort((a, b) =>
|
||||
|
||||
+36
-14
@@ -17,10 +17,18 @@ describe('computeSchemaComponents', () => {
|
||||
} as any;
|
||||
|
||||
const flatFieldMetadataMaps = {
|
||||
byId: Object.fromEntries(
|
||||
objectMetadataItemMock.fields.map((f) => [f.id, f as any]),
|
||||
byUniversalIdentifier: Object.fromEntries(
|
||||
objectMetadataItemMock.fields.map((f) => [
|
||||
f.universalIdentifier || f.id,
|
||||
f as any,
|
||||
]),
|
||||
),
|
||||
universalIdentifierById: Object.fromEntries(
|
||||
objectMetadataItemMock.fields.map((f) => [
|
||||
f.id,
|
||||
f.universalIdentifier || f.id,
|
||||
]),
|
||||
),
|
||||
idByUniversalIdentifier: {},
|
||||
universalIdentifiersByApplicationId: {},
|
||||
};
|
||||
|
||||
@@ -33,11 +41,17 @@ describe('computeSchemaComponents', () => {
|
||||
} as any;
|
||||
|
||||
const flatObjectMetadataMaps = {
|
||||
byId: {
|
||||
[flatObjectMetadata.id]: flatObjectMetadata,
|
||||
[relationTargetObjectMetadata.id]: relationTargetObjectMetadata,
|
||||
byUniversalIdentifier: {
|
||||
[flatObjectMetadata.universalIdentifier as string]: flatObjectMetadata,
|
||||
[relationTargetObjectMetadata.universalIdentifier as string]:
|
||||
relationTargetObjectMetadata,
|
||||
},
|
||||
universalIdentifierById: {
|
||||
[flatObjectMetadata.id]:
|
||||
flatObjectMetadata.universalIdentifier as string,
|
||||
[relationTargetObjectMetadata.id]:
|
||||
relationTargetObjectMetadata.universalIdentifier as string,
|
||||
},
|
||||
idByUniversalIdentifier: {},
|
||||
universalIdentifiersByApplicationId: {},
|
||||
};
|
||||
|
||||
@@ -814,7 +828,7 @@ describe('computeSchemaComponents', () => {
|
||||
Pick<
|
||||
FieldMetadataEntity<FieldMetadataType.NUMBER>,
|
||||
'id' | 'name' | 'type' | 'isNullable' | 'defaultValue' | 'settings'
|
||||
>
|
||||
> & { universalIdentifier: string }
|
||||
>[] = [
|
||||
{
|
||||
title: 'Integer dataType with decimals',
|
||||
@@ -825,6 +839,7 @@ describe('computeSchemaComponents', () => {
|
||||
isNullable: false,
|
||||
defaultValue: null,
|
||||
settings: { type: 'number', decimals: 1, dataType: NumberDataType.INT },
|
||||
universalIdentifier: 'number1',
|
||||
},
|
||||
},
|
||||
{
|
||||
@@ -836,6 +851,7 @@ describe('computeSchemaComponents', () => {
|
||||
isNullable: false,
|
||||
defaultValue: null,
|
||||
settings: { type: 'number', dataType: NumberDataType.FLOAT },
|
||||
universalIdentifier: 'number2',
|
||||
},
|
||||
},
|
||||
{
|
||||
@@ -847,6 +863,7 @@ describe('computeSchemaComponents', () => {
|
||||
isNullable: false,
|
||||
defaultValue: null,
|
||||
settings: { type: 'number', decimals: 0, dataType: NumberDataType.INT },
|
||||
universalIdentifier: 'number3',
|
||||
},
|
||||
},
|
||||
];
|
||||
@@ -862,18 +879,23 @@ describe('computeSchemaComponents', () => {
|
||||
} as any;
|
||||
|
||||
const flatFieldMetadataMaps = {
|
||||
byId: {
|
||||
[field.id]: field as any,
|
||||
byUniversalIdentifier: {
|
||||
[field.universalIdentifier || field.id]: field as any,
|
||||
},
|
||||
universalIdentifierById: {
|
||||
[field.id]: field.universalIdentifier || field.id,
|
||||
},
|
||||
idByUniversalIdentifier: {},
|
||||
universalIdentifiersByApplicationId: {},
|
||||
};
|
||||
|
||||
const flatObjectMetadataMaps = {
|
||||
byId: {
|
||||
[flatObjectMetadata.id]: flatObjectMetadata,
|
||||
byUniversalIdentifier: {
|
||||
[flatObjectMetadata.universalIdentifier as string]: flatObjectMetadata,
|
||||
},
|
||||
universalIdentifierById: {
|
||||
[flatObjectMetadata.id]:
|
||||
flatObjectMetadata.universalIdentifier as string,
|
||||
},
|
||||
idByUniversalIdentifier: {},
|
||||
universalIdentifiersByApplicationId: {},
|
||||
};
|
||||
|
||||
|
||||
@@ -25,6 +25,7 @@ import {
|
||||
computeViewIdParameters,
|
||||
} from 'src/engine/core-modules/open-api/utils/parameters.utils';
|
||||
import { type AllFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/all-flat-entity-maps.type';
|
||||
import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';
|
||||
import { findManyFlatEntityByIdInFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/find-many-flat-entity-by-id-in-flat-entity-maps-or-throw.util';
|
||||
import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
|
||||
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
|
||||
@@ -105,8 +106,10 @@ const getSchemaComponentsRelationProperties = (
|
||||
let itemProperty = {} as Property;
|
||||
|
||||
if (isFieldMetadataEntityOfType(field, FieldMetadataType.RELATION)) {
|
||||
const targetObjectMetadata =
|
||||
flatObjectMetadataMaps.byId[field.relationTargetObjectMetadataId];
|
||||
const targetObjectMetadata = findFlatEntityByIdInFlatEntityMaps({
|
||||
flatEntityId: field.relationTargetObjectMetadataId,
|
||||
flatEntityMaps: flatObjectMetadataMaps,
|
||||
});
|
||||
|
||||
if (!targetObjectMetadata) {
|
||||
return node;
|
||||
|
||||
Reference in New Issue
Block a user