2533: Fixed merge

Author: tuj

.env

@@ -103,3 +103,8 @@ CALENDAR_API_FEED_SOURCE_DATE_FORMAT=
 CALENDAR_API_FEED_SOURCE_DATE_TIMEZONE=
 CALENDAR_API_FEED_SOURCE_CACHE_EXPIRE_SECONDS=300
 ###< Calendar Api Feed Source ###
+
+EVENTDATABASE_API_V2_CACHE_EXPIRE_SECONDS=300
+
+TRACK_SCREEN_INFO=false
+TRACK_SCREEN_INFO_UPDATE_INTERVAL_SECONDS=300

CHANGELOG.md

@@ -6,6 +6,32 @@ All notable changes to this project will be documented in this file.
 
 - [#226](https://github.com/os2display/display-api-service/pull/226)
   - Added Colibo feed type.
+
+## [2.4.0] - 2025-03-31
+
+- [#238](https://github.com/os2display/display-api-service/pull/238)
+  - Added screen status to infrastructure.
+- [#232](https://github.com/os2display/display-api-service/pull/232)
+  - Updated user emails in readme.
+- [#227](https://github.com/os2display/display-api-service/pull/227)
+  - Added screen status to cache and endpoint for exposing screen status.
+
+## [2.3.0] - 2025-03-24
+
+- [#235](https://github.com/os2display/display-api-service/pull/234)
+  - Fixed Eventdatabasen v2 subscription data order by using occurrences endpoint.
+- [#236](https://github.com/os2display/display-api-service/pull/236)
+  - Fixed bug where no media url made Notified feed crash.
+- [#231](https://github.com/os2display/display-api-service/pull/231)
+  - Adds new feed source: Eventdatabasen v2.
+- [#233](https://github.com/os2display/display-api-service/pull/233)
+  - Added calendar api feed source tests for modifiers.
+  - Changed to use PCRE pattern instead of custom pattern building and fixed modifier bugs for calendar api feed source.
+
+## [2.2.0] - 2025-03-17
+
+- [#229](https://github.com/os2display/display-api-service/pull/229)
+  - Adds options to set paths to component and admin files from path to the json config file.
 - [#225](https://github.com/os2display/display-api-service/pull/225)
   - Added ADRs.
 - [#215](https://github.com/os2display/display-api-service/pull/215)
@@ -18,6 +44,11 @@ All notable changes to this project will be documented in this file.
   - Adds create, update, delete operations to feed-source endpoint.
   - Adds data validation for feed source.
 
+## [2.1.4] - 2025-01-14
+
+- [#230](https://github.com/os2display/display-api-service/pull/230)
+  - Adds options to set paths to component and admin files from path to the json config file.
+
 ## [2.1.3] - 2024-10-25
 
 - [#220](https://github.com/os2display/display-api-service/pull/220)

README.md

@@ -104,8 +104,8 @@ docker compose exec phpfpm bin/console doctrine:migrations:migrate
 docker compose exec phpfpm bin/console hautelook:fixtures:load --no-interaction
 ```
 
-The fixtures have an admin user: <john@example.com> with the password: apassword
-The fixtures have an editor user: <hans@editor.com> with the password: apassword
+The fixtures have an admin user: <admin@example.com> with the password: apassword
+The fixtures have an editor user: <editor@example.com> with the password: apassword
 The fixtures have the image-text template, and two screen layouts:
 full screen and "two boxes".
 

composer.json

@@ -131,7 +131,7 @@
             "bin/console doctrine:schema:validate",
             "@coding-standards-apply",
             "vendor/bin/rector",
-            "vendor/bin/psalm",
+            "vendor/bin/psalm --no-cache",
             "@test-setup",
             "@test"
         ],

config/api_platform/screen.yaml

@@ -70,6 +70,8 @@ resources:
             ApiPlatform\Metadata\GetCollection:
                 filters:
                     - 'App\Filter\MultipleSearchFilter'
+                    - 'screen.screen_user_exists_filter'
+                    - 'screen.screen_user_latest_request_filter'
                     - 'entity.blameable_filter'
                     - 'entity.order_filter'
                     - 'created.at.order_filter'
@@ -100,7 +102,6 @@ resources:
                             content:
                                 application/ld+json:
                                     examples:
-
                             headers: {}
 
             ApiPlatform\Metadata\Post:

config/packages/cache.yaml

@@ -17,6 +17,9 @@ framework:
                 # Default expire set to 5 minutes
                 default_lifetime: 300
 
+            feed.without.expire.cache:
+                adapter: cache.adapter.redis
+
             # Creates a "calendar.api.cache" service
             calendar.api.cache:
                 adapter: cache.adapter.redis
@@ -27,6 +30,12 @@ framework:
                 # Default expire set to 1 day
                 default_lifetime: 86400
 
+            # Creates a "screen.status.cache" service ($screenStatusCache)
+            screen.status.cache:
+                adapter: cache.adapter.redis
+                # Default expire set to infinity
+                default_lifetime: 0
+
             # Creates an "interactive_slide.cache" service
             interactive_slide.cache:
                 adapter: cache.adapter.redis

config/packages/test/cache.yaml

@@ -7,3 +7,6 @@ framework:
             auth.screen.cache:
                 adapter: cache.adapter.filesystem
                 default_lifetime: 3600
+            screen.status.cache:
+                adapter: cache.adapter.filesystem
+                default_lifetime: 0

config/services.yaml

@@ -17,6 +17,8 @@ services:
             # @see https://api-platform.com/docs/core/state-processors/#hooking-into-the-built-in-state-processors
             $persistProcessor: '@api_platform.doctrine.orm.state.persist_processor'
             $removeProcessor: '@api_platform.doctrine.orm.state.remove_processor'
+            $trackScreenInfo: '%env(bool:TRACK_SCREEN_INFO)%'
+            $trackScreenInfoUpdateIntervalSeconds: '%env(TRACK_SCREEN_INFO_UPDATE_INTERVAL_SECONDS)%'
 
     _instanceof:
         App\Feed\FeedTypeInterface:
@@ -51,6 +53,10 @@ services:
     Symfony\Component\Security\Http\Authentication\AuthenticationFailureHandlerInterface: '@Lexik\Bundle\JWTAuthenticationBundle\Security\Http\Authentication\AuthenticationFailureHandler'
     Symfony\Component\Security\Http\Authentication\AuthenticationSuccessHandlerInterface: '@Lexik\Bundle\JWTAuthenticationBundle\Security\Http\Authentication\AuthenticationSuccessHandler'
 
+    App\Feed\EventDatabaseApiV2FeedType:
+        arguments:
+            $cacheExpire: '%env(int:EVENTDATABASE_API_V2_CACHE_EXPIRE_SECONDS)%'
+
     App\Feed\CalendarApiFeedType:
         arguments:
             $locationEndpoint: '%env(string:CALENDAR_API_FEED_SOURCE_LOCATION_ENDPOINT)%'
@@ -295,6 +301,16 @@ services:
         tags: ['api_platform.filter']
         arguments: [ { fullName: 'partial', email: 'partial' } ]
 
+    screen.screen_user_exists_filter:
+        parent: 'api_platform.doctrine.orm.exists_filter'
+        tags: ['api_platform.filter']
+        arguments: [ { screenUser: ~ } ]
+
+    screen.screen_user_latest_request_filter:
+        parent: 'api_platform.doctrine.orm.date_filter'
+        tags: ['api_platform.filter']
+        arguments: [ { screenUser.latestRequest: ~ } ]
+
     # App filters for Api Platform
     App\Filter\PublishedFilter:
         tags: ['api_platform.filter']

docs/feed/calender-api-feed.md

@@ -136,20 +136,19 @@ Modifiers can be set up to modify the output of the feed.
 
 Two types of modifiers are available:
 
-* EXCLUDE_IF_TITLE_NOT_CONTAINS: Removes entries from the feed if the title not contain the trigger word.
-* REPLACE_TITLE_IF_CONTAINS: Changes the title if it contains the trigger word.
+* EXCLUDE_IF_TITLE_NOT_CONTAINS: Removes entries from the feed if the title does not contain the pattern.
+* REPLACE_TITLE_IF_CONTAINS: Changes the title if it contains the pattern.
 
 Parameters:
 
 * type: EXCLUDE_IF_TITLE_NOT_CONTAINS or REPLACE_TITLE_IF_CONTAINS
 * id: Unique identifier for the modifier.
 * title: Display name when showing the modifier in the admin.
-* description: Help text for the modifier.
+* description: Description of the modifier.
 * activateInFeed: Should this filter be optional? If false the rule will always apply.
-* trigger: The string that should trigger the modifier.
-* replacement: The string to replace the title with.
 * removeTrigger: Should the trigger word be filtered from the title?
-* caseSensitive: Should the trigger word be case-sensitive?
+* pattern: The PCRE regular expression. See <https://www.php.net/manual/en/reference.pcre.pattern.syntax.php>.
+* replacement: The string to replace the title with. See <https://www.php.net/manual/en/function.preg-replace.php>.
 
 Examples of modifiers:
 
@@ -161,29 +160,26 @@ Examples of modifiers:
         "title": "Vis kun begivenheder med (liste) i titlen.",
         "description": "Denne mulighed fjerner begivenheder, der IKKE har (liste) i titlen. Den fjerner også (liste) fra titlen.",
         "activateInFeed": true,
-        "trigger": "(liste)",
-        "removeTrigger": true,
-        "caseSensitive": false
+        "pattern": "\/\\(liste\\)\/i",
+        "removeTrigger": true
     },
     {
         "type": "REPLACE_TITLE_IF_CONTAINS",
-        "id": "replaceIfContainsOptaget",
         "activateInFeed": false,
-        "trigger": "(optaget)",
+        "id": "replaceIfContainsOptaget",
+        "pattern": "\/\\(optaget\\)\/i",
         "replacement": "Optaget",
-        "removeTrigger": true,
-        "caseSensitive": false
+        "removeTrigger": true
     },
     {
         "type": "REPLACE_TITLE_IF_CONTAINS",
-        "id": "onlyShowAsOptaget",
         "activateInFeed": true,
+        "id": "onlyShowAsOptaget",
         "title": "Overskriv alle titler med Optaget",
         "description": "Denne mulighed viser alle titler som Optaget.",
-        "trigger": "",
+        "pattern": "\/\/",
         "replacement": "Optaget",
-        "removeTrigger": false,
-        "caseSensitive": false
+        "removeTrigger": false
     }
 ]
 ```

infrastructure/itkdev/display-api-service/etc/confd/templates/env.local.tmpl

@@ -60,5 +60,10 @@ CALENDAR_API_FEED_SOURCE_CUSTOM_MAPPINGS={{ getenv "APP_CALENDAR_API_FEED_SOURCE
 CALENDAR_API_FEED_SOURCE_EVENT_MODIFIERS={{ getenv "APP_CALENDAR_API_FEED_SOURCE_EVENT_MODIFIERS" "'{}'" }}
 CALENDAR_API_FEED_SOURCE_DATE_FORMAT={{ getenv "APP_CALENDAR_API_FEED_SOURCE_DATE_FORMAT" "" }}
 CALENDAR_API_FEED_SOURCE_DATE_TIMEZONE={{ getenv "APP_CALENDAR_API_FEED_SOURCE_DATE_TIMEZONE" "" }}
-CALENDAR_API_FEED_SOURCE_CACHE_EXPIRE_SECONDS={{ getenv "CALENDAR_API_FEED_SOURCE_CACHE_EXPIRE_SECONDS" "300" }}
+CALENDAR_API_FEED_SOURCE_CACHE_EXPIRE_SECONDS={{ getenv "APP_CALENDAR_API_FEED_SOURCE_CACHE_EXPIRE_SECONDS" "300" }}
 ###< Calendar Api Feed Source ###
+
+EVENTDATABASE_API_V2_CACHE_EXPIRE_SECONDS={{ getenv "APP_EVENTDATABASE_API_V2_CACHE_EXPIRE_SECONDS" "300" }}
+
+TRACK_SCREEN_INFO={{ getenv "APP_TRACK_SCREEN_INFO" "false" }}
+TRACK_SCREEN_INFO_UPDATE_INTERVAL_SECONDS={{ getenv "APP_TRACK_SCREEN_INFO_UPDATE_INTERVAL_SECONDS" "300" }}