sipo/Teren-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed address import

Browse Source
This commit is contained in:
Simon Pocrnjič 2025-12-18 19:40:27 +01:00
parent 622f53e401
commit 5d4498ac5a
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/Services/ImportProcessor.php
View File

@ -3127,7 +3127,12 @@ private function upsertAddress(int $personId, array $addrData, $mappings): array
if (! isset($addrData['country']) || $addrData['country'] === null || $addrData['country'] === '') { if (! isset($addrData['country']) || $addrData['country'] === null || $addrData['country'] === '') {
$addrData['country'] = 'SLO'; $addrData['country'] = 'SLO';
} }
$existing = PersonAddress::where('person_id', $personId)->where('address', $addressLine)->first(); // Compare addresses with all spaces removed to handle whitespace variations
$addressLineNoSpaces = preg_replace('/\s+/', '', $addressLine);
$existing = PersonAddress::where('person_id', $personId)
->whereRaw("REPLACE(address, ' ', '') = ?", [$addressLineNoSpaces])
->first();
$applyInsert = []; $applyInsert = [];
$applyUpdate = []; $applyUpdate = [];
foreach ($mappings as $map) { foreach ($mappings as $map) {
@ -3176,6 +3181,11 @@ private function upsertAddress(int $personId, array $addrData, $mappings): array
return ['action' => 'inserted', 'address' => $created]; return ['action' => 'inserted', 'address' => $created];
} catch (QueryException $e) { } catch (QueryException $e) {
// If unique constraint violation, skip instead of aborting // If unique constraint violation, skip instead of aborting
Log::warning('Address constraint violation during import', [
'person_id' => $personId,
'address' => $addressLine,
'error' => $e->getMessage(),
]);
if ($e->getCode() === '23505' || str_contains($e->getMessage(), 'unique') || str_contains($e->getMessage(), 'duplicate')) { if ($e->getCode() === '23505' || str_contains($e->getMessage(), 'unique') || str_contains($e->getMessage(), 'duplicate')) {
return ['action' => 'skipped', 'message' => 'Address already exists (constraint violation)']; return ['action' => 'skipped', 'message' => 'Address already exists (constraint violation)'];
} }