refactor: Refactor business column classes

lib/Helper/ColumnsHelper.php

@@ -9,6 +9,8 @@
 
 use OCA\Tables\Constants\UsergroupType;
 use OCA\Tables\Db\Column;
+use OCA\Tables\Service\ColumnTypes\IColumnTypeBusiness;
+use OCP\Server;
 
 class ColumnsHelper {
 
@@ -20,6 +22,11 @@ class ColumnsHelper {
 		Column::TYPE_USERGROUP,
 	];
 
+	/**
+	 * @var array<string, IColumnTypeBusiness>
+	 */
+	private array $columnBusinesses = [];
+
 	public function __construct(
 		private UserHelper $userHelper,
 		private CircleHelper $circleHelper,
@@ -79,4 +86,18 @@ public function resolveSearchValue(string $placeholder, string $userId, ?Column
 			default: return $placeholder;
 		}
 	}
+
+	public function getColumnBusiness(Column $column): IColumnTypeBusiness {
+		$cacheKey = implode(':', [$column->getType(), $column->getSubtype()]);
+		if (isset($this->columnBusinesses[$cacheKey])) {
+			return $this->columnBusinesses[$cacheKey];
+		}
+
+		$businessClassName = 'OCA\Tables\Service\ColumnTypes\\';
+		$businessClassName .= ucfirst($column->getType()) . ucfirst($column->getSubtype()) . 'Business';
+		/** @var IColumnTypeBusiness $columnBusiness */
+		$columnBusiness = Server::get($businessClassName);
+
+		return $this->columnBusinesses[$cacheKey] = $columnBusiness;
+	}
 }

lib/Service/ColumnTypes/DatetimeBusiness.php

@@ -11,14 +11,14 @@
 use Exception;
 use OCA\Tables\Db\Column;
 
-class DatetimeBusiness extends SuperBusiness implements IColumnTypeBusiness {
+class DatetimeBusiness extends SuperBusiness {
 
 	/**
 	 * @param mixed $value (string|null)
-	 * @param Column|null $column
+	 * @param Column $column
 	 * @return string
 	 */
-	public function parseValue($value, ?Column $column = null): string {
+	public function parseValue($value, Column $column): string {
 		if ($value === '' || $value === null) {
 			return '';
 		}
@@ -38,15 +38,15 @@ public function parseValue($value, ?Column $column = null): string {
 			$this->logger->debug('Could not parse format for datetime value', ['exception' => $e]);
 		}
 
-		return json_encode($newDateTime !== '' ? $newDateTime : '');
+		return json_encode($newDateTime);
 	}
 
 	/**
 	 * @param mixed $value (string|null)
-	 * @param Column|null $column
+	 * @param Column $column
 	 * @return bool
 	 */
-	public function canBeParsed($value, ?Column $column = null): bool {
+	public function canBeParsed($value, Column $column): bool {
 		if ($value === '' || $value === null) {
 			return true;
 		}

lib/Service/ColumnTypes/DatetimeDateBusiness.php

@@ -9,24 +9,23 @@
 
 use OCA\Tables\Db\Column;
 
-class DatetimeDateBusiness extends SuperBusiness implements IColumnTypeBusiness {
+class DatetimeDateBusiness extends SuperBusiness {
 
 	/**
 	 * @param mixed $value (string|null)
-	 * @param Column|null $column
+	 * @param Column $column
 	 * @return string
 	 */
-	public function parseValue($value, ?Column $column = null): string {
+	public function parseValue($value, Column $column): string {
 		return json_encode($this->isValidDate((string)$value, 'Y-m-d') ? (string)$value : '');
 	}
 
 	/**
 	 * @param mixed $value (string|null)
-	 * @param Column|null $column
+	 * @param Column $column
 	 * @return bool
 	 */
-	public function canBeParsed($value, ?Column $column = null): bool {
+	public function canBeParsed($value, Column $column): bool {
 		return $this->isValidDate((string)$value, 'Y-m-d');
 	}
-
 }

lib/Service/ColumnTypes/DatetimeTimeBusiness.php

@@ -9,23 +9,23 @@
 
 use OCA\Tables\Db\Column;
 
-class DatetimeTimeBusiness extends SuperBusiness implements IColumnTypeBusiness {
+class DatetimeTimeBusiness extends SuperBusiness {
 
 	/**
 	 * @param mixed $value (string|null)
-	 * @param Column|null $column
+	 * @param Column $column
 	 * @return string
 	 */
-	public function parseValue($value, ?Column $column = null): string {
+	public function parseValue($value, Column $column): string {
 		return json_encode($this->isValidDate((string)$value, 'H:i') ? $value : '');
 	}
 
 	/**
 	 * @param mixed $value (string|null)
-	 * @param Column|null $column
+	 * @param Column $column
 	 * @return bool
 	 */
-	public function canBeParsed($value, ?Column $column = null): bool {
+	public function canBeParsed($value, Column $column): bool {
 		return $this->isValidDate((string)$value, 'H:i');
 	}
 

lib/Service/ColumnTypes/IColumnTypeBusiness.php

@@ -20,19 +20,19 @@ interface IColumnTypeBusiness {
 	 * FIXME: Why is this not using Mapper methods which should do the same thing
 	 *
 	 * @param mixed $value
-	 * @param Column|null $column
+	 * @param Column $column
 	 * @return string value stringify
 	 */
-	public function parseValue($value, ?Column $column): string;
+	public function parseValue($value, Column $column): string;
 
 	/**
-	 * tests if the given value can be parsed to a value of the column type
+	 * Tests if the given value can be parsed to a value of the column type
 	 *
 	 * @param mixed $value
-	 * @param Column|null $column
+	 * @param Column $column
 	 * @return bool
 	 */
-	public function canBeParsed($value, ?Column $column): bool;
+	public function canBeParsed($value, Column $column): bool;
 
 	/**
 	 * @throws BadRequestError In case the value is not valid
@@ -44,20 +44,20 @@ public function canBeParsed($value, ?Column $column): bool;
 	public function validateValue(mixed $value, Column $column, string $userId, int $tableId, ?int $rowId): void;
 
 	/**
-	 * tests if the given string can be parsed to a value/id of the column type
+	 * Tests if the given string can be parsed to a value/id of the column type
 	 *
 	 * @param mixed $value
-	 * @param Column|null $column
+	 * @param Column $column
 	 * @return bool
 	 */
-	public function canBeParsedDisplayValue($value, ?Column $column): bool;
+	public function canBeParsedDisplayValue($value, Column $column): bool;
 
 	/**
-	 * parses the given string to a value/id of the column type
+	 * Parses the given string to a value/id of the column type
 	 *
 	 * @param mixed $value
-	 * @param Column|null $column
+	 * @param Column $column
 	 * @return string
 	 */
-	public function parseDisplayValue($value, ?Column $column): string;
+	public function parseDisplayValue($value, Column $column): string;
 }

lib/Service/ColumnTypes/NumberBusiness.php

@@ -9,14 +9,14 @@
 
 use OCA\Tables\Db\Column;
 
-class NumberBusiness extends SuperBusiness implements IColumnTypeBusiness {
+class NumberBusiness extends SuperBusiness {
 
 	/**
 	 * @param mixed $value (int|float|string|null)
-	 * @param Column|null $column
+	 * @param Column $column
 	 * @return string
 	 */
-	public function parseValue($value, ?Column $column = null): string {
+	public function parseValue($value, Column $column): string {
 		if ($value === null) {
 			return '';
 		}
@@ -26,10 +26,10 @@ public function parseValue($value, ?Column $column = null): string {
 
 	/**
 	 * @param mixed $value (int|float|string|null)
-	 * @param Column|null $column
+	 * @param Column $column
 	 * @return bool
 	 */
-	public function canBeParsed($value, ?Column $column = null): bool {
+	public function canBeParsed($value, Column $column): bool {
 		return !$value || floatval($value);
 	}
 

lib/Service/ColumnTypes/NumberProgressBusiness.php

@@ -9,23 +9,23 @@
 
 use OCA\Tables\Db\Column;
 
-class NumberProgressBusiness extends SuperBusiness implements IColumnTypeBusiness {
+class NumberProgressBusiness extends SuperBusiness {
 
 	/**
 	 * @param mixed $value (int|string|null)
-	 * @param Column|null $column
+	 * @param Column $column
 	 * @return string
 	 */
-	public function parseValue($value, ?Column $column = null): string {
+	public function parseValue($value, Column $column): string {
 		return json_encode((int)$value);
 	}
 
 	/**
 	 * @param mixed $value (int|string|null)
-	 * @param Column|null $column
+	 * @param Column $column
 	 * @return bool
 	 */
-	public function canBeParsed($value, ?Column $column = null): bool {
+	public function canBeParsed($value, Column $column): bool {
 		return !$value || ((int)$value >= 0 && (int)$value <= 100);
 	}
 

lib/Service/ColumnTypes/NumberStarsBusiness.php

@@ -9,23 +9,23 @@
 
 use OCA\Tables\Db\Column;
 
-class NumberStarsBusiness extends SuperBusiness implements IColumnTypeBusiness {
+class NumberStarsBusiness extends SuperBusiness {
 
 	/**
 	 * @param mixed $value (null|int|string)
-	 * @param Column|null $column
+	 * @param Column $column
 	 * @return string
 	 */
-	public function parseValue($value, ?Column $column = null): string {
+	public function parseValue($value, Column $column): string {
 		return json_encode((int)$value);
 	}
 
 	/**
 	 * @param mixed $value (null|int|string)
-	 * @param Column|null $column
+	 * @param Column $column
 	 * @return bool
 	 */
-	public function canBeParsed($value, ?Column $column = null): bool {
+	public function canBeParsed($value, Column $column): bool {
 		return !$value || in_array((int)$value, [0,1,2,3,4,5]);
 	}
 

lib/Service/ColumnTypes/SelectionBusiness.php

@@ -9,19 +9,14 @@
 
 use OCA\Tables\Db\Column;
 
-class SelectionBusiness extends SuperBusiness implements IColumnTypeBusiness {
+class SelectionBusiness extends SuperBusiness {
 
 	/**
 	 * @param mixed $value (array|string|null)
-	 * @param Column|null $column
+	 * @param Column $column
 	 * @return string
 	 */
-	public function parseValue($value, ?Column $column = null): string {
-		if (!$column) {
-			$this->logger->warning('No column given, but expected on ' . __FUNCTION__ . ' within ' . __CLASS__, ['exception' => new \Exception()]);
-			return '';
-		}
-
+	public function parseValue($value, Column $column): string {
 		$intValue = (int)$value;
 		if (!is_numeric($value) || $intValue != $value) {
 			return '';
@@ -36,12 +31,7 @@ public function parseValue($value, ?Column $column = null): string {
 		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 '';
-		}
-
+	public function parseDisplayValue($value, Column $column): string {
 		foreach ($column->getSelectionOptionsArray() as $option) {
 			if ($option['label'] === $value) {
 				return json_encode($option['id']);
@@ -53,14 +43,10 @@ public function parseDisplayValue($value, ?Column $column = null): string {
 
 	/**
 	 * @param mixed $value (array|string|null)
-	 * @param Column|null $column
+	 * @param Column $column
 	 * @return bool
 	 */
-	public function canBeParsed($value, ?Column $column = null): bool {
-		if (!$column) {
-			$this->logger->warning('No column given, but expected on ' . __FUNCTION__ . ' within ' . __CLASS__, ['exception' => new \Exception()]);
-			return false;
-		}
+	public function canBeParsed($value, Column $column): bool {
 		if ($value === null) {
 			return true;
 		}
@@ -79,11 +65,7 @@ public function canBeParsed($value, ?Column $column = null): bool {
 		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;
-		}
+	public function canBeParsedDisplayValue($value, Column $column): bool {
 		if ($value === null) {
 			return true;
 		}

lib/Service/ColumnTypes/SelectionCheckBusiness.php

@@ -9,31 +9,30 @@
 
 use OCA\Tables\Db\Column;
 
-class SelectionCheckBusiness extends SuperBusiness implements IColumnTypeBusiness {
+class SelectionCheckBusiness extends SuperBusiness {
 	public const PATTERN_POSITIVE = ['yes', '1', true, 1, 'true', 'TRUE'];
 	public const PATTERN_NEGATIVE = ['no', '0', false, 0, 'false', 'FALSE'];
 
 	/**
 	 * @param mixed $value
-	 * @param Column|null $column
+	 * @param Column $column
 	 * @return string
 	 */
-	public function parseValue($value, ?Column $column = null): string {
+	public function parseValue($value, Column $column): string {
 		$found = in_array($value, self::PATTERN_POSITIVE, true);
 		return json_encode($found ? 'true' : 'false');
 	}
 
 	/**
 	 * @param mixed $value
-	 * @param Column|null $column
+	 * @param Column $column
 	 * @return bool
 	 */
-	public function canBeParsed($value, ?Column $column = null): bool {
+	public function canBeParsed($value, Column $column): bool {
 		if ($value === null) {
 			return true;
 		}
 
 		return in_array($value, self::PATTERN_POSITIVE) || in_array($value, self::PATTERN_NEGATIVE) ;
 	}
-
 }