From a989a10570a6688fc051712a1c7a8eade250e624 Mon Sep 17 00:00:00 2001 From: Antoine Jeanneney <29945628+ajeanneney@users.noreply.github.com> Date: Wed, 2 Oct 2024 15:51:12 +0200 Subject: [PATCH] Fix/motivation entity (#131) * customize entityId for motivations * clean --------- Co-authored-by: Antoine Jeanneney --- .../generic/backend/src/lib/annotator/buildAnnotator.ts | 8 +++----- .../core/src/modules/annotation/lib/entityIdHandler.ts | 4 ++++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/packages/generic/backend/src/lib/annotator/buildAnnotator.ts b/packages/generic/backend/src/lib/annotator/buildAnnotator.ts index 02e830acf..77ab37546 100644 --- a/packages/generic/backend/src/lib/annotator/buildAnnotator.ts +++ b/packages/generic/backend/src/lib/annotator/buildAnnotator.ts @@ -8,6 +8,7 @@ import { settingsType, treatmentModule, annotationModule, + settingsModule, } from '@label/core'; import { buildAnnotationReportRepository } from '../../modules/annotationReport'; import { documentService } from '../../modules/document'; @@ -253,7 +254,6 @@ function buildAnnotator( documentId, document.zoning.zones.motivations, document.text, - document.documentNumber, annotations, ); } else { @@ -424,11 +424,10 @@ function buildAnnotator( documentId: documentType['_id'], motivations: { start: number; end: number }[], documentText: string, - documentNumber: number, previousAnnotations: annotationType[], ) { const motivationAnnotations: annotationType[] = []; - motivations.forEach((motivation, index) => { + motivations.forEach((motivation) => { const motivationText = documentText.substring( motivation.start, motivation.end, @@ -450,9 +449,8 @@ function buildAnnotator( annotationModule.lib.buildAnnotation({ start: motivation.start + removedCharactersAtStart, text: trimmedMotivation, - category: 'motivations', + category: settingsModule.lib.motivationCategoryHandler.getCategoryName(), certaintyScore: 1, - entityId: `motivations${index}_${documentNumber}`, }), ); }); diff --git a/packages/generic/core/src/modules/annotation/lib/entityIdHandler.ts b/packages/generic/core/src/modules/annotation/lib/entityIdHandler.ts index 8b64dc64b..c1ff8721d 100644 --- a/packages/generic/core/src/modules/annotation/lib/entityIdHandler.ts +++ b/packages/generic/core/src/modules/annotation/lib/entityIdHandler.ts @@ -1,5 +1,6 @@ import { annotationType } from '../annotationType'; import { normalizeString } from '../../../lib/stringComparator/normalizeString'; +import { motivationCategoryHandler } from '../../../modules/settings/lib'; export { entityIdHandler }; @@ -10,6 +11,9 @@ const entityIdHandler = { }; function compute(category: string, text: string) { + if (category === motivationCategoryHandler.getCategoryName()) { + return `${category}_${text.length}`; + } return `${category}_${normalizeString(text.toLocaleLowerCase())}`; }