1859: Fixed merge

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

@@ -8,6 +8,23 @@ All notable changes to this project will be documented in this file.
   - Adds support for interactive slides.
   - Adds interactivity for creating quick bookings from a slide through Microsoft Graph.
   - Adds KeyVaultService that can serve key-value entries from the environment for storing secrets.
+
+## [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)
+  - Added support for Notified (Instagram) feed as replacement for SparkleIOFeedType.
+  - Deprecated SparkleIOFeedType. (getsparkle.io has shut down)
+
+## [2.0.4] - 2024-04-25
+
 - [#204](https://github.com/os2display/display-api-service/pull/204)
   - Ensured real ip is logged in nginx.
 - [#200](https://github.com/os2display/display-api-service/pull/200)

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"

fixtures/feed.yaml

@@ -7,3 +7,12 @@ App\Entity\Tenant\Feed:
     createdAt (unique): '<dateTimeBetween("-2 years", "-2 days")>'
     modifiedAt: '<dateTimeBetween($createdAt, "-1 days")>'
     id: '<ulid($createdAt)>'
+  feed_abc_notified:
+    feedSource: '@feed_source_abc_notified'
+    slide: '@slide_abc_notified'
+    tenant: '@tenant_abc'
+    createdAt (unique): '<dateTimeBetween("-2 years", "-2 days")>'
+    modifiedAt: '<dateTimeBetween($createdAt, "-1 days")>'
+    id: '<ulid($createdAt)>'
+    configuration:
+      feeds: [12345]

fixtures/feed_source.yaml

@@ -3,7 +3,7 @@ App\Entity\Tenant\FeedSource:
   feed (template):
     description: <text()>
     feedType: "App\\Feed\\RssFeedType"
-    secrets: []
+    secrets: [ ]
     supportedFeedOutputType: 'rss'
     createdAt (unique): '<dateTimeBetween("-2 years", "-2 days")>'
     modifiedAt: '<dateTimeBetween($createdAt, "-1 days")>'
@@ -14,3 +14,10 @@ App\Entity\Tenant\FeedSource:
   feed_source_xyz_2 (extends feed):
     title: 'feed_source_xyz_2'
     tenant: '@tenant_xyz'
+  feed_source_abc_notified (extends feed):
+    title: 'feed_source_abc_notified'
+    feedType: "App\\Feed\\RssFeedType"
+    secrets:
+      token: '1234567890'
+    supportedFeedOutputType: 'instagram'
+    tenant: '@tenant_abc'

fixtures/slide.yaml

@@ -13,12 +13,12 @@ App\Entity\Tenant\Slide:
     theme: '@theme_abc_1'
     feed: '@feed_abc_1'
     tenant: '@tenant_abc'
-    media: [ '@media_abc_*', '@media_abc_*', '@media_abc_*']
+    media: [ '@media_abc_*', '@media_abc_*', '@media_abc_*' ]
   slide_abc_{2..60} (extends slide):
     title: 'slide_abc_<current()>'
     theme: '@theme_abc_*'
     tenant: '@tenant_abc'
-    media: [ '@media_abc_*', '@media_abc_*', '@media_abc_*']
+    media: [ '@media_abc_*', '@media_abc_*', '@media_abc_*' ]
   slide_def_shared_to_abc (extends slide):
     title: 'slide_def_shared_to_abc'
     theme: '@theme_def'
@@ -28,3 +28,9 @@ App\Entity\Tenant\Slide:
     title: 'slide_xyz_<current()>'
     theme: '@theme_xyz'
     tenant: '@tenant_xyz'
+  slide_abc_notified (extends slide):
+    title: 'slide_abc_notified'
+    template: '@template_notified'
+    content:
+      maxEntries: 6
+    tenant: '@tenant_abc'

fixtures/template.yaml

@@ -7,3 +7,10 @@ App\Entity\Template:
     createdAt (unique): '<dateTimeBetween("-2 years", "-2 days")>'
     modifiedAt: '<dateTimeBetween($createdAt, "-1 days")>'
     id: '<ulid($createdAt)>'
+  template_notified:
+    title: 'template_notified'
+    description: A template with different that serves notified data
+    resources: <templateResources()>
+    createdAt (unique): '<dateTimeBetween("-2 years", "-2 days")>'
+    modifiedAt: '<dateTimeBetween($createdAt, "-1 days")>'
+    id: '<ulid($createdAt)>'

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 "$@"