improve performance of denormalize thesaurus entities use case

Author: Joao-vi

app/api/core/application/DenormalizeThesaurusEntities.ts

@@ -4,6 +4,7 @@ import { AbstractUseCase } from '../libs/UseCase';
 import { PropertyAssignmentCreatorServiceStrategy } from './propertyAssignmentCreatorService/PropertyAssignmentCreatorServiceStrategy';
 
 type Input = {
+  thesaurusId: string;
   sharedIds: string[];
 };
 
@@ -26,14 +27,14 @@ class DenormalizeThesaurusEntitiesUseCase extends AbstractUseCase<Input, Output,
 
     const [withRelationships, withoutRelationships] = ArrayUtils.splitInTwo(
       entities,
-      entity => entity.getPropertyAssignmentsByType(['relationship']).length > 0
+      entity => entity.getRelationshipAssignmentsInheritingFromSelect().length > 0
     );
 
     await this.transactionManager.run(async () => {
       await ArrayUtils.sequentialFor(withoutRelationships, async entity => {
         const propertyAssignments =
           await this.deps.propertyAssignmentCreatorServiceStrategy.bulkCreate(
-            entity.getPropertyAssignmentsByType(['select', 'multiselect', 'relationship']),
+            entity.getSelectAssignmentsByThesaurusId(input.thesaurusId),
             entity.template
           );
 
@@ -45,10 +46,12 @@ class DenormalizeThesaurusEntitiesUseCase extends AbstractUseCase<Input, Output,
       await ArrayUtils.sequentialFor(withRelationships, async entity => {
         const propertyAssignments =
           await this.deps.propertyAssignmentCreatorServiceStrategy.bulkCreate(
-            entity.getPropertyAssignmentsByType(['select', 'multiselect', 'relationship']),
+            [
+              ...entity.getRelationshipAssignmentsInheritingFromSelect(),
+              ...entity.getSelectAssignmentsByThesaurusId(input.thesaurusId),
+            ],
             entity.template
           );
-
         entity.setPropertyAssignmentsInAllLanguages(propertyAssignments);
       });
 

app/api/core/application/specs/DenormalizeThesaurusEntities.spec.ts

@@ -26,6 +26,7 @@ describe('DenormalizeThesaurusEntities', () => {
     const { sut } = createSut();
 
     await sut.execute({
+      thesaurusId: factory.id('countries').toString(),
       sharedIds: ['entity_1', 'entity_2', 'entity_3', 'entity_4', 'entity_5'],
     });
 
@@ -104,16 +105,16 @@ describe('DenormalizeThesaurusEntities', () => {
         language: 'en',
         sharedId: 'entity_4',
         metadata: {
-          select: [{ value: factory.id('thesaurus_2_usa').toString(), label: 'USA' }],
-          multiselect: [{ value: factory.id('thesaurus_2_usa').toString(), label: 'USA' }],
+          select: [{ value: factory.id('thesaurus_2_usa').toString(), label: 'USA V1' }],
+          multiselect: [{ value: factory.id('thesaurus_2_usa').toString(), label: 'USA V1' }],
         },
       },
       {
         language: 'es',
         sharedId: 'entity_4',
         metadata: {
-          select: [{ value: factory.id('thesaurus_2_usa').toString(), label: 'USA' }],
-          multiselect: [{ value: factory.id('thesaurus_2_usa').toString(), label: 'USA' }],
+          select: [{ value: factory.id('thesaurus_2_usa').toString(), label: 'USA ES V1' }],
+          multiselect: [{ value: factory.id('thesaurus_2_usa').toString(), label: 'USA ES V1' }],
         },
       },
       {
@@ -133,7 +134,9 @@ describe('DenormalizeThesaurusEntities', () => {
             {
               value: 'entity_4',
               label: 'entity_4',
-              inheritedValue: [{ value: factory.id('thesaurus_2_usa').toString(), label: 'USA' }],
+              inheritedValue: [
+                { value: factory.id('thesaurus_2_usa').toString(), label: 'USA V1' },
+              ],
             },
           ],
         },
@@ -155,7 +158,9 @@ describe('DenormalizeThesaurusEntities', () => {
             {
               value: 'entity_4',
               label: 'entity_4',
-              inheritedValue: [{ value: factory.id('thesaurus_2_usa').toString(), label: 'USA' }],
+              inheritedValue: [
+                { value: factory.id('thesaurus_2_usa').toString(), label: 'USA ES V1' },
+              ],
             },
           ],
         },

app/api/core/application/specs/DenormalizeThesaurusEntitiesFixtures.ts

@@ -31,6 +31,10 @@ export const fixtures: DBFixture = {
     factory.template('template_2', [
       factory.inherit('relationship_1', 'template_1', 'select', {
         relationType: factory.id('rel1').toHexString(),
+        inherit: {
+          type: 'select',
+          property: factory.id('select').toString(),
+        },
       }),
       factory.property('select', 'select', {
         content: factory.id('countries').toHexString(),
@@ -49,6 +53,10 @@ export const fixtures: DBFixture = {
     factory.template('template_4', [
       factory.inherit('relationship_to_t1', 'template_1', 'multiselect', {
         relationType: factory.id('rel2').toHexString(),
+        inherit: {
+          type: 'multiselect',
+          property: factory.id('multiselect').toString(),
+        },
       }),
       factory.inherit('relationship_to_t3', 'template_3', 'select', {
         relationType: factory.id('rel3').toHexString(),

app/api/core/domain/entity/Entity.ts

@@ -8,6 +8,7 @@ import {
   PropertyAssignment,
   PropertyValue,
   RelationshipEntry,
+  SelectionEntry,
   TextPropertyValue,
 } from 'api/core/domain/template/PropertyValue';
 import {
@@ -18,7 +19,7 @@ import { AccessGrant, EntityPermission } from './EntityPermission';
 import { PermissionType } from './PermissionType';
 import { AccessLevel } from './AccessLevel';
 import { EntityTranslationDoesNotExistError } from './errors';
-import { PropertyType } from '../template/PropertyType';
+import { AbstractSelectProperty } from '../template/select/AbstractSelectProperty';
 
 type CreateInput = {
   languages: LanguageISO6391[];
@@ -130,29 +131,35 @@ class Entity {
     return this.translationsList.map(([_language, translation]) => translation.metadata[name]);
   }
 
-  /**
-   * Retrieves property assignments filtered by property type(s) for a specific language.
-   *
-   * @param type - Array of property types to filter by (e.g., ['text', 'numeric', 'relationship'])
-   * @param targetLanguage - Optional language code (ISO 639-1). If not provided, defaults to the first available language
-   * @returns Array of property assignments matching the specified type(s) in the target language
-   *
-   * @example
-   * ```typescript
-   * // Get all text and numeric properties in English
-   * const textProps = entity.getPropertyAssignmentsByType(['text', 'numeric'], 'en');
-   *
-   * // Get relationship properties in default language
-   * const relationships = entity.getPropertyAssignmentsByType(['relationship']);
-   * ```
-   */
-  getPropertyAssignmentsByType(
-    type: PropertyType[],
+  getRelationshipAssignmentsInheritingFromSelect(
+    targetLanguage?: LanguageISO6391
+  ): PropertyAssignment<SelectionEntry>[] {
+    const language = targetLanguage || this.languages[0];
+
+    const selectProperties = this.template.properties.filter(
+      p =>
+        p instanceof V1RelationshipProperty &&
+        ['select', 'multiselect'].includes(p.inherit?.type || '')
+    );
+
+    return selectProperties.map(property =>
+      this.getTranslation(language).getValue<SelectionEntry>(property.name)
+    );
+  }
+
+  getSelectAssignmentsByThesaurusId(
+    thesaurusId: string,
     targetLanguage?: LanguageISO6391
-  ): PropertyAssignment[] {
+  ): PropertyAssignment<SelectionEntry>[] {
     const language = targetLanguage || this.languages[0];
 
-    return this.getTranslation(language).getByType(type);
+    const selectProperties = this.template.properties.filter(
+      p => p instanceof AbstractSelectProperty && p.content === thesaurusId
+    );
+
+    return selectProperties.map(property =>
+      this.getTranslation(language).getValue<SelectionEntry>(property.name)
+    );
   }
 
   addGrantForCreator(creatorId: string) {

app/api/core/infrastructure/jobs/DenormalizeThesaurusEntitiesChunkHandler.ts

@@ -6,6 +6,7 @@ import {
 import { DenormalizeThesaurusEntitiesUseCaseFactory } from '../factories/DenormalizeThesaurusEntitiesUseCaseFactory';
 
 type Params = {
+  thesaurusId: string;
   sharedIds: string[];
 } & UserAwareDispatchableParams;
 
@@ -21,7 +22,10 @@ class DenormalizeThesaurusEntitiesChunkHandler extends UserAwareDispatchable<Par
   protected async handle(_heartbeat: HeartbeatCallback, _jobInfo: JobInfo) {
     const useCase = this.deps.DenormalizeThesaurusEntitiesUseCaseFactory.default();
 
-    await useCase.execute({ sharedIds: this.params.sharedIds });
+    await useCase.execute({
+      sharedIds: this.params.sharedIds,
+      thesaurusId: this.params.thesaurusId,
+    });
   }
 }