Sort shares by type

Signed-off-by: dartcafe <github@dartcafe.de>

1 files changed, 18 insertions, 5 deletions

diff --git a/lib/Service/ShareService.php b/lib/Service/ShareService.php
index 4fdbffa9..a5891cc5 100644
--- a/lib/Service/ShareService.php
+++ b/lib/Service/ShareService.php
@@ -71,6 +71,9 @@ class ShareService {
 	/** @var Share */
 	private $share;
 
+	/** @var array */
+	private $shares = [];
+
 	/** @var MailService */
 	private $mailService;
 
@@ -118,23 +121,34 @@ class ShareService {
 	public function list(int $pollId): array {
 		try {
 			$this->acl->setPollId($pollId, Acl::PERMISSION_POLL_EDIT);
-			$shares = $this->shareMapper->findByPoll($pollId);
+			$this->shares = $this->shareMapper->findByPoll($pollId);
 		} catch (NotAuthorizedException $e) {
 			return [];
 		} catch (DoesNotExistException $e) {
 			return [];
 		}
+		$this->sortByCategory();
+		return $this->shares;
+	}
 
-		return $shares;
+	private function sortByCategory() : void {
+		$sortedShares = [];
+		foreach (Share::TYPE_SORT_ARRAY as $shareType) {
+			$filteredShares = array_filter($this->shares, function($share) use ($shareType) {
+				return $share->getType() === $shareType;
+			});
+			$sortedShares = array_merge($sortedShares, $filteredShares);
+		}
+		$this->shares = $sortedShares;
 	}
 
 	/**
 	 * Validate share
 	 */
-	private function validate():void {
+	private function validate() : void {
 		switch ($this->share->getType()) {
 			case Share::TYPE_PUBLIC:
-				// public shares are alway valid
+				// public shares are always valid
 				break;
 			case Share::TYPE_USER:
 				if ($this->share->getUserId() !== $this->userId) {
@@ -156,7 +170,6 @@ class ShareService {
 				if (!$this->groupManager->isInGroup($this->share->getUserId(), $this->userId)) {
 					throw new NotAuthorizedException;
 				}
-
 				break;
 			case Share::TYPE_EMAIL:
 				break;