remove check duplicate value in parentData file and add condition in even file

Author: dhavalc-complitech

src/Utils/Importer/Indi/Even.php

@@ -39,7 +39,12 @@ public static function read($conn, $events, $person, $obje_ids = [])
                 $_phon = $even->getPhon();
                 $phon = \FamilyTree365\LaravelGedcom\Utils\Importer\Phon::read($conn, $_phon);
                 $_addr = $even->getAddr();
-                $addr_id = \FamilyTree365\LaravelGedcom\Utils\Importer\Addr::read($conn, $_addr);
+                //$addr_id = \FamilyTree365\LaravelGedcom\Utils\Importer\Addr::read($conn, $_addr);
+                if(!empty($_addr)){
+                    $addr_id = \FamilyTree365\LaravelGedcom\Utils\Importer\Addr::read($conn, $_addr);
+                } else {
+                    $addr_id = null;
+                }
 
                 $caus = $even->getCaus();
                 $age = $even->getAge();
@@ -190,7 +195,12 @@ public static function otherField($conn, $events, $person)
                 $_phon = $even->getPhon();
                 $phon = \FamilyTree365\LaravelGedcom\Utils\Importer\Phon::read($conn, $_phon);
                 $_addr = $even->getAddr();
-                $addr_id = \FamilyTree365\LaravelGedcom\Utils\Importer\Addr::read($conn, $_addr);
+                //$addr_id = \FamilyTree365\LaravelGedcom\Utils\Importer\Addr::read($conn, $_addr);
+                if(!empty($_addr)){
+                    $addr_id = \FamilyTree365\LaravelGedcom\Utils\Importer\Addr::read($conn, $_addr);
+                } else {
+                    $addr_id = null;
+                }
 
                 $caus = $even->getCaus();
                 $age = $even->getAge();
@@ -297,11 +307,6 @@ public static function otherField($conn, $events, $person)
                     ['birt_famc', $birt_famc],
                 ];
 
-                $record = PersonEvent::on($conn)->where($key)->first();
-
-                $_group = 'indi_even';
-                $_gid = $record->id;
-
                 // update person's record
                 if ($class_name == 'BIRT' && !empty($date)) {
                     $person->birthday = date('Y-m-d', strtotime($date));
@@ -311,32 +316,42 @@ public static function otherField($conn, $events, $person)
                     $person->deathday = date('Y-m-d', strtotime($date));
                 }
                 $person->save();
+                
+                $sour = $even->getSour();
+                $notes = $even->getNote();
+                $obje = $even->getObje();
+                $_chan = $even->getChan() ?? null;
+                if((!empty($sour) && count($sour) > 0) || (!empty($obje) && count($obje) > 0) || (!empty($notes) && count($notes) > 0) || !empty($_chan))    {
+                    $record = PersonEvent::on($conn)->where($key)->first();
+                    $_group = 'indi_even';
+                    $_gid = $record->id;
+                }
 
                 // array
-                $sour = $even->getSour();
+                //$sour = $even->getSour();
                 if ($sour && count($sour) > 0) {
                     foreach ($sour as $item) {
                         if ($item) {
                             \FamilyTree365\LaravelGedcom\Utils\Importer\SourRef::read($conn, $item, $_group, $_gid);
                         }
                     }
                 }
-                $obje = $even->getObje();
+                //$obje = $even->getObje();
                 if ($obje && count($obje) > 0) {
                     foreach ($obje as $item) {
                         if ($item) {
                             \FamilyTree365\LaravelGedcom\Utils\Importer\ObjeRef::read($conn, $item, $_group, $_gid, $obje_ids);
                         }
                     }
                 }
-                $notes = $even->getNote();
+                //$notes = $even->getNote();
                 if ($notes && count($notes) > 0) {
                     foreach ($notes as $item) {
                         \FamilyTree365\LaravelGedcom\Utils\Importer\NoteRef::read($conn, $item, $_group, $_gid);
                     }
                 }
                 // object
-                $_chan = $even->getChan() ?? null;
+                //$_chan = $even->getChan() ?? null;
                 if ($_chan !== null) {
                     \FamilyTree365\LaravelGedcom\Utils\Importer\Chan::read($conn, $_chan, $_group, $_gid);
                 }

src/Utils/ParentData.php

@@ -90,15 +90,15 @@ public static function getPerson($conn, $individuals, $obje_ids, $sour_ids)
                 }
 
                 $config = json_encode(config('database.connections.' . $conn));
-                $key = [
+                /* $key = [
                     ['name', $name], ['givn', $givn], ['surn', $surn], ['sex', $sex], ['uid', $uid],
-                ];
-                $check = Person::on($conn)->where($key)->first();
-                if (empty($check)) {
+                ]; */
+                //$check = Person::on($conn)->where($key)->first();
+                //if (empty($check)) {
                     $value = ['name' => $name, 'givn' => $givn, 'surn' => $surn, 'sex' => $sex, 'uid' => $uid, 'rin' => $rin, 'resn' => $resn, 'rfn' => $rfn, 'afn' => $afn];
 
                     $ParentData[] = $value;
-                }
+                //}
                 // $person = Person::on($conn)->updateOrCreate($key,$value);
                 // otherFields::insertOtherFields($conn,$individual,$obje_ids,$person);
             }