Add previous and next links to posts (#115)

samwilson · Aug 28, 2021 · 4ae5c14 · 4ae5c14
1 parent c2615f7
commit 4ae5c14
Show file tree

Hide file tree

Showing 5 changed files with 101 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -67,6 +67,7 @@ jobs:
         fi
         echo DATABASE_URL=$DATABASE_URL > .env.test.local
         sudo apt-get update -q
+        sudo apt-get --fix-broken install
         sudo apt-get install -y exiftool
         composer install
         ./bin/console doctrine:migrations:migrate

diff --git a/src/Controller/PostController.php b/src/Controller/PostController.php
@@ -73,6 +73,8 @@ public function editPost(
             'contacts' => $contactRepository->findBy([], ['name' => 'ASC']),
             'max_filesize' => UploadedFile::getMaxFilesize(),
             'user_groups' => $userGroupRepository->findAll(),
+            'prev_post' => $postRepository->findPrevByDate($post, $this->getUser()),
+            'next_post' => $postRepository->findNextByDate($post, $this->getUser()),
         ]);
     }
 
@@ -285,6 +287,8 @@ public function viewPost($id, PostRepository $postRepository)
         }
         return $this->render('post/view.html.twig', [
             'post' => $post,
+            'prev_post' => $postRepository->findPrevByDate($post, $this->getUser()),
+            'next_post' => $postRepository->findNextByDate($post, $this->getUser()),
         ]);
     }
 

diff --git a/src/Repository/PostRepository.php b/src/Repository/PostRepository.php
@@ -11,6 +11,8 @@
 use DateTimeZone;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\ORM\AbstractQuery;
+use Doctrine\ORM\Query\Expr;
+use Doctrine\ORM\Query\Expr\OrderBy;
 use Doctrine\ORM\QueryBuilder;
 use Doctrine\Persistence\ManagerRegistry;
 use Exception;
@@ -162,6 +164,50 @@ public function getMonths($year, ?User $user = null): array
         return $months;
     }
 
+    public function findPrevByDate(Post $post, ?User $user = null): ?Post
+    {
+        $groupList = $user ? $user->getGroupIdList() : false;
+        if (!$groupList) {
+            $groupList = UserGroup::PUBLIC;
+        }
+        $qb = $this->createQueryBuilder('p');
+        $orderBy = new OrderBy();
+        $orderBy->add('p.date', 'DESC');
+        $orderBy->add('p.id', 'DESC');
+        $out = $qb
+            ->andWhere('p.view_group IN (' . $groupList . ')')
+            ->andWhere($qb->expr()->orX('p.date < :date', 'p.date = :date AND p.id < :id'))
+            ->setParameter('date', $post->getDate())
+            ->setParameter('id', $post->getId())
+            ->orderBy($orderBy)
+            ->setMaxResults(1)
+            ->getQuery()
+            ->getResult();
+        return $out[0] ?? null;
+    }
+
+    public function findNextByDate(Post $post, ?User $user = null): ?Post
+    {
+        $groupList = $user ? $user->getGroupIdList() : false;
+        if (!$groupList) {
+            $groupList = UserGroup::PUBLIC;
+        }
+        $qb = $this->createQueryBuilder('p');
+        $orderBy = new OrderBy();
+        $orderBy->add('p.date', 'ASC');
+        $orderBy->add('p.id', 'ASC');
+        $out = $qb
+            ->andWhere('p.view_group IN (' . $groupList . ')')
+            ->andWhere($qb->expr()->orX('p.date > :date', 'p.date = :date AND p.id > :id'))
+            ->setParameter('date', $post->getDate())
+            ->setParameter('id', $post->getId())
+            ->orderBy($orderBy)
+            ->setMaxResults(1)
+            ->getQuery()
+            ->getResult();
+        return $out[0] ?? null;
+    }
+
     public function findByDate($year, $month, User $user = null, int $pageNum = 1)
     {
         $pageSize = 10;

diff --git a/templates/post/view.html.twig b/templates/post/view.html.twig
@@ -44,6 +44,23 @@
                 <span class="url">URL: <a href="{{ post.url }}">{{ post.url }}</a></span>
             {% endif %}
         </p>
+        <nav>
+            <span class="prev-post">
+                {% if prev_post %}
+                    <a rel="prev" href="{{ path('post_view', {id:prev_post.id}) }}">&larr; Previous</a>
+                {% else %}
+                    &larr; Previous
+                {% endif %}
+            </span>
+            &middot;
+            <span class="next-post">
+                {% if next_post %}
+                    <a rel="prev" href="{{ path('post_view', {id:next_post.id}) }}">Next &rarr;</a>
+                {% else %}
+                    Next &rarr;
+                {% endif %}
+            </span>
+        </nav>
 
             {% if is_granted('ROLE_ADMIN') %}
                 <p>

diff --git a/tests/Repository/PostRepositoryTest.php b/tests/Repository/PostRepositoryTest.php
@@ -12,6 +12,7 @@
 use App\Repository\UserRepository;
 use App\Tests\Repository\RepositoryTestBase;
 use CrEOF\Spatial\PHP\Types\Geometry\Point;
+use DateTime;
 use Symfony\Bridge\PhpUnit\ClockMock;
 use Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
@@ -29,6 +30,17 @@ protected function setUp(): void
         $this->postRepo = self::$container->get(PostRepository::class);
     }
 
+    private function getTestPost(): Post
+    {
+        $post = $this->postRepo->createNew();
+        $this->entityManager->persist($post);
+        $author = new Contact();
+        $author->setName('Bob');
+        $this->entityManager->persist($author);
+        $post->setAuthor($author);
+        return $post;
+    }
+
     public function testAuthor()
     {
         // Test author.
@@ -116,12 +128,7 @@ public function provideSaveFromRequest()
 
     public function testFile()
     {
-        $post = $this->postRepo->createNew();
-        $this->entityManager->persist($post);
-        $author = new Contact();
-        $author->setName('Bob');
-        $this->entityManager->persist($author);
-        $post->setAuthor($author);
+        $post = $this->getTestPost();
 
         $file = new File();
         $file->setSize(100);
@@ -192,4 +199,24 @@ public function testAbortedSave()
         }
         $this->assertNull($post2->getId());
     }
+
+    public function testNextAndPrevPosts()
+    {
+        $post1 = $this->getTestPost();
+        $post2 = $this->getTestPost();
+        $post3 = $this->getTestPost();
+        $post1->setDate(new DateTime('2021-08-24 12:00:00'));
+        $post2->setDate(new DateTime('2021-08-24 13:00:00'));
+        $post3->setDate(new DateTime('2021-08-24 13:00:00'));
+        $this->entityManager->persist($post1);
+        $this->entityManager->persist($post2);
+        $this->entityManager->persist($post3);
+        $this->entityManager->flush();
+        $this->assertSame($post2, $this->postRepo->findNextByDate($post1));
+        $this->assertSame($post3, $this->postRepo->findNextByDate($post2));
+        $this->assertNull($this->postRepo->findNextByDate($post3));
+        $this->assertNull($this->postRepo->findPrevByDate($post1));
+        $this->assertSame($post1, $this->postRepo->findPrevByDate($post2));
+        $this->assertSame($post2, $this->postRepo->findPrevByDate($post3));
+    }
 }