Skip to content

refactor(facets): pass the facet request as one array #1376

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rubenvdlinde merged 2 commits into from
Nov 2, 2026
Merged

refactor(facets): pass the facet request as one array #1376

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0057a1b
refactor(facets): pass the facet request as one array
rubenvdlinde Nov 2, 2026
3e7eee6
Merge remote-tracking branch 'origin/development' into refactor/sig-f…
rubenvdlinde Nov 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 15 additions & 19 deletions lib/Service/FacetService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,10 +197,12 @@ public function getFacets(string $schema, array $filters = [], ?string $search =

$result = $this->computeFacetsForRequest(
objectService: $objectService,
schema: $schema,
normalizedFilters: $normalizedFilters,
normalizedSearch: $normalizedSearch,
organization: $organization
request: [
'schema' => $schema,
'filters' => $normalizedFilters,
'search' => $normalizedSearch,
'organization' => $organization,
]
);

$this->facetsCache->set(key: $cacheKey, value: $result, ttl: self::CACHE_TTL);
Expand Down Expand Up @@ -237,29 +239,23 @@ private function assertSupportedSchema(string $schema): void {
* (including `_meta.matchedObjectIds` for the frontend's list narrowing).
*
* @param ObjectServiceInterface $objectService OpenRegister object service.
* @param string $schema `module` or `dienst`.
* @param array<string,string[]> $normalizedFilters Normalized selected filters.
* @param string|null $normalizedSearch Normalized free-text query.
* @param string|null $organization Optional organisation override.
* @param array $request The request: `schema` (`module` or `dienst`), `filters` (the normalized
* selected filters), `search` (the normalized free-text query or null) and
* `organization` (the optional organisation override).
*
* @return array{referenceComponent: array, standard: array, applicationService: array,
* domain: array, _meta: array{totalMatched: int, processingTimeMs: float, cached: bool,
* matchedObjectIds: string[]}}
*/
private function computeFacetsForRequest(
ObjectServiceInterface $objectService,
string $schema,
array $normalizedFilters,
?string $normalizedSearch,
?string $organization,
): array {
private function computeFacetsForRequest(ObjectServiceInterface $objectService, array $request): array {
$startTime = microtime(true);
$schema = $request['schema'];

$baseObjects = $this->fetchBaseObjects(
objectService: $objectService,
schema: $schema,
search: $normalizedSearch,
organization: $organization
search: $request['search'],
organization: $request['organization']
);

$modulesByObjectId = $this->resolveModulesPerObject(
Expand All @@ -272,12 +268,12 @@ private function computeFacetsForRequest(

$facets = $this->computeFacets(
dimValsByObjId: $dimValsByObjId,
selectedFilters: $normalizedFilters
selectedFilters: $request['filters']
);

$matchedObjectIds = $this->filterObjectIds(
dimValsByObjId: $dimValsByObjId,
selectedFilters: $normalizedFilters,
selectedFilters: $request['filters'],
excludeDimension: null
);

Expand Down
Loading