✨ Item: add sharer display name in findEntities

Signed-off-by: Marco Nassabain <marco.nassabain@hotmail.com>

1 files changed, 36 insertions, 1 deletions

diff --git a/lib/Db/ItemMapperV2.php b/lib/Db/ItemMapperV2.php
index 44d1740cd..c6c969e01 100644
--- a/lib/Db/ItemMapperV2.php
+++ b/lib/Db/ItemMapperV2.php
@@ -22,6 +22,7 @@ use OCP\AppFramework\Db\MultipleObjectsReturnedException;
 use OCP\DB\Exception as DBException;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IDBConnection;
+use OCP\IUserManager;
 
 /**
  * Class ItemMapper
@@ -33,14 +34,48 @@ class ItemMapperV2 extends NewsMapperV2
     const TABLE_NAME = 'news_items';
 
     /**
+     * @var IUserManager
+     */
+    private $userManager;
+
+    /**
      * ItemMapper constructor.
      *
      * @param IDBConnection $db
      * @param Time          $time
      */
-    public function __construct(IDBConnection $db, Time $time)
+    public function __construct(IDBConnection $db, Time $time, IUserManager $userManager)
     {
         parent::__construct($db, $time, Item::class);
+        $this->userManager = $userManager;
+    }
+
+    /**
+	 * Override parent constructor to insert sharer display names for shared items
+	 *
+	 * @param IQueryBuilder $query
+	 * @return Entity[] all fetched entities
+	 */
+    public function findEntities(IQueryBuilder $query): array {
+        $entities = parent::findEntities($query);
+
+        foreach ($entities as $entity) {
+            $sharedBy = $entity->getSharedBy();
+            $sharedByDisplayName = null;
+
+            // Get user display name
+            if (!is_null($sharedBy)) {
+                $user = $this->userManager->get($sharedBy);
+                if (!is_null($user)) {
+                    $sharedByDisplayName = $user->getDisplayName();
+                }
+            }
+
+            // Set sharer display name
+            $entity->setSharedByDisplayName($sharedByDisplayName);
+        }
+
+        return $entities;
     }
 
     /**