Compare commits
No commits in common. "357a254e82e4183bcaec09a6b39b74cd5d528d70" and "aa93c96d313fde41ee9d1d798d890383f1f8ad2e" have entirely different histories.
357a254e82
...
aa93c96d31
|
|
@ -46,7 +46,6 @@ class Person extends Model
|
||||||
'group_id',
|
'group_id',
|
||||||
'type_id',
|
'type_id',
|
||||||
'user_id',
|
'user_id',
|
||||||
'employer'
|
|
||||||
];
|
];
|
||||||
|
|
||||||
protected $hidden = [
|
protected $hidden = [
|
||||||
|
|
|
||||||
|
|
@ -24,7 +24,6 @@
|
||||||
use App\Models\Person\PersonPhone;
|
use App\Models\Person\PersonPhone;
|
||||||
use App\Models\Person\PersonType;
|
use App\Models\Person\PersonType;
|
||||||
use App\Models\Person\PhoneType;
|
use App\Models\Person\PhoneType;
|
||||||
use Exception;
|
|
||||||
use Illuminate\Contracts\Auth\Authenticatable;
|
use Illuminate\Contracts\Auth\Authenticatable;
|
||||||
use Illuminate\Database\QueryException;
|
use Illuminate\Database\QueryException;
|
||||||
use Illuminate\Support\Carbon;
|
use Illuminate\Support\Carbon;
|
||||||
|
|
@ -2975,7 +2974,7 @@ private function findOrCreatePersonId(array $p): ?int
|
||||||
// Create person if any fields present; ensure required foreign keys
|
// Create person if any fields present; ensure required foreign keys
|
||||||
if (! empty($p)) {
|
if (! empty($p)) {
|
||||||
$data = [];
|
$data = [];
|
||||||
foreach (['first_name', 'last_name', 'full_name', 'tax_number', 'social_security_number', 'birthday', 'gender', 'description', 'group_id', 'type_id', 'employer'] as $k) {
|
foreach (['first_name', 'last_name', 'full_name', 'tax_number', 'social_security_number', 'birthday', 'gender', 'description', 'group_id', 'type_id'] as $k) {
|
||||||
if (array_key_exists($k, $p)) {
|
if (array_key_exists($k, $p)) {
|
||||||
$data[$k] = $p[$k];
|
$data[$k] = $p[$k];
|
||||||
}
|
}
|
||||||
|
|
@ -2988,16 +2987,6 @@ private function findOrCreatePersonId(array $p): ?int
|
||||||
$data['full_name'] = trim($fn.' '.$ln);
|
$data['full_name'] = trim($fn.' '.$ln);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// normalise birthday date
|
|
||||||
if (!empty($data['birthday'])) {
|
|
||||||
try {
|
|
||||||
$data['birthday'] = date('Y-m-d', strtotime($data['birthday']));
|
|
||||||
} catch (Exception $e) {
|
|
||||||
Log::warning('ImportProcessor::findOrCreatePersonId ' . $e->getMessage());
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
// ensure required group/type ids
|
// ensure required group/type ids
|
||||||
$data['group_id'] = $data['group_id'] ?? $this->getDefaultPersonGroupId();
|
$data['group_id'] = $data['group_id'] ?? $this->getDefaultPersonGroupId();
|
||||||
$data['type_id'] = $data['type_id'] ?? $this->getDefaultPersonTypeId();
|
$data['type_id'] = $data['type_id'] ?? $this->getDefaultPersonTypeId();
|
||||||
|
|
@ -3174,38 +3163,10 @@ 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';
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!empty($addrData['city']) && empty($addrData['post_code'])) {
|
|
||||||
if (preg_match('/^\d{3,}\s+/',trim($addrData['city']))) {
|
|
||||||
$cleanStrCity = str($addrData['city'])->squish()->value();
|
|
||||||
$splitCity = preg_split('/\s/', $cleanStrCity, 2);
|
|
||||||
if (count($splitCity) >= 2) {
|
|
||||||
$addrData['post_code'] = $splitCity[0];
|
|
||||||
$addrData['city'] = $splitCity[1];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// Compare addresses with all spaces removed to handle whitespace variations
|
// Compare addresses with all spaces removed to handle whitespace variations
|
||||||
/*$addressLineNoSpaces = preg_replace('/\s+/', '', $addressLine);
|
$addressLineNoSpaces = preg_replace('/\s+/', '', $addressLine);
|
||||||
|
|
||||||
|
|
||||||
$existing = PersonAddress::where('person_id', $personId)
|
$existing = PersonAddress::where('person_id', $personId)
|
||||||
->whereRaw("REPLACE(address, ' ', '') = ?", [$addressLineNoSpaces])
|
->whereRaw("REPLACE(address, ' ', '') = ?", [$addressLineNoSpaces])
|
||||||
->first();*/
|
|
||||||
|
|
||||||
// Build search query combining address, post_code and city
|
|
||||||
$searchParts = [$addrData['post_code']];
|
|
||||||
if (!empty($addrData['post_code'])) {
|
|
||||||
$searchParts[] = $addrData['post_code'];
|
|
||||||
}
|
|
||||||
if (!empty($addrData['city'])) {
|
|
||||||
$searchParts[] = $addrData['city'];
|
|
||||||
}
|
|
||||||
|
|
||||||
$searchQuery = implode(' ', $searchParts);
|
|
||||||
// Use fulltext search (GIN index optimized)
|
|
||||||
$existing = PersonAddress::where('person_id', $personId)
|
|
||||||
->whereRaw("search_vector @@ plainto_tsquery('simple', ?)", [$searchQuery])
|
|
||||||
->first();
|
->first();
|
||||||
|
|
||||||
$applyInsert = [];
|
$applyInsert = [];
|
||||||
|
|
@ -3250,11 +3211,6 @@ private function upsertAddress(int $personId, array $addrData, $mappings): array
|
||||||
$data['person_id'] = $personId;
|
$data['person_id'] = $personId;
|
||||||
$data['country'] = $data['country'] ?? 'SLO';
|
$data['country'] = $data['country'] ?? 'SLO';
|
||||||
$data['type_id'] = $data['type_id'] ?? $this->getDefaultAddressTypeId();
|
$data['type_id'] = $data['type_id'] ?? $this->getDefaultAddressTypeId();
|
||||||
|
|
||||||
if (!empty($addrData['post_code']) && $addrData['post_code'] !== '0' && !isset($applyUpdate['post_code'])) {
|
|
||||||
$data['post_code'] = $addrData['post_code'];
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$created = PersonAddress::create($data);
|
$created = PersonAddress::create($data);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,28 +0,0 @@
|
||||||
<?php
|
|
||||||
|
|
||||||
use Illuminate\Database\Migrations\Migration;
|
|
||||||
use Illuminate\Database\Schema\Blueprint;
|
|
||||||
use Illuminate\Support\Facades\Schema;
|
|
||||||
|
|
||||||
return new class extends Migration
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Run the migrations.
|
|
||||||
*/
|
|
||||||
public function up(): void
|
|
||||||
{
|
|
||||||
Schema::table('person', function (Blueprint $table){
|
|
||||||
$table->string('employer', 125)->nullable();
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Reverse the migrations.
|
|
||||||
*/
|
|
||||||
public function down(): void
|
|
||||||
{
|
|
||||||
Schema::table('person', function (Blueprint $table){
|
|
||||||
$table->dropColumn('employer');
|
|
||||||
});
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
@ -1,37 +0,0 @@
|
||||||
<?php
|
|
||||||
|
|
||||||
|
|
||||||
use Illuminate\Database\Migrations\Migration;
|
|
||||||
use Illuminate\Database\Schema\Blueprint;
|
|
||||||
use Illuminate\Support\Facades\DB;
|
|
||||||
use Illuminate\Support\Facades\Schema;
|
|
||||||
|
|
||||||
return new class extends Migration
|
|
||||||
{
|
|
||||||
public function up(): void
|
|
||||||
{
|
|
||||||
// Add a generated tsvector column for fulltext search
|
|
||||||
DB::statement("
|
|
||||||
ALTER TABLE person_addresses
|
|
||||||
ADD COLUMN search_vector tsvector
|
|
||||||
GENERATED ALWAYS AS (
|
|
||||||
to_tsvector('simple',
|
|
||||||
coalesce(address, '') || ' ' ||
|
|
||||||
coalesce(post_code, '') || ' ' ||
|
|
||||||
coalesce(city, '')
|
|
||||||
)
|
|
||||||
) STORED
|
|
||||||
");
|
|
||||||
|
|
||||||
// Create GIN index on the tsvector column for fast fulltext search
|
|
||||||
DB::statement('CREATE INDEX person_addresses_search_vector_idx ON person_addresses USING GIN(search_vector)');
|
|
||||||
}
|
|
||||||
|
|
||||||
public function down(): void
|
|
||||||
{
|
|
||||||
Schema::table('person_addresses', function (Blueprint $table) {
|
|
||||||
$table->dropIndex('person_addresses_search_vector_idx');
|
|
||||||
$table->dropColumn('search_vector');
|
|
||||||
});
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
@ -14,7 +14,7 @@ public function run(): void
|
||||||
'key' => 'person',
|
'key' => 'person',
|
||||||
'canonical_root' => 'person',
|
'canonical_root' => 'person',
|
||||||
'label' => 'Person',
|
'label' => 'Person',
|
||||||
'fields' => ['first_name', 'last_name', 'full_name', 'gender', 'birthday', 'tax_number', 'social_security_number', 'description', 'employer'],
|
'fields' => ['first_name', 'last_name', 'full_name', 'gender', 'birthday', 'tax_number', 'social_security_number', 'description'],
|
||||||
'field_aliases' => [
|
'field_aliases' => [
|
||||||
'dob' => 'birthday',
|
'dob' => 'birthday',
|
||||||
'date_of_birth' => 'birthday',
|
'date_of_birth' => 'birthday',
|
||||||
|
|
@ -30,7 +30,6 @@ public function run(): void
|
||||||
['pattern' => '/^(spol|gender)\b/i', 'field' => 'gender'],
|
['pattern' => '/^(spol|gender)\b/i', 'field' => 'gender'],
|
||||||
['pattern' => '/^(rojstvo|datum\s*rojstva|dob|birth|birthday|date\s*of\s*birth)\b/i', 'field' => 'birthday'],
|
['pattern' => '/^(rojstvo|datum\s*rojstva|dob|birth|birthday|date\s*of\s*birth)\b/i', 'field' => 'birthday'],
|
||||||
['pattern' => '/^(komentar|opis|opomba|comment|description|note)\b/i', 'field' => 'description'],
|
['pattern' => '/^(komentar|opis|opomba|comment|description|note)\b/i', 'field' => 'description'],
|
||||||
['pattern' => '/^(delodajalec|služba)\b/i', 'field' => 'employer']
|
|
||||||
],
|
],
|
||||||
'ui' => ['order' => 1],
|
'ui' => ['order' => 1],
|
||||||
],
|
],
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user