36784 Plugin can not set supervisor in address record

plugin/Form/FormAddressCreator.php

@@ -61,14 +61,16 @@ public function __construct(
 	/**
 	 * @param FormData $pFormData
 	 * @param bool $mergeExisting
+	 * @param string $contactType
+	 * @param int|null $estateId
 	 * @return int the new (or updated) address ID
 	 * @throws ApiClientException
 	 * @throws UnknownFieldException
 	 * @throws DependencyException
 	 * @throws NotFoundException
 	 */
 	public function createOrCompleteAddress(
-		FormData $pFormData, bool $mergeExisting = false, string $contactType = ''): int
+		FormData $pFormData, bool $mergeExisting = false, string $contactType = '', int $estateId = null): int
 	{
 		$requestParams = $this->getAddressDataForApiCall($pFormData);
 		$requestParams['checkDuplicate'] = $mergeExisting;
@@ -82,6 +84,13 @@ public function createOrCompleteAddress(
 		if ( key_exists( 'newsletter', $requestParams ) ) {
 			unset( $requestParams['newsletter'] );
 		}
+		if (!empty($estateId)) {
+			$userName = $this->getSupervisorUsernameByEstateId($estateId);
+			if (!empty($userName)) {
+				$requestParams['Benutzer'] = $userName;
+			}
+		}
+
 		$pApiClientAction = new APIClientActionGeneric
 			($this->_pSDKWrapper, onOfficeSDK::ACTION_ID_CREATE, 'address');
 		$pApiClientAction->setParameters($requestParams);
@@ -170,4 +179,61 @@ public function getAddressDataForEmail(FormData $pFormData): array
 		}
 		return $addressData;
 	}
+
+	/**
+	 * @param int $estateId
+	 * @return string
+	 * @throws ApiClientException
+	 * @throws DependencyException
+	 * @throws NotFoundException
+	 */
+	private function getSupervisorUsernameByEstateId(int $estateId): string
+	{
+		$requestParams = [
+			'filter' => ['Id' => [['op' => '=', 'val' => $estateId]]],
+			'data' => ['benutzer'],
+		];
+
+		$pApiClientAction = new APIClientActionGeneric
+			($this->_pSDKWrapper, onOfficeSDK::ACTION_ID_READ, 'estate');
+
+		$pApiClientAction->setParameters($requestParams);
+		$pApiClientAction->addRequestToQueue();
+		$this->_pSDKWrapper->sendRequests();
+		$result = $pApiClientAction->getResultRecords();
+
+		if (!empty($result) && isset($result[0]["elements"]["benutzer"])) {
+			$userId = $result[0]["elements"]["benutzer"];
+			return $this->getUserNameById($userId);
+		} else {
+			return '';
+		}
+	}
+
+	/**
+	 * @param string $userId
+	 * @return string
+	 * @throws ApiClientException
+	 * @throws DependencyException
+	 * @throws NotFoundException
+	 */
+	private function getUserNameById(string $userId): string
+	{
+		$pApiClientAction = new APIClientActionGeneric
+			($this->_pSDKWrapper, onOfficeSDK::ACTION_ID_GET, 'users');
+
+		$pApiClientAction->addRequestToQueue();
+		$this->_pSDKWrapper->sendRequests();
+		$result = $pApiClientAction->getResultRecords();
+
+		$userResult = array_values(array_filter($result, function($item) use ($userId) {
+			return $item['id'] == $userId && isset($item["elements"]["username"]);
+		}));
+
+		if (!empty($userResult)) {
+			return $userResult[0]["elements"]["username"];
+		} else {
+			return '';
+		}
+	}
 }

plugin/Form/FormPostInterestConfiguration.php

@@ -25,6 +25,7 @@
 
 use onOffice\WPlugin\Field\SearchcriteriaFields;
 use onOffice\WPlugin\SDKWrapper;
+use onOffice\WPlugin\WP\WPQueryWrapper;
 
 /**
  *
@@ -66,4 +67,12 @@ public function getSearchcriteriaFields(): SearchcriteriaFields;
 	 */
 
 	 public function getNewsletterAccepted(): bool;
+
+	/**
+	 *
+	 * @return WPQueryWrapper
+	 *
+	 */
+
+	public function getWPQueryWrapper(): WPQueryWrapper;
 }

plugin/Form/FormPostInterestConfigurationDefault.php

@@ -25,6 +25,7 @@
 
 use onOffice\WPlugin\Field\SearchcriteriaFields;
 use onOffice\WPlugin\SDKWrapper;
+use onOffice\WPlugin\WP\WPQueryWrapper;
 
 
 /**
@@ -43,23 +44,28 @@ class FormPostInterestConfigurationDefault
 	/** @var SearchcriteriaFields */
 	private $_pSearchcriteriaFields;
 
+	/** @var WPQueryWrapper */
+	private $_pWPQueryWrapper = null;
 
 	/**
 	 *
 	 * @param SDKWrapper $pSDKWrapper
 	 * @param FormAddressCreator $pFormAddressCreator
 	 * @param SearchcriteriaFields $pSearchcriteriaFields
+	 * @param WPQueryWrapper $pWPQueryWrapper
 	 *
 	 */
 
 	public function __construct(
 		SDKWrapper $pSDKWrapper,
 		FormAddressCreator $pFormAddressCreator,
-		SearchcriteriaFields $pSearchcriteriaFields)
+		SearchcriteriaFields $pSearchcriteriaFields,
+		WPQueryWrapper $pWPQueryWrapper)
 	{
 		$this->_pSDKWrapper = $pSDKWrapper;
 		$this->_pFormAddressCreator = $pFormAddressCreator;
 		$this->_pSearchcriteriaFields = $pSearchcriteriaFields;
+		$this->_pWPQueryWrapper = $pWPQueryWrapper;
 	}
 
 
@@ -106,4 +112,16 @@ public function getNewsletterAccepted(): bool
 	{
 		return filter_var( $_POST['newsletter'] ?? null, FILTER_SANITIZE_STRING ) === 'y';
 	}
+
+
+	/**
+	 *
+	 * @return WPQueryWrapper
+	 *
+	 */
+
+	public function getWPQueryWrapper(): WPQueryWrapper
+	{
+		return $this->_pWPQueryWrapper;
+	}
 }

plugin/Form/FormPostInterestConfigurationTest.php

@@ -25,6 +25,7 @@
 
 use onOffice\WPlugin\Field\SearchcriteriaFields;
 use onOffice\WPlugin\SDKWrapper;
+use onOffice\WPlugin\WP\WPQueryWrapper;
 
 
 /**
@@ -46,22 +47,28 @@ class FormPostInterestConfigurationTest
 	/** @var bool */
 	private $_newsletterAccepted = false;
 
+	/** @var WPQueryWrapper */
+	private $_pWPQueryWrapper;
+
 	/**
 	 *
 	 * @param SDKWrapper $pSDKWrapper
 	 * @param FormAddressCreator $pFormAddressCreator
 	 * @param SearchcriteriaFields $pSearchcriteriaFields
+	 * @param WPQueryWrapper $pWPQueryWrapper
 	 *
 	 */
 
 	public function __construct(
 		SDKWrapper $pSDKWrapper,
 		FormAddressCreator $pFormAddressCreator,
-		SearchcriteriaFields $pSearchcriteriaFields)
+		SearchcriteriaFields $pSearchcriteriaFields,
+		WPQueryWrapper $pWPQueryWrapper)
 	{
 		$this->_pSDKWrapper = $pSDKWrapper;
 		$this->_pFormAddressCreator = $pFormAddressCreator;
 		$this->_pSearchcriteriaFields = $pSearchcriteriaFields;
+		$this->_pWPQueryWrapper = $pWPQueryWrapper;
 	}
 
 
@@ -121,4 +128,15 @@ public function setNewsletterAccepted( bool $newsletterAccepted )
 	{
 		$this->_newsletterAccepted = $newsletterAccepted;
 	}
+
+	/**
+	 *
+	 * @return WPQueryWrapper
+	 *
+	 */
+
+	public function getWPQueryWrapper(): WPQueryWrapper
+	{
+		return $this->_pWPQueryWrapper;
+	}
 }

plugin/Form/FormPostOwnerConfiguration.php

@@ -25,6 +25,7 @@
 
 use onOffice\WPlugin\Controller\InputVariableReader;
 use onOffice\WPlugin\SDKWrapper;
+use onOffice\WPlugin\WP\WPQueryWrapper;
 
 /**
  *
@@ -73,4 +74,13 @@ public function getFormAddressCreator(): FormAddressCreator;
 	 *
 	 */
 	 public function getNewsletterAccepted(): bool;
+
+
+	/**
+	 *
+	 * @return WPQueryWrapper
+	 *
+	 */
+
+	 public function getWPQueryWrapper(): WPQueryWrapper;
 }

plugin/Form/FormPostOwnerConfigurationDefault.php

@@ -26,6 +26,7 @@
 use onOffice\SDK\onOfficeSDK;
 use onOffice\WPlugin\Controller\InputVariableReader;
 use onOffice\WPlugin\SDKWrapper;
+use onOffice\WPlugin\WP\WPQueryWrapper;
 
 /**
  *
@@ -40,18 +41,22 @@ class FormPostOwnerConfigurationDefault
 	/** @var FormAddressCreator */
 	private $_pFormAddressCreator;
 
+	/** @var WPQueryWrapper */
+	private $_pWPQueryWrapper = null;
 
 	/**
 	 *
 	 * @param SDKWrapper $pSDKWrapper
 	 * @param FormAddressCreator $pFormAddressCreator
+	 * @param WPQueryWrapper $pWPQueryWrapper
 	 *
 	 */
 
-	public function __construct(SDKWrapper $pSDKWrapper, FormAddressCreator $pFormAddressCreator)
+	public function __construct(SDKWrapper $pSDKWrapper, FormAddressCreator $pFormAddressCreator, WPQueryWrapper $pWPQueryWrapper)
 	{
 		$this->_pSDKWrapper = $pSDKWrapper;
 		$this->_pFormAddressCreator = $pFormAddressCreator;
+		$this->_pWPQueryWrapper = $pWPQueryWrapper;
 	}
 
 
@@ -110,4 +115,16 @@ public function getNewsletterAccepted(): bool
 	{
 		return filter_var( $_POST['newsletter'] ?? null, FILTER_SANITIZE_STRING ) === 'y';
 	}
+
+
+	/**
+	 *
+	 * @return WPQueryWrapper
+	 *
+	 */
+
+	public function getWPQueryWrapper(): WPQueryWrapper
+	{
+		return $this->_pWPQueryWrapper;
+	}
 }

plugin/Form/FormPostOwnerConfigurationTest.php

@@ -27,6 +27,7 @@
 use onOffice\WPlugin\Controller\InputVariableReader;
 use onOffice\WPlugin\Controller\InputVariableReaderConfigTest;
 use onOffice\WPlugin\SDKWrapper;
+use onOffice\WPlugin\WP\WPQueryWrapper;
 
 /**
  *
@@ -47,20 +48,26 @@ class FormPostOwnerConfigurationTest
 	/** @var bool */
 	private $_newsletterAccepted = false;
 
+	/** @var WPQueryWrapper */
+	private $_pWPQueryWrapper;
+
 	/**
 	 * @param SDKWrapper $pSDKWrapper
 	 * @param FormAddressCreator $pFormAddressCreator
 	 * @param InputVariableReaderConfigTest $pInputVariableReaderConfigTest
+	 * @param WPQueryWrapper $pWPQueryWrapper
 	 */
 
 	public function __construct(
 		SDKWrapper $pSDKWrapper,
 		FormAddressCreator $pFormAddressCreator,
-		InputVariableReaderConfigTest $pInputVariableReaderConfigTest)
+		InputVariableReaderConfigTest $pInputVariableReaderConfigTest,
+		WPQueryWrapper $pWPQueryWrapper)
 	{
 		$this->_pInputVariableReaderConfigTest = $pInputVariableReaderConfigTest;
 		$this->_pFormAddressCreator = $pFormAddressCreator;
 		$this->_pSDKWrapper = $pSDKWrapper;
+		$this->_pWPQueryWrapper = $pWPQueryWrapper;
 	}
 
 
@@ -133,4 +140,16 @@ public function setNewsletterAccepted( bool $newsletterAccepted )
 	{
 		$this->_newsletterAccepted = $newsletterAccepted;
 	}
+
+
+	/**
+	 *
+	 * @return WPQueryWrapper
+	 *
+	 */
+
+	public function getWPQueryWrapper(): WPQueryWrapper
+	{
+		return $this->_pWPQueryWrapper;
+	}
 }

plugin/FormPostContact.php

@@ -135,8 +135,10 @@ private function createAddress(FormData $pFormData)
 		$pFormConfig = $pFormData->getDataFormConfiguration();
 		$checkDuplicate = $pFormConfig->getCheckDuplicateOnCreateAddress();
 		$contactType = $pFormConfig->getContactType();
+		$pWPQuery = $this->_pFormPostContactConfiguration->getWPQueryWrapper()->getWPQuery();
+		$estateId = $pWPQuery->get('estate_id', null);
 		$addressId = $this->_pFormPostContactConfiguration->getFormAddressCreator()
-			->createOrCompleteAddress($pFormData, $checkDuplicate, $contactType);
+			->createOrCompleteAddress($pFormData, $checkDuplicate, $contactType, $estateId);
 
 		if (!$this->_pFormPostContactConfiguration->getNewsletterAccepted()) {
 			// No subscription for newsletter, which is ok

plugin/FormPostInterest.php

@@ -84,9 +84,10 @@ protected function analyseFormContentByPrefix(FormData $pFormData)
 			if ( $pFormConfiguration->getCreateInterest() ) {
 				$checkduplicate = $pFormConfiguration->getCheckDuplicateOnCreateAddress();
 						$contactType = $pFormConfiguration->getContactType();
+				$pWPQuery = $this->_pFormPostInterestConfiguration->getWPQueryWrapper()->getWPQuery();
+				$estateId = $pWPQuery->get('estate_id', null);
 				$addressId = $this->_pFormPostInterestConfiguration->getFormAddressCreator()
-				                                                   ->createOrCompleteAddress( $pFormData,
-					                                                   $checkduplicate, $contactType);
+						->createOrCompleteAddress( $pFormData, $checkduplicate, $contactType, $estateId);
 				$this->createSearchcriteria( $pFormData, $addressId );
 				$this->setNewsletter( $addressId );
 			}

plugin/FormPostOwner.php

@@ -93,9 +93,11 @@ protected function analyseFormContentByPrefix(FormData $pFormData)
 			if ( $pDataFormConfiguration->getCreateOwner() ) {
 				$checkduplicate = $pDataFormConfiguration->getCheckDuplicateOnCreateAddress();
 				$contactType = $pDataFormConfiguration->getContactType();
+				$pWPQuery = $this->_pFormPostOwnerConfiguration->getWPQueryWrapper()->getWPQuery();
+				$estateId = $pWPQuery->get('estate_id', null);
 				$addressId  = $this->_pFormPostOwnerConfiguration->getFormAddressCreator()
-				                                                 ->createOrCompleteAddress( $pFormData,
-					                                                 $checkduplicate, $contactType);
+						->createOrCompleteAddress($pFormData, $checkduplicate, $contactType, $estateId);
+				$estateData = $this->getEstateData();
 				$estateId   = $this->createEstate( $estateData );
 				$this->createOwnerRelation( $estateId, $addressId );
 				$this->setNewsletter( $addressId );