Crude additions to search

src/Service/SearchService.php

@@ -4,28 +4,54 @@ declare(strict_types=1);
 
 namespace App\Service;
 
-use App\Repository\SiteRepository;
+use App\Repository\{
+    SiteRepository,
+    FindingRepository,
+    NotConservedRepository,
+    UnderwaterRepository
+};
 use App\Enum\OpusEnum;
-use App\Enum\SitesCategoryEnum;
 use App\Exception\InvalidFilterException;
+use App\DTO\SearchResult;
+use App\Enum\FindingCategoryEnum;
 
 use function Symfony\Component\String\u;
 
 final class SearchService
 {
-    public function __construct(private readonly SiteRepository $siteRepository) {}
+    public function __construct(
+        private readonly SiteRepository $siteRepository,
+        private readonly FindingRepository $findingRepository,
+    ) {}
 
-    public function searchSites(array $rawFilters): array
+    public function search(array $rawFilters): SearchResult
     {
         $filters = $this->normalizeFilters($rawFilters);
 
         // No results should be returned if no filter is valid
-        if (empty($filters)) return [];
+        if (empty($filters)) return new SearchResult([], [], [], []);
 
-        return array_map(
-            fn(\App\Entity\Site $s) => $s->toSummary(),
-            $this->siteRepository->findByFilters($filters)
+        $sites = [];
+        if (!(count($filters) === 1 && isset($filters['category']))) {
+            $sites = array_map(
+                fn(\App\Entity\Site $s) => $s->toSummary(),
+                $this->siteRepository->findByFilters($filters)
+            );
+        }
+
+        $findings = array_map(
+            fn(\App\Entity\Finding $f) => $f->toSummary(),
+            $this->findingRepository->findByFilters($filters)
         );
+
+        $result = new SearchResult(
+            sites: $sites,
+            notConserved: [],
+            findings: $findings,
+            underwater: [],
+        );
+
+        return $result;
     }
     /**
      * @throws InvalidFilterException
@@ -42,13 +68,15 @@ final class SearchService
         }
 
         // Prepare for LIKE query (useful?)
-        $filters['text'] = $text !== '' ? '%' . u($text)->lower()->toUnicodeString() . '%' : '';
+        if (isset($filters['text'])) {
+            $filters['text'] = $text !== '' ? '%' . u($text)->lower()->toUnicodeString() . '%' : '';
+        }
 
         if (!empty($filters['technique']) && OpusEnum::tryFrom($filters['technique']) === null) {
             throw new InvalidFilterException("Invalid technique filter: " . $filters['technique']);
         }
 
-        if (!empty($filters['category']) && SitesCategoryEnum::tryFrom($filters['category']) === null) {
+        if (!empty($filters['category']) && FindingCategoryEnum::tryFrom($filters['category']) === null) {
             throw new InvalidFilterException("Invalid category filter: " . $filters['category']);
         }