From 3503fcd6114f7e4ea61e77d0629f21864cb1f5e5 Mon Sep 17 00:00:00 2001
From: Vidar Langseid <vl@ibexa.co>
Date: Thu, 6 Jun 2024 11:43:30 +0200
Subject: [PATCH] fixup! IBX-6773: Bookmarks for non-accessible contents cause
 exception: Added BookmarkId sort clause

---
 .../Content/Query/SortClause/BookmarkId.php   | 29 ++++++++++++++++++
 .../Bookmark/IdSortClauseQueryBuilder.php     | 30 +++++++++++++++++++
 .../Core/Repository/BookmarkService.php       |  2 +-
 3 files changed, 60 insertions(+), 1 deletion(-)
 create mode 100644 eZ/Publish/API/Repository/Values/Content/Query/SortClause/BookmarkId.php
 create mode 100644 eZ/Publish/Core/Persistence/Legacy/Filter/SortClauseQueryBuilder/Bookmark/IdSortClauseQueryBuilder.php

diff --git a/eZ/Publish/API/Repository/Values/Content/Query/SortClause/BookmarkId.php b/eZ/Publish/API/Repository/Values/Content/Query/SortClause/BookmarkId.php
new file mode 100644
index 0000000000..7b32cfb456
--- /dev/null
+++ b/eZ/Publish/API/Repository/Values/Content/Query/SortClause/BookmarkId.php
@@ -0,0 +1,29 @@
+<?php
+
+/**
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
+ * @license For full copyright and license information view LICENSE file distributed with this source code.
+ */
+declare(strict_types=1);
+
+namespace eZ\Publish\API\Repository\Values\Content\Query\SortClause;
+
+use eZ\Publish\API\Repository\Values\Content\Query;
+use eZ\Publish\API\Repository\Values\Content\Query\SortClause;
+use eZ\Publish\SPI\Repository\Values\Filter\FilteringSortClause;
+
+/**
+ * Sets sort direction on the bookmark id for a location query containing a Bookmark criterion.
+ */
+class BookmarkId extends SortClause implements FilteringSortClause
+{
+    /**
+     * Constructs a new BookmarkId SortClause.
+     *
+     * @param string $sortDirection
+     */
+    public function __construct(string $sortDirection = Query::SORT_ASC)
+    {
+        parent::__construct('id', $sortDirection);
+    }
+}
diff --git a/eZ/Publish/Core/Persistence/Legacy/Filter/SortClauseQueryBuilder/Bookmark/IdSortClauseQueryBuilder.php b/eZ/Publish/Core/Persistence/Legacy/Filter/SortClauseQueryBuilder/Bookmark/IdSortClauseQueryBuilder.php
new file mode 100644
index 0000000000..06b20d2f63
--- /dev/null
+++ b/eZ/Publish/Core/Persistence/Legacy/Filter/SortClauseQueryBuilder/Bookmark/IdSortClauseQueryBuilder.php
@@ -0,0 +1,30 @@
+<?php
+
+/**
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
+ * @license For full copyright and license information view LICENSE file distributed with this source code.
+ */
+declare(strict_types=1);
+
+namespace eZ\Publish\Core\Persistence\Legacy\Filter\SortClauseQueryBuilder\Bookmark;
+
+use eZ\Publish\API\Repository\Values\Content\Query\SortClause\BookmarkId;
+use eZ\Publish\SPI\Persistence\Filter\Doctrine\FilteringQueryBuilder;
+use eZ\Publish\SPI\Repository\Values\Filter\FilteringSortClause;
+use eZ\Publish\SPI\Repository\Values\Filter\SortClauseQueryBuilder;
+
+class IdSortClauseQueryBuilder implements SortClauseQueryBuilder
+{
+    public function accepts(FilteringSortClause $sortClause): bool
+    {
+        return $sortClause instanceof BookmarkId;
+    }
+
+    public function buildQuery(
+        FilteringQueryBuilder $queryBuilder,
+        FilteringSortClause $sortClause
+    ): void {
+        /** @var \eZ\Publish\API\Repository\Values\Content\Query\SortClause $sortClause */
+        $queryBuilder->addOrderBy('bookmark.id', $sortClause->direction);
+    }
+}
diff --git a/eZ/Publish/Core/Repository/BookmarkService.php b/eZ/Publish/Core/Repository/BookmarkService.php
index 266d0d8fa5..bf9914289f 100644
--- a/eZ/Publish/Core/Repository/BookmarkService.php
+++ b/eZ/Publish/Core/Repository/BookmarkService.php
@@ -104,7 +104,7 @@ public function loadBookmarks(int $offset = 0, int $limit = 25): BookmarkList
         try {
             $filter
                 ->withCriterion(new Criterion\Bookmark($currentUserId))
-                ->withSortClause(new SortClause\DatePublished(Query::SORT_DESC))
+                ->withSortClause(new SortClause\BookmarkId(Query::SORT_DESC))
                 ->sliceBy($limit, $offset);
 
             $result = $this->repository->getlocationService()->find($filter, []);