Move ProfileFieldRepository::updateCollectionFromForm()

src/Profile/ProfileField/Collection/ProfileFields.php

@@ -22,14 +22,20 @@
 namespace Friendica\Profile\ProfileField\Collection;
 
 use Friendica\BaseCollection;
+use Friendica\Profile\ProfileField\Entity;
 
 class ProfileFields extends BaseCollection
 {
+	public function current(): Entity\ProfileField
+	{
+		return parent::current();
+	}
+
 	/**
 	 * @param callable $callback
 	 * @return ProfileFields
 	 */
-	public function map(callable $callback)
+	public function map(callable $callback): self
 	{
 		return parent::map($callback);
 	}
@@ -39,7 +45,7 @@ class ProfileFields extends BaseCollection
 	 * @param int           $flag
 	 * @return ProfileFields
 	 */
-	public function filter(callable $callback = null, int $flag = 0)
+	public function filter(callable $callback = null, int $flag = 0): self
 	{
 		return parent::filter($callback, $flag);
 	}

src/Profile/ProfileField/Depository/ProfileField.php

@@ -5,6 +5,8 @@ namespace Friendica\Profile\ProfileField\Depository;
 use Friendica\BaseDepository;
 use Friendica\Database\Database;
 use Friendica\Network\HTTPException\NotFoundException;
+use Friendica\Profile\ProfileField\Exception\ProfileFieldNotFoundException;
+use Friendica\Profile\ProfileField\Exception\ProfileFieldPersistenceException;
 use Friendica\Profile\ProfileField\Factory;
 use Friendica\Profile\ProfileField\Entity;
 use Friendica\Profile\ProfileField\Collection;
@@ -25,23 +27,57 @@ class ProfileField extends BaseDepository
 	{
 		parent::__construct($database, $logger, $factory);
 
-		$this->permissionSetDepository = $this->permissionSetDepository;
+		$this->permissionSetDepository = permissionSetDepository;
 	}
 
 	/**
 	 * @param array $condition
 	 * @param array $params
 	 * @return Entity\ProfileField
-	 * @throws NotFoundException
+	 * @throws ProfileFieldNotFoundException
 	 */
 	private function selectOne(array $condition, array $params = []): Entity\ProfileField
 	{
-		return parent::_selectOne($condition, $params);
+		try {
+			return parent::_selectOne($condition, $params);
+		} catch (NotFoundException $exception) {
+			throw new ProfileFieldNotFoundException($exception->getMessage());
+		}
 	}
 
+	/**
+	 * @param array $condition
+	 * @param array $params
+	 *
+	 * @return Collection\ProfileFields
+	 *
+	 * @throws ProfileFieldPersistenceException In case of underlying persistence exceptions
+	 */
 	private function select(array $condition, array $params = []): Collection\ProfileFields
 	{
-		return new Collection\ProfileFields(parent::_select($condition, $params)->getArrayCopy());
+		try {
+			return new Collection\ProfileFields(parent::_select($condition, $params)->getArrayCopy());
+		} catch (\Exception $exception) {
+			throw new ProfileFieldPersistenceException('Cannot select ProfileFields', $exception);
+		}
+	}
+
+	/**
+	 * Converts a given ProfileField into a DB compatible row array
+	 *
+	 * @param Entity\ProfileField $profileField
+	 *
+	 * @return array
+	 */
+	protected function convertToTableRow(Entity\ProfileField $profileField): array
+	{
+		return [
+			'label'   => $profileField->label,
+			'value'   => $profileField->value,
+			'order'   => $profileField->order,
+			'created' => $profileField->created,
+			'edited'  => $profileField->edited,
+		];
 	}
 
 	/**
@@ -50,26 +86,36 @@ class ProfileField extends BaseDepository
 	 * @param int $uid the user id
 	 *
 	 * @return Collection\ProfileFields
+	 *
+	 * @throws ProfileFieldPersistenceException In case of underlying persistence exceptions
 	 */
 	public function selectPublicFieldsByUserId(int $uid): Collection\ProfileFields
 	{
-		return $this->select([
-			'uid'  => $uid,
-			'psid' => PermissionSetDepository::PUBLIC,
-		]);
+		try {
+			return $this->select([
+				'uid'  => $uid,
+				'psid' => PermissionSetDepository::PUBLIC,
+			]);
+		} catch (\Exception $exception) {
+			throw new ProfileFieldPersistenceException(sprintf('Cannot select public ProfileField for user "%d"', $uid), $exception);
+		}
 	}
 
 	/**
 	 * @param int $uid Field owner user Id
 	 *
-	 * @throws \Exception
+	 * @throws ProfileFieldPersistenceException In case of underlying persistence exceptions
 	 */
 	public function selectByUserId(int $uid): Collection\ProfileFields
 	{
-		return $this->select(
-			['uid' => $uid],
-			['order' => ['order']]
-		);
+		try {
+			return $this->select(
+				['uid' => $uid],
+				['order' => ['order']]
+			);
+		} catch (\Exception $exception) {
+			throw new ProfileFieldPersistenceException(sprintf('Cannot select ProfileField for user "%d"', $uid), $exception);
+		}
 	}
 
 	/**
@@ -94,4 +140,103 @@ class ProfileField extends BaseDepository
 			['order' => ['order']]
 		);
 	}
+
+	/**
+	 * @param int $id
+	 *
+	 * @return Entity\ProfileField
+	 *
+	 * @ProfileFieldNotFoundException In case there is no ProfileField found
+	 */
+	public function selectOnyById(int $id): Entity\ProfileField
+	{
+		try {
+			return $this->selectOne(['id' => $id]);
+		} catch (\Exception $exception) {
+			throw new ProfileFieldNotFoundException(sprintf('Cannot find Profile "%s"', $id), $exception);
+		}
+	}
+
+	/**
+	 * Delets a whole collection of ProfileFields
+	 *
+	 * @param Collection\ProfileFields $profileFields
+	 *
+	 * @return bool
+	 * @throws ProfileFieldPersistenceException in case the persistence layer cannot delete the ProfileFields
+	 */
+	public function deleteCollection(Collection\ProfileFields $profileFields): bool
+	{
+		try {
+			return $this->db->delete(self::$table_name, ['id' => $profileFields->column('id')]);
+		} catch (\Exception $exception) {
+			throw new ProfileFieldPersistenceException('Cannot delete ProfileFields', $exception);
+		}
+	}
+
+	/**
+	 * @param Entity\ProfileField $profileField
+	 *
+	 * @return Entity\ProfileField
+	 * @throws ProfileFieldPersistenceException in case the persistence layer cannot save the ProfileField
+	 */
+	public function save(Entity\ProfileField $profileField): Entity\ProfileField
+	{
+		$fields = $this->convertToTableRow($profileField);
+
+		try {
+			if ($profileField->id) {
+				$this->db->update(self::$table_name, $fields, ['id' => $profileField]);
+			} else {
+				$this->db->insert(self::$table_name, $fields);
+
+				$profileField = $this->selectOnyById($this->db->lastInsertId());
+			}
+		} catch (\Exception $exception) {
+			throw new ProfileFieldPersistenceException(sprintf('Cannot save ProfileField with id "%d" and label "%s"', $profileField->id, $profileField->label), $exception);
+		}
+
+		return $profileField;
+	}
+
+	public function saveCollectionForUser(int $uid, Collection\ProfileFields $profileFields): Collection\ProfileFields
+	{
+		$savedProfileFields = new Collection\ProfileFields();
+
+		$profileFieldsOld = $this->selectByUserId($uid);
+
+		// Prunes profile field whose label has been emptied
+		$labels                 = $profileFields->column('label');
+		$prunedProfileFieldsOld = $profileFieldsOld->filter(function (Entity\ProfileField $profileFieldOld) use ($labels) {
+			return array_search($profileFieldOld->label, $labels) === false;
+		});
+		$this->deleteCollection($prunedProfileFieldsOld);
+
+		// Update the order based on the new Profile Field Collection
+		$order                 = 0;
+		$labelProfileFieldsOld = $profileFieldsOld->column('id', 'label');
+
+		foreach ($profileFields as $profileField) {
+			// Update existing field (preserve
+			if (array_key_exists($profileField->label, $labelProfileFieldsOld)) {
+				$profileFieldOldId = $labelProfileFieldsOld[$profileField->label];
+				/** @var Entity\ProfileField $foundProfileFieldOld */
+				$foundProfileFieldOld = $profileFieldsOld[$profileFieldOldId];
+				$foundProfileFieldOld->update(
+					$profileField->value,
+					$order,
+					$profileField->permissionSet
+				);
+
+				$savedProfileFields->append($this->save($foundProfileFieldOld));
+			} else {
+				$profileField->setOrder($order);
+				$savedProfileFields->append($this->save($profileField));
+			}
+
+			$order++;
+		}
+
+		return $savedProfileFields;
+	}
 }

src/Profile/ProfileField/Entity/ProfileField.php

@@ -22,6 +22,9 @@
 namespace Friendica\Profile\ProfileField\Entity;
 
 use Friendica\BaseEntity;
+use Friendica\Network\HTTPException\InternalServerErrorException;
+use Friendica\Network\HTTPException\NotFoundException;
+use Friendica\Profile\ProfileField\Exception\ProfileFieldNotFoundException;
 use Friendica\Profile\ProfileField\Exception\UnexpectedPermissionSetException;
 use Friendica\Security\PermissionSet\Depository\PermissionSet as PermissionSetDepository;
 use Friendica\Security\PermissionSet\Entity\PermissionSet;
@@ -65,9 +68,10 @@ class ProfileField extends BaseEntity
 	/** @var \DateTime */
 	protected $edited;
 
-	public function __construct(PermissionSetDepository $permissionSetDepository, int $uid, int $order, int $permissionSetId, string $label, string $value, \DateTime $created, \DateTime $edited, int $id = null)
+	public function __construct(PermissionSetDepository $permissionSetDepository, int $uid, int $order, int $permissionSetId, string $label, string $value, \DateTime $created, \DateTime $edited, int $id = null, PermissionSet $permissionSet = null)
 	{
 		$this->permissionSetDepository = $permissionSetDepository;
+		$this->permissionSet           = $permissionSet;
 
 		$this->uid     = $uid;
 		$this->order   = $order;
@@ -79,26 +83,65 @@ class ProfileField extends BaseEntity
 		$this->id      = $id;
 	}
 
+	/**
+	 * @throws ProfileFieldNotFoundException
+	 * @throws UnexpectedPermissionSetException
+	 */
 	public function __get($name)
 	{
 		switch ($name) {
 			case 'permissionSet':
 				if (empty($this->permissionSet)) {
-					$permissionSet = $this->permissionSetDepository->selectOneById($this->psid, $this->uid);
-					if ($permissionSet->uid !== $this->uid) {
-						throw new UnexpectedPermissionSetException(sprintf('PermissionSet %d (user-id: %d) for ProfileField %d (user-id: %d) is invalid.', $permissionSet->id, $permissionSet->uid, $this->id, $this->uid));
-					}
+					try {
+						$permissionSet = $this->permissionSetDepository->selectOneById($this->psid, $this->uid);
+						if ($permissionSet->uid !== $this->uid) {
+							throw new UnexpectedPermissionSetException(sprintf('PermissionSet %d (user-id: %d) for ProfileField %d (user-id: %d) is invalid.', $permissionSet->id, $permissionSet->uid, $this->id, $this->uid));
+						}
 
-					$this->permissionSet = $permissionSet;
+						$this->permissionSet = $permissionSet;
+					} catch (NotFoundException $exception) {
+						throw new UnexpectedPermissionSetException(sprintf('No PermissionSet found for ProfileField %d (user-id: %d).', $this->id, $this->uid));
+					}
 				}
 
 				$return = $this->permissionSet;
 				break;
 			default:
-				$return = parent::__get($name);
+				try {
+					$return = parent::__get($name);
+				} catch (InternalServerErrorException $exception) {
+					throw new ProfileFieldNotFoundException($exception->getMessage());
+				}
 				break;
 		}
 
 		return $return;
 	}
+
+	/**
+	 * Updates a ProfileField
+	 *
+	 * @param string        $value         The current or changed value
+	 * @param int           $order         The current or changed order
+	 * @param PermissionSet $permissionSet The current or changed PermissionSet
+	 */
+	public function update(string $value, int $order, PermissionSet $permissionSet)
+	{
+		$this->value         = $value;
+		$this->order         = $order;
+		$this->permissionSet = $permissionSet;
+		$this->psid          = $permissionSet->id;
+		$this->edited        = new \DateTime('now', new \DateTimeZone('UTC'));
+	}
+
+	/**
+	 * Sets the order of the ProfileField
+	 *
+	 * @param int $order
+	 */
+	public function setOrder(int $order)
+	{
+		$this->order  = $order;
+		$this->edited = new \DateTime('now', new \DateTimeZone('UTC'));
+	}
 }

src/Profile/ProfileField/Exception/ProfileFieldNotFoundException.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace Friendica\Profile\ProfileField\Exception;
+
+use OutOfBoundsException;
+use Throwable;
+
+class ProfileFieldNotFoundException extends OutOfBoundsException
+{
+	public function __construct($message = "", Throwable $previous = null)
+	{
+		parent::__construct($message, 404, $previous);
+	}
+}

src/Profile/ProfileField/Exception/ProfileFieldPersistenceException.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Friendica\Profile\ProfileField\Exception;
+
+use Throwable;
+
+class ProfileFieldPersistenceException extends \RuntimeException
+{
+	public function __construct($message = "", Throwable $previous = null)
+	{
+		parent::__construct($message, 500, $previous);
+	}
+}

src/Profile/ProfileField/Factory/ProfileField.php

@@ -6,6 +6,7 @@ use Friendica\BaseFactory;
 use Friendica\Security\PermissionSet\Depository\PermissionSet as PermissionSetDepository;
 use Friendica\Profile\ProfileField\Entity;
 use Friendica\Capabilities\ICanCreateFromTableRow;
+use Friendica\Security\PermissionSet\Entity\PermissionSet;
 use Psr\Log\LoggerInterface;
 
 class ProfileField extends BaseFactory implements ICanCreateFromTableRow
@@ -23,7 +24,7 @@ class ProfileField extends BaseFactory implements ICanCreateFromTableRow
 	/**
 	 * @inheritDoc
 	 */
-	public function createFromTableRow(array $row): Entity\ProfileField
+	public function createFromTableRow(array $row, PermissionSet $permissionSet = null): Entity\ProfileField
 	{
 		return new Entity\ProfileField(
 			$this->permissionSetDepository,
@@ -32,8 +33,26 @@ class ProfileField extends BaseFactory implements ICanCreateFromTableRow
 			$row['psid'],
 			$row['label'],
 			$row['value'],
-			new \DateTime($row['created'], new \DateTimeZone('UTC')),
-			new \DateTime($row['edited'] ?? 'now', new \DateTimeZone('UTC'))
+			new \DateTime($row['created'] ?? 'now', new \DateTimeZone('UTC')),
+			new \DateTime($row['edited'] ?? 'now', new \DateTimeZone('UTC')),
+			$row['id'],
+			$permissionSet
 		);
 	}
+
+	public function createFromString(
+		int $uid,
+		int $order,
+		string $label,
+		string $value,
+		PermissionSet $permissionSet
+	): Entity\ProfileField {
+		return $this->createFromTableRow([
+			'uid'   => $uid,
+			'order' => $order,
+			'psid'  => $permissionSet->id,
+			'label' => $label,
+			'value' => $value,
+		], $permissionSet);
+	}
 }