Merge pull request #209 from os2display/release/2.0.6

Release 2.0.6

Author: tuj

.github/workflows/php_upgrade.yaml

@@ -63,7 +63,12 @@ jobs:
           MYSQL_PASSWORD: db
           MYSQL_DATABASE: db_test
           MYSQL_ROOT_PASSWORD: password
-        options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3
+        # https://mariadb.org/mariadb-server-docker-official-images-healthcheck-without-mysqladmin/
+        options: >-
+            --health-cmd="healthcheck.sh --connect --innodb_initialized"
+            --health-interval=5s
+            --health-timeout=2s
+            --health-retries=3
     strategy:
       fail-fast: false
       matrix:

.github/workflows/pr.yaml

@@ -221,7 +221,12 @@ jobs:
           MYSQL_PASSWORD: db
           MYSQL_DATABASE: db_test
           MYSQL_ROOT_PASSWORD: password
-        options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3
+          # https://mariadb.org/mariadb-server-docker-official-images-healthcheck-without-mysqladmin/
+        options: >-
+          --health-cmd="healthcheck.sh --connect --innodb_initialized"
+          --health-interval=5s
+          --health-timeout=2s
+          --health-retries=3
     strategy:
       fail-fast: false
       matrix:

CHANGELOG.md

@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [2.0.6] - 2024-06-28
+
+- [#208](https://github.com/os2display/display-api-service/pull/208)
+  - Removed feed items from Notified where image returns 403.
+  - Fixed phpunit github actions healthcheck for mariadb.
+- [#207](https://github.com/os2display/display-api-service/pull/207)
+  - Fixed parameter not set error in (os2display) api container.
+
 ## [2.0.5] - 2024-05-21
 
 - [#206](https://github.com/os2display/display-api-service/pull/206)

composer.json

@@ -138,7 +138,7 @@
             "vendor/bin/phpunit --stop-on-failure"
         ],
         "test-setup": [
-            "bin/console cache:clear --env=test --no-debug",
+            "bin/console --env=test cache:clear --no-debug",
             "bin/console --env=test doctrine:database:drop --if-exists --force --quiet",
             "bin/console --env=test doctrine:database:create --no-interaction --if-not-exists --quiet",
             "bin/console --env=test doctrine:migrations:migrate --no-interaction --quiet"

infrastructure/os2display/display-api-service/Dockerfile

@@ -151,4 +151,5 @@ RUN chmod +x /usr/local/bin/docker-entrypoint.sh
 
 WORKDIR ${APP_PATH}
 
-CMD [ "docker-entrypoint.sh" ]
+CMD ["php-fpm"]
+ENTRYPOINT [ "docker-entrypoint.sh" ]

infrastructure/os2display/display-api-service/docker-entrypoint.sh

@@ -17,6 +17,6 @@ if [ "${1#-}" != "$1" ]; then
 fi
 
 ## Start the PHP FPM process.
-echo "Starting PHP 8.2 FPM"
+echo "Starting PHP 8.3 FPM"
 
-exec php-fpm "$@"
+exec "$@"

src/Feed/NotifiedFeedType.php

@@ -48,9 +48,23 @@ public function getData(Feed $feed): array
 
             $token = $secrets['token'];
 
-            $data = $this->getMentions($token, $pageSize, $configuration['feeds']);
+            $data = $this->getMentions($token, 1, $pageSize, $configuration['feeds']);
 
-            return array_map(fn (array $item) => $this->getFeedItemObject($item), $data);
+            $feedItems = array_map(fn (array $item) => $this->getFeedItemObject($item), $data);
+
+            $result = [];
+
+            // Check that image is accessible, otherwise leave out the feed element.
+            foreach ($feedItems as $feedItem) {
+                $response = $this->client->request(Request::METHOD_HEAD, $feedItem['mediaUrl']);
+                $statusCode = $response->getStatusCode();
+
+                if (200 == $statusCode) {
+                    $result[] = $feedItem;
+                }
+            }
+
+            return $result;
         } catch (\Throwable $throwable) {
             $this->logger->error('{code}: {message}', [
                 'code' => $throwable->getCode(),
@@ -115,11 +129,11 @@ public function getConfigOptions(Request $request, FeedSource $feedSource, strin
         return null;
     }
 
-    public function getMentions(string $token, int $pageSize = 10, array $searchProfileIds = []): array
+    public function getMentions(string $token, int $page = 1, int $pageSize = 10, array $searchProfileIds = []): array
     {
         $body = [
+            'page' => $page,
             'pageSize' => $pageSize,
-            'page' => 1,
             'searchProfileIds' => $searchProfileIds,
         ];
 

tests/Feed/NotifiedFeedTypeTest.php

@@ -48,6 +48,7 @@ public function testGetFeed(): void
         $response->method('toArray')->willReturn(
             NotifiedFeedTypeData::getData()
         );
+        $response->method('getStatusCode')->willReturn(200);
 
         $httpClientMock->method('request')->willReturn($response);