From 5bbe4bdef4ddcd3eecfb31d063ae50eed491f36f Mon Sep 17 00:00:00 2001 From: Antoine Jeanneney Date: Fri, 6 Sep 2024 09:39:35 +0200 Subject: [PATCH] improve renewCache subfunction --- .../service/fetchAvailableStatisticFilters.ts | 5 ++++- .../fetchExtremumDates/fetchExtremumDates.spec.ts | 11 ++++++----- .../service/fetchExtremumDates/fetchExtremumDates.ts | 5 ++--- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/packages/generic/backend/src/modules/statistic/service/fetchAvailableStatisticFilters.ts b/packages/generic/backend/src/modules/statistic/service/fetchAvailableStatisticFilters.ts index b99f368f7..e3af26876 100644 --- a/packages/generic/backend/src/modules/statistic/service/fetchAvailableStatisticFilters.ts +++ b/packages/generic/backend/src/modules/statistic/service/fetchAvailableStatisticFilters.ts @@ -17,7 +17,10 @@ async function fetchAvailableStatisticFilters() { 'jurisdiction', ]); - const { minDate, maxDate } = await fetchExtremumDates(); + const availableDocumentSources = await documentService.fetchAllSources(); + const { minDate, maxDate } = await fetchExtremumDates( + availableDocumentSources, + ); return { minDate, diff --git a/packages/generic/backend/src/modules/statistic/service/fetchExtremumDates/fetchExtremumDates.spec.ts b/packages/generic/backend/src/modules/statistic/service/fetchExtremumDates/fetchExtremumDates.spec.ts index aed5bee3b..71dfc060d 100644 --- a/packages/generic/backend/src/modules/statistic/service/fetchExtremumDates/fetchExtremumDates.spec.ts +++ b/packages/generic/backend/src/modules/statistic/service/fetchExtremumDates/fetchExtremumDates.spec.ts @@ -4,6 +4,7 @@ import { buildStatisticRepository } from '../../repository'; import { fetchExtremumDates } from './fetchExtremumDates'; describe('fetchExtremumDates', () => { + const sources = ['jurinet', 'jurica']; it('should fetch the statistic extremum dates if they are wider than treatments', async () => { const statisticRepository = buildStatisticRepository(); const statistics = [ @@ -30,7 +31,7 @@ describe('fetchExtremumDates', () => { ].map(treatmentModule.generator.generate); await treatmentRepository.insertMany(treatments); - const extremumDates = await fetchExtremumDates(); + const extremumDates = await fetchExtremumDates(sources); expect(extremumDates).toEqual({ minDate: 10, maxDate: 50 }); }); @@ -61,7 +62,7 @@ describe('fetchExtremumDates', () => { ].map(treatmentModule.generator.generate); await treatmentRepository.insertMany(treatments); - const extremumDates = await fetchExtremumDates(); + const extremumDates = await fetchExtremumDates(sources); expect(extremumDates).toEqual({ minDate: 10, maxDate: 50 }); }); @@ -80,7 +81,7 @@ describe('fetchExtremumDates', () => { ].map(treatmentModule.generator.generate); await treatmentRepository.insertMany(treatments); - const extremumDates = await fetchExtremumDates(); + const extremumDates = await fetchExtremumDates(sources); expect(extremumDates).toEqual({ minDate: 10, maxDate: 50 }); }); @@ -99,7 +100,7 @@ describe('fetchExtremumDates', () => { ].map(statisticModule.generator.generate); await statisticRepository.insertMany(statistics); - const extremumDates = await fetchExtremumDates(); + const extremumDates = await fetchExtremumDates(sources); expect(extremumDates).toEqual({ minDate: 10, maxDate: 50 }); }); @@ -130,7 +131,7 @@ describe('fetchExtremumDates', () => { ].map(treatmentModule.generator.generate); await treatmentRepository.insertMany(treatments); - const extremumDates = await fetchExtremumDates(); + const extremumDates = await fetchExtremumDates(sources); expect(extremumDates).toEqual({ minDate: 10, maxDate: 50 }); }); diff --git a/packages/generic/backend/src/modules/statistic/service/fetchExtremumDates/fetchExtremumDates.ts b/packages/generic/backend/src/modules/statistic/service/fetchExtremumDates/fetchExtremumDates.ts index 545543414..89310ad24 100644 --- a/packages/generic/backend/src/modules/statistic/service/fetchExtremumDates/fetchExtremumDates.ts +++ b/packages/generic/backend/src/modules/statistic/service/fetchExtremumDates/fetchExtremumDates.ts @@ -3,13 +3,12 @@ import { buildStatisticRepository } from '../../repository'; export { fetchExtremumDates }; -async function fetchExtremumDates() { +async function fetchExtremumDates(sources: string[]) { const statisticRepository = buildStatisticRepository(); const treatmentRepository = buildTreatmentRepository(); - // find all available sources or use dbsder-api-types const extremumDatesInStatistics = await statisticRepository.findExtremumTreatmentDateBySources( - ['jurinet', 'jurica', 'juritj', 'juritcom'], + sources, ); const extremumDatesInTreatments = await treatmentRepository.findExtremumLastUpdateDateBySources(