Merge branch 'master' into Development

This commit is contained in:
Simon Pocrnjič 2026-01-21 18:32:28 +01:00
commit d779e4d7a1

View File

@ -3194,7 +3194,7 @@ private function upsertAddress(int $personId, array $addrData, $mappings): array
->first();*/ ->first();*/
// Build search query combining address, post_code and city // Build search query combining address, post_code and city
$searchParts = [$addrData['post_code']]; $searchParts = [$addrData['address']];
if (!empty($addrData['post_code'])) { if (!empty($addrData['post_code'])) {
$searchParts[] = $addrData['post_code']; $searchParts[] = $addrData['post_code'];
} }
@ -3204,7 +3204,7 @@ private function upsertAddress(int $personId, array $addrData, $mappings): array
$searchQuery = implode(' ', $searchParts); $searchQuery = implode(' ', $searchParts);
// Use fulltext search (GIN index optimized) // Use fulltext search (GIN index optimized)
$existing = PersonAddress::where('person_id', $personId) $existing = PersonAddress::query()->where('person_id', $personId)
->whereRaw("search_vector @@ plainto_tsquery('simple', ?)", [$searchQuery]) ->whereRaw("search_vector @@ plainto_tsquery('simple', ?)", [$searchQuery])
->first(); ->first();