contact id fix (#5610)

* contact id fix

* only allow 1 contact per foreign table name and foreign id

* getting closer

* minor fix

src/Common/ORDataObject/Contact.php

@@ -40,18 +40,37 @@ class Contact extends ORDataObject
  public function __construct($id)
  {
  parent::__construct("contact");
- $this->_id = $id;
+ $this->id = $id;
 
  if (!empty($id)) {
  $this->populate();
  }
  }
 
- public function setPatientPid($pid)
+ public function setContactRecord(string $foreign_table_name, int $foreign_id): void
  {
  // we set our type to be patient_id and our table type here.
- $this->foreign_table_name = 'patient_data';
- $this->foreign_id = $pid;
+ $this->foreign_table_name = $foreign_table_name;
+ $this->foreign_id = $foreign_id;
+
+ $this->setContactIdIfExist();
+ }
+
+ public function persist()
+ {
+ if (empty($this->id)) {
+ $this->setContactIdIfExist();
+ }
+ return parent::persist();
+ }
+
+ private function setContactIdIfExist(): void
+ {
+ $id = sqlQuery("SELECT `id` FROM `contact` WHERE `foreign_table_name` = ? AND `foreign_id` = ?", [$this->foreign_table_name, $this->foreign_id])['id'] ?? null;
+ if (!empty($id)) {
+ // the contact entry already exists for this foreign table name and foreign id, so set it
+ $this->id = $id;
+ }
  }
 
  /**

src/Services/ContactService.php

@@ -147,7 +147,7 @@ public function convertArraysToRecords($pid, $contactData)
 
  $contact = $contactAddress->getContact();
  // then we will create our contacts record as well
- $contact->setPatientPid($pid);
+ $contact->setContactRecord('patient_data', $pid);
 
  // here we can handle all of our data actions
  if ($contactData['data_action'][$i] == 'INACTIVATE') {