Merge pull request afup#1514 from Mopolo/planete-php-add-header

[Planete PHP] Correction d'un header et ajout d'un autre
stakovicz · Jul 7, 2024 · 78985ab · 78985ab
2 parents 1fec830 + 4cf694f
commit 78985ab
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/sources/AppBundle/Controller/Planete/ArticlesController.php b/sources/AppBundle/Controller/Planete/ArticlesController.php
@@ -28,7 +28,7 @@ public function __invoke(Request $request): Response
             $page = 1;
         }
 
-        $totalCount = $this->feedArticleRepository->count();
+        $totalCount = $this->feedArticleRepository->countRelevant();
         $articles = $this->feedArticleRepository->findLatest($page - 1, DATE_RSS, $perPage);
 
         $data = [];
@@ -54,6 +54,7 @@ public function __invoke(Request $request): Response
                 'Content-Type' => 'application/json',
                 'X-Pagination-Total' => $totalCount,
                 'X-Pagination-Per-Page' => $perPage,
+                'X-Pagination-Has-Next-Page' => json_encode($totalCount > $page * $perPage),
             ]
         );
     }

diff --git a/sources/PlanetePHP/FeedArticleRepository.php b/sources/PlanetePHP/FeedArticleRepository.php
@@ -31,6 +31,15 @@ public function count(): int
         return intval($query->fetchColumn());
     }
 
+    public function countRelevant(): int
+    {
+        $query = $this->connection->prepare('SELECT COUNT(b.id) FROM afup_planete_billet b WHERE b.etat = :status');
+        $query->bindValue('status', self::RELEVANT);
+        $query->execute();
+
+        return intval($query->fetchColumn());
+    }
+
     /**
      * @param string $sort
      * @param string $direction

diff --git a/tests/behat/features/Api/PlanetePHPApi.feature b/tests/behat/features/Api/PlanetePHPApi.feature
@@ -4,8 +4,9 @@ Feature: PlanetePHP API routes
     Given I am on "/planete-php-api/articles"
     Then the response status code should be 200
     And the response header "Content-Type" should equal "application/json"
-    And the response header "X-Pagination-Total" should equal 23
+    And the response header "X-Pagination-Total" should equal 22
     And the response header "X-Pagination-Per-Page" should equal 20
+    And the response header "X-Pagination-Has-Next-Page" should equal true
     And the json response has the key "title" with value "Un titre"
     And the json response has the key "url" with value "https:\/\/afup.org\/url.html"
     And the json response has the key "author" with value "Un super auteur"
@@ -15,8 +16,9 @@ Feature: PlanetePHP API routes
     Given I am on "/planete-php-api/articles?page=2"
     Then the response status code should be 200
     And the response header "Content-Type" should equal "application/json"
-    And the response header "X-Pagination-Total" should equal 23
+    And the response header "X-Pagination-Total" should equal 22
     And the response header "X-Pagination-Per-Page" should equal 20
+    And the response header "X-Pagination-Has-Next-Page" should equal false
     And the json response has the key "title" with value "Un titre 18"
     And the json response has the key "url" with value "https:\/\/afup.org\/url-18.html"
     And the json response has the key "author" with value "Un super auteur 18"