[core] Fix date range format in record identity

leav-solutions · Feb 21, 2024 · 839d768 · 839d768
1 parent 5ac5cec
commit 839d768
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/apps/core/src/domain/record/recordDomain.spec.ts b/apps/core/src/domain/record/recordDomain.spec.ts
@@ -8,6 +8,7 @@ import {IEventsManagerDomain} from 'domain/eventsManager/eventsManagerDomain';
 import {IValidateHelper} from 'domain/helpers/validate';
 import {ILibraryPermissionDomain} from 'domain/permission/libraryPermissionDomain';
 import {IValueDomain} from 'domain/value/valueDomain';
+import {i18n} from 'i18next';
 import {ICachesService} from 'infra/cache/cacheService';
 import {ILibraryRepo} from 'infra/library/libraryRepo';
 import {IRecordRepo} from 'infra/record/recordRepo';
@@ -33,12 +34,11 @@ import {
 import {mockLibrary, mockLibraryFiles} from '../../__tests__/mocks/library';
 import {mockRecord} from '../../__tests__/mocks/record';
 import {mockCtx} from '../../__tests__/mocks/shared';
+import {mockTranslatorWithOptions} from '../../__tests__/mocks/translator';
 import {mockTree} from '../../__tests__/mocks/tree';
 import {mockStandardValue} from '../../__tests__/mocks/value';
 import {IRecordPermissionDomain} from '../permission/recordPermissionDomain';
 import recordDomain from './recordDomain';
-import {mockTranslatorWithOptions} from '../../__tests__/mocks/translator';
-import {i18n} from 'i18next';
 
 const eventsManagerMockConfig: Mockify<Config.IEventsManager> = {
     routingKeys: {data_events: 'test.data.events', pubsub_events: 'test.pubsub.events'}
@@ -1144,8 +1144,8 @@ describe('RecordDomain', () => {
                     const res = await recDomain.getRecordIdentity(recordWithDateRange, ctx);
 
                     expect(mockTranslatorWithOptions.t).toBeCalledWith('labels.date_range', {
-                        from: '16/02/2024',
-                        to: '18/02/2024',
+                        from: '2024-02-16T10:59:52+00:00',
+                        to: '2024-02-18T10:59:52+00:00',
                         lng: 'fr',
                         interpolation: {escapeValue: false}
                     });

diff --git a/apps/core/src/domain/record/recordDomain.ts b/apps/core/src/domain/record/recordDomain.ts
@@ -7,6 +7,7 @@ import {GetCoreEntityByIdFunc} from 'domain/helpers/getCoreEntityById';
 import {IValidateHelper} from 'domain/helpers/validate';
 import {ILibraryPermissionDomain} from 'domain/permission/libraryPermissionDomain';
 import {IValueDomain} from 'domain/value/valueDomain';
+import type {i18n} from 'i18next';
 import {IAttributeWithRevLink} from 'infra/attributeTypes/attributeTypesRepo';
 import {ICachesService} from 'infra/cache/cacheService';
 import {ILibraryRepo} from 'infra/library/libraryRepo';
@@ -45,7 +46,6 @@ import {IRecordPermissionDomain} from '../permission/recordPermissionDomain';
 import getAttributesFromField from './helpers/getAttributesFromField';
 import {SendRecordUpdateEventHelper} from './helpers/sendRecordUpdateEvent';
 import {ICreateRecordResult, IFindRecordParams} from './_types';
-import type {i18n} from 'i18next';
 
 /**
  * Simple list of filters (fieldName: filterValue) to apply to get records.
@@ -707,11 +707,9 @@ export default function ({
     };
 
     const _convertDateRangeToString = (dateRange: {from: string; to: string}, {lang}: IQueryInfos): string => {
-        const from = new Date(dateRange.from).toLocaleDateString(lang);
-        const to = new Date(dateRange.to).toLocaleDateString(lang);
         return translator.t('labels.date_range', {
-            from,
-            to,
+            from: dateRange.from,
+            to: dateRange.to,
             lng: lang,
             interpolation: {escapeValue: false}
         });