@@ -117,12 +117,12 @@ function createWrappedFilter(baseFunction, filterName, filterParams) {
117117 return baseFunction ;
118118}
119119
120- export function getServiceFilters ( serviceFilters , filterNames ) {
121- if ( ! filterNames ) {
120+ export function getServiceFilters ( serviceFilters , declaredFilters ) {
121+ if ( ! declaredFilters ) {
122122 return ;
123123 }
124124
125- const filters = filterNames . reduce ( ( filters , filterItem ) => {
125+ const filters = declaredFilters . reduce ( ( filters , filterItem ) => {
126126 const { filterName, filterParams } = parseFilterItem ( filterItem ) ;
127127
128128 if ( ! filterName ) {
@@ -165,8 +165,8 @@ async function addHistoryToService(service) {
165165}
166166
167167async function addTermsHistory ( service , serviceId , termsType , declarationEntries , filters ) {
168- const filterNames = [ ...new Set ( declarationEntries . flatMap ( d => d . filter ) ) ] . filter ( Boolean ) ;
169- const historyDates = extractHistoryDates ( { termsTypeDeclarationEntries : declarationEntries , filters, filterNames } ) ;
168+ const declaredFilters = [ ...new Set ( declarationEntries . flatMap ( declarationEntrie => declarationEntrie . filter ) ) ] . filter ( Boolean ) ;
169+ const historyDates = extractHistoryDates ( { termsTypeDeclarationEntries : declarationEntries , filters, declaredFilters } ) ;
170170 const latestValidTerms = declarationEntries . find ( entry => ! entry . validUntil ) ;
171171
172172 await Promise . all ( historyDates . map ( date => createTermsForDate ( service , serviceId , termsType , date , declarationEntries , filters , latestValidTerms ) ) ) ;
@@ -186,8 +186,8 @@ async function createTermsForDate(service, serviceId, termsType, date, declarati
186186 } ) ) ;
187187}
188188
189- function resolveFiltersForDate ( date , filterNames , filters ) {
190- return filterNames ?. map ( filterItem => {
189+ function resolveFiltersForDate ( date , declaredFilters , filters ) {
190+ return declaredFilters ?. map ( filterItem => {
191191 const { filterName, filterParams } = parseFilterItem ( filterItem ) ;
192192
193193 if ( ! filterName ) {
@@ -229,9 +229,9 @@ async function createHistorySourceDocuments(serviceId, termsDeclaration, actualF
229229 } ) ) ;
230230}
231231
232- function extractHistoryDates ( { filters, filterNames , termsTypeDeclarationEntries } ) {
232+ function extractHistoryDates ( { filters, declaredFilters , termsTypeDeclarationEntries } ) {
233233 const filterDates = Object . entries ( filters )
234- . filter ( ( [ filterName ] ) => filterNames . some ( filterItem => {
234+ . filter ( ( [ filterName ] ) => declaredFilters . some ( filterItem => {
235235 const { filterName : itemName } = parseFilterItem ( filterItem ) ;
236236
237237 return itemName === filterName ;
0 commit comments