chore: split value and ID parsing into separate methods

Signed-off-by: ailkiv <a.ilkiv.ye@gmail.com>

Author: AIlkiv

lib/Service/ColumnTypes/SelectionBusiness.php

@@ -23,18 +23,24 @@ public function parseValue($value, ?Column $column = null): string {
 		}
 
 		$intValue = (int)$value;
-		if ((string)$intValue === (string)$value) {
-			// if it seems to be an option ID
-			foreach ($column->getSelectionOptionsArray() as $option) {
-				if ($option['id'] === $intValue && $option['label'] !== $value) {
-					return json_encode($option['id']);
-				}
+		foreach ($column->getSelectionOptionsArray() as $option) {
+			if ($option['id'] === $intValue) {
+				return json_encode($option['id']);
 			}
-		} else {
-			foreach ($column->getSelectionOptionsArray() as $option) {
-				if ($option['label'] === $value) {
-					return json_encode($option['id']);
-				}
+		}
+
+		return '';
+	}
+
+	public function parseDisplayValue($value, ?Column $column = null): string {
+		if (!$column) {
+			$this->logger->warning('No column given, but expected on ' . __FUNCTION__ . ' within ' . __CLASS__, ['exception' => new \Exception()]);
+			return '';
+		}
+
+		foreach ($column->getSelectionOptionsArray() as $option) {
+			if ($option['label'] === $value) {
+				return json_encode($option['id']);
 			}
 		}
 
@@ -56,22 +62,30 @@ public function canBeParsed($value, ?Column $column = null): bool {
 		}
 
 		$intValue = (int)$value;
-		if ((string)$intValue === (string)$value) {
-			// if it seems to be an option ID
-			foreach ($column->getSelectionOptionsArray() as $option) {
-				if ($option['id'] === $intValue && $option['label'] !== $value) {
-					return true;
-				}
-			}
-		} else {
-			foreach ($column->getSelectionOptionsArray() as $option) {
-				if ($option['label'] === $value) {
-					return true;
-				}
+		foreach ($column->getSelectionOptionsArray() as $option) {
+			if ($option['id'] === $intValue) {
+				return true;
 			}
 		}
 
 		return false;
 	}
 
+	public function canBeParsedDisplayValue($value, ?Column $column = null): bool {
+		if (!$column) {
+			$this->logger->warning('No column given, but expected on ' . __FUNCTION__ . ' within ' . __CLASS__, ['exception' => new \Exception()]);
+			return false;
+		}
+		if ($value === null) {
+			return true;
+		}
+
+		foreach ($column->getSelectionOptionsArray() as $option) {
+			if ($option['label'] === $value) {
+				return true;
+			}
+		}
+
+		return false;
+	}
 }

lib/Service/ColumnTypes/SuperBusiness.php

@@ -28,6 +28,10 @@ public function parseValue($value, ?Column $column = null): string {
 		return json_encode($value);
 	}
 
+	public function parseDisplayValue($value, ?Column $column = null): string {
+		return $this->parseValue($value, $column);
+	}
+
 	/**
 	 * @param mixed $value
 	 * @param Column|null $column
@@ -37,6 +41,10 @@ public function canBeParsed($value, ?Column $column = null): bool {
 		return true;
 	}
 
+	public function canBeParsedDisplayValue($value, ?Column $column = null): bool {
+		return $this->canBeParsed($value, $column);
+	}
+
 	protected function isValidDate(string $dateString, string $format): bool {
 		try {
 			$dateTime = new DateTime($dateString);

lib/Service/ImportService.php

@@ -347,12 +347,12 @@ private function parseValueByColumnType(string $value, Column $column): string {
 			$businessClassName .= ucfirst($column->getType()) . ucfirst($column->getSubtype()) . 'Business';
 			/** @var IColumnTypeBusiness $columnBusiness */
 			$columnBusiness = Server::get($businessClassName);
-			if (!$columnBusiness->canBeParsed($value, $column)) {
+			if (!$columnBusiness->canBeParsedDisplayValue($value, $column)) {
 				$this->logger->warning('Value ' . $value . ' could not be parsed for column ' . $column->getTitle());
 				$this->countParsingErrors++;
 				return '';
 			}
-			return $columnBusiness->parseValue($value, $column);
+			return $columnBusiness->parseDisplayValue($value, $column);
 		} catch (NotFoundExceptionInterface|ContainerExceptionInterface $e) {
 			$this->logger->debug('Column type business class not found', ['exception' => $e]);
 		}