Merge pull request #471 from infinum/hotfix/talentlyft

CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 
 This projects adheres to [Semantic Versioning](https://semver.org/) and [Keep a CHANGELOG](https://keepachangelog.com/).
 
+## [5.6.2]
+
+### Fixed
+
+- Broken Talentlyft integration if we have custom fields.
+
 ## [5.6.1]
 
 ### Fixed
@@ -848,6 +854,7 @@ This projects adheres to [Semantic Versioning](https://semver.org/) and [Keep a
 
 - Initial production release.
 
+[5.6.2]: https://github.com/infinum/eightshift-forms/compare/5.6.1...5.6.2
 [5.6.1]: https://github.com/infinum/eightshift-forms/compare/5.6.0...5.6.1
 [5.6.0]: https://github.com/infinum/eightshift-forms/compare/5.5.1...5.6.0
 [5.5.1]: https://github.com/infinum/eightshift-forms/compare/5.5.0...5.5.1

eightshift-forms.php

@@ -6,7 +6,7 @@
  * Description: Eightshift Forms is a complete form builder plugin that utilizes modern Block editor features with multiple third-party integrations, bringing your project to a new level.
  * Author: WordPress team @Infinum
  * Author URI: https://eightshift.com/
- * Version: 5.6.1
+ * Version: 5.6.2
  * Text Domain: eightshift-forms
  *
  * @package EightshiftForms

src/Integrations/Talentlyft/Talentlyft.php

@@ -114,7 +114,6 @@ private function getFields(array $data, string $formId): array
 				continue;
 			}
 
-			$customType = $item['FieldLocationType'] ?? '';
 			$key = $item['Key'] ?? '';
 
 			$type = $item['Type'] ?? '';
@@ -129,12 +128,8 @@ private function getFields(array $data, string $formId): array
 				$name = isset($item['Id']) ? "q_{$item['Id']}" : '';
 			}
 
-			if ($customType === 'ScreeningQuestions') {
-				$internalType = 'Answers';
-			}
-
 			if (empty($key)) {
-				$internalType = 'CustomFieldAnswers';
+				$internalType = 'customField';
 			}
 
 			if (!$name) {

src/Integrations/Talentlyft/TalentlyftClient.php

@@ -387,8 +387,6 @@ private function prepareParams(array $params, string $formId): array
 		// Map enrichment data.
 		$params = $this->enrichment->mapEnrichmentFields($params);
 
-		$output = [];
-
 		// Filter params.
 		$filterName = UtilsHooksHelper::getFilterName(['integrations', SettingsTalentlyft::SETTINGS_TYPE_KEY, 'prePostParams']);
 		if (\has_filter($filterName)) {
@@ -398,6 +396,9 @@ private function prepareParams(array $params, string $formId): array
 		// Remove unecesery params.
 		$params = UtilsGeneralHelper::removeUneceseryParamFields($params);
 
+		$output = [];
+		$outputCustom = [];
+
 		foreach ($params as $param) {
 			$name = $param['name'] ?? '';
 			if (!$name) {
@@ -415,15 +416,14 @@ private function prepareParams(array $params, string $formId): array
 			$name = \preg_replace('/^q_/', '', $name);
 
 			switch ($typeCustom) {
-				case 'Answers':
-				case 'CustomFieldAnswers':
+				case 'customField':
 					if (\in_array($type, ['radio', 'select', 'checkbox'], true)) {
-						$output[$typeCustom][] = [
+						$outputCustom[] = [
 							'Id' => (int) $name,
 							'Choices' => \explode(UtilsConfig::DELIMITER, $value),
 						];
 					} else {
-						$output[$typeCustom][] = [
+						$outputCustom[] = [
 							'Id' => (int) $name,
 							'Body' => $value,
 						];
@@ -440,6 +440,12 @@ private function prepareParams(array $params, string $formId): array
 			}
 		}
 
+		if ($outputCustom) {
+			// Due to poor API design we need to send custom fields in two different ways.
+			$output['CustomFieldAnswers'] = $outputCustom;
+			$output['Answers'] = $outputCustom;
+		}
+
 		return $output;
 	}
 
@@ -453,6 +459,7 @@ private function prepareParams(array $params, string $formId): array
 	private function prepareFiles(array $files): array
 	{
 		$output = [];
+		$outputCustom = [];
 
 		foreach ($files as $items) {
 			$name = $items['name'] ?? '';
@@ -473,8 +480,8 @@ private function prepareFiles(array $files): array
 				$fileName = UtilsUploadHelper::getFileNameFromPath($file);
 
 				switch ($typeCustom) {
-					case 'answers':
-						$output['Answers'][] = [
+					case 'customField':
+						$outputCustom[] = [
 							'Id' => (int) $name,
 							'File' => [
 								'FileName' => $fileName,
@@ -496,6 +503,12 @@ private function prepareFiles(array $files): array
 			}
 		}
 
+		if ($outputCustom) {
+			// Due to poor API design we need to send custom fields in two different ways.
+			$output['CustomFieldAnswers'] = $outputCustom;
+			$output['Answers'] = $outputCustom;
+		}
+
 		return $output;
 	}