Refactoring

Author: zix2

src/Processors/FacetConstraintProcessor.php

@@ -10,8 +10,7 @@ class FacetConstraintProcessor extends ConstraintProcessor
 {
     public function visitRoot(Specification $specification): void
     {
-        $filters = $specification->facets()
-            ->filter(fn (AllowedFacet $facet) => $facet->isActive())
+        $filters = $specification->activeFacets()
             ->flatMap(fn (AllowedFacet $facet) => $facet->filters())
             ->each(fn (AllowedFilter $filter) => $filter->disable());
 

src/Processors/FacetRequestProcessor.php

@@ -77,9 +77,11 @@ private function attachAggregate(AllowedFacet $facet, Collection $aggregates): v
 
         $agg = $aggregates->get($facet->name());
 
-        $agg !== null
-            ? $facet->attachAggregate($agg)
-            : throw new AggregateNotFoundException($facet->name());
+        if ($agg === null) {
+            throw new AggregateNotFoundException($facet->name());
+        }
+
+        $facet->attachAggregate($agg);
     }
 
     private function attachFilters(AllowedFacet $facet, Collection $filters): void