Merge remote-tracking branch 'origin/release/3.0.0' into feature/docs-revisions

Author: turegjorup

.env

@@ -180,6 +180,11 @@ CALENDAR_API_FEED_SOURCE_CACHE_EXPIRE_SECONDS=300
 EVENTDATABASE_API_V2_CACHE_EXPIRE_SECONDS=300
 ###< Event Database Api V2 Feed Type ###
 
+###> Instant Book ###
+# Source of busy intervals data for instant booking interactive slides (graph or feed).
+INSTANT_BOOK_BUSY_INTERVALS_SOURCE=graph
+###< Instant Book ###
+
 ###> Admin configuration ###
 # API key for Rejseplanen (Danish journey planner) integration.
 ADMIN_REJSEPLANEN_APIKEY=

.github/workflows/doctrine.yaml

@@ -3,11 +3,41 @@
 ### Runs pending Doctrine migrations and validates the resulting schema
 ### against the entity metadata.
 ###
+### #### MariaDB leg
+###
+### The supported, deployment-target leg. CI matrix runs the full
+### migrations:migrate + schema:validate cycle against MariaDB 10.11 and
+### 11.4. A green run here means upgrades will work in production.
+###
+### #### Postgres leg (EXPERIMENTAL — schema-portability gate only)
+###
+### NOT a claim that this project runs on Postgres. Postgres is NOT a
+### deployment target, NOT exercised by PHPUnit, and NOT covered by the
+### rest of CI. The leg exists only to catch regressions in the narrow
+### slice of portability we have so far achieved:
+###
+###   - Entity metadata (column types, index names, quoted identifiers)
+###     stays platform-neutral.
+###   - The consolidated migration's up() emits portable DDL via Schema
+###     tool API.
+###
+### Known gaps that still block real Postgres deployment:
+###
+###   - Native MariaDB SQL in entity listeners (`MultiTenantRepositoryTrait`,
+###     `RelationsChecksumCalculator`) — Postgres would fail at runtime.
+###   - Doctrine cache, fixture loading, and most application queries are
+###     untested against Postgres.
+###
+### A failure on this leg is a blocker — new schema changes must stay
+### portable; widening the MariaDB-only surface requires explicit review.
+###
 ### #### Assumptions
 ###
 ### 1. A docker compose service named `phpfpm` can be run and `bin/console`
 ###    can be run inside the `phpfpm` service.
 ### 2. A `mariadb` service is reachable from `phpfpm`.
+### 3. `docker-compose.postgres.yml` adds a `postgres` service and layers
+###    `pdo_pgsql` onto `phpfpm`, used by the Postgres leg below.
 
 on: pull_request
 
@@ -55,3 +85,45 @@ jobs:
 
       - name: Validate Doctrine schema
         run: docker compose run --rm -e APP_ENV=prod -e MARIADB_VERSION phpfpm bin/console doctrine:schema:validate
+
+  # EXPERIMENTAL: schema-portability regression gate only. Postgres is NOT
+  # a supported deployment target — see the header comment at the top of
+  # this file for the full caveat. A green run means entity metadata and
+  # the consolidated migration's up() are portable; it does NOT mean the
+  # application runs on Postgres.
+  validate-doctrine-schema-postgres:
+    runs-on: ubuntu-latest
+    name: Validate Schema (postgres:16, experimental)
+    env:
+      # docker-compose.postgres.yml adds the postgres service and layers
+      # pdo_pgsql onto phpfpm. COMPOSE_FILE stacks it on top of the default.
+      COMPOSE_FILE: docker-compose.yml:docker-compose.postgres.yml
+      DATABASE_URL: "postgresql://db:db@postgres:5432/db?serverVersion=16&charset=utf8"
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+
+      - name: Cache vendor (prod)
+        uses: actions/cache@v5
+        with:
+          path: vendor
+          key: vendor-prod-php8.4-${{ hashFiles('composer.lock') }}
+          restore-keys: vendor-prod-php8.4-
+
+      - name: Setup network
+        run: docker network create frontend
+
+      # Build the phpfpm-with-pdo_pgsql image declared in
+      # docker-compose.postgres.yml; without this, `docker compose run` reuses
+      # the upstream itkdev/php8.4-fpm:latest image which lacks pdo_pgsql.
+      - name: Build phpfpm with pdo_pgsql
+        run: docker compose build phpfpm
+
+      - name: "[prod] Composer install"
+        run: docker compose run --rm -e APP_ENV=prod phpfpm composer install --no-dev -o
+
+      - name: Run Doctrine Migrations
+        run: docker compose run --rm -e APP_ENV=prod -e DATABASE_URL phpfpm bin/console doctrine:migrations:migrate --no-interaction
+
+      - name: Validate Doctrine schema
+        run: docker compose run --rm -e APP_ENV=prod -e DATABASE_URL phpfpm bin/console doctrine:schema:validate

CHANGELOG.md

@@ -4,6 +4,18 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+- Rewrote the consolidated end-of-2.8 migration to Doctrine's Schema tool API;
+  added a `NoAddSqlInMigrationRule` PHPStan rule to enforce the convention on future migrations.
+- Added a Postgres `Validate Schema` job to the Doctrine workflow as a regression gate against
+  entity/migration drift from Postgres compatibility; uses the new `docker-compose.postgres.yml` override.
+- Consolidated 25 historical 2.x Doctrine migrations into a single end-of-2.8 schema migration;
+  upgraders run `doctrine:migrations:rollup` (see `UPGRADE.md` step 3).
+- Restored three deprecated `Template` properties (`icon`, `resources`, `description`) as
+  write-only fields; scheduled for removal in 3.1.
+- Merged fixes from 2.7.0 into release/3.0.0.
+- Added `INSTANT_BOOK_BUSY_INTERVALS_SOURCE` to select between Graph and the slide's calendar feed as the source of busy
+  intervals for InstantBook.
+- Changed polling interval for instant booking template.
 - Fixed admin toast leaking a raw `SyntaxError: Unexpected token '<'` when an upload was rejected
   upstream (e.g. nginx 413); the toast now shows `HTTP <status>` instead.
 - Made the media upload max size configurable via the new `MEDIA_MAX_UPLOAD_SIZE_MB` env var.

README.md

@@ -680,6 +680,21 @@ EVENTDATABASE_API_V2_CACHE_EXPIRE_SECONDS=300
 - EVENTDATABASE_API_V2_CACHE_EXPIRE_SECONDS: What should the expiration be for cache entries in
   EventDatabaseApiV2FeedType?
 
+#### InstantBook
+
+```dotenv
+###> InstantBook ###
+INSTANT_BOOK_BUSY_INTERVALS_SOURCE=graph
+###< InstantBook ###
+```
+
+- INSTANT_BOOK_BUSY_INTERVALS_SOURCE: Where the InstantBook interactive slide fetches resource
+  busy-intervals from.
+  - `graph`: Fetch busy intervals from Microsoft Graph (results cached for 15 minutes).
+  - `feed`: Fetch busy intervals from the slide's configured calendar-output feed.
+
+  **Default**: `graph`.
+
 ## Rest API & Relationships
 
 To avoid embedding all relations in REST representations but still allow the clients to minimize the amount of API calls

UPGRADE.md

@@ -73,12 +73,36 @@ Rename the following .env variables in `.env.local`:
 - From `APP_KEY_VAULT_SOURCE` to `KEY_VAULT_SOURCE`
 - From `APP_KEY_VAULT_JSON` to `KEY_VAULT_JSON`
 
-#### 3 - Run doctrine migrate
+#### 3 - Consolidate Doctrine migrations
+
+3.0 ships a single consolidated migration that represents the end-of-2.8 schema. The 25 historical
+2.x migrations have been removed from the repository.
+
+Because every upgrading database already matches that consolidated schema (via the 25 migrations it
+ran while on 2.x), there is nothing for `doctrine:migrations:migrate` to do — and running it would
+fail because of the orphaned version entries. Use `doctrine:migrations:rollup` instead, which
+truncates the `doctrine_migration_versions` table and inserts a single row marking the consolidated
+migration as already executed:
 
 ```shell
-docker compose exec phpfpm bin/console doctrine:migrations:migrate
+# Confirm the database is at the latest 2.8.x state before rolling up.
+# All 25 historical versions should appear as "migrated" / "available".
+docker compose exec phpfpm bin/console doctrine:migrations:status
+
+# Replace the 25 historical version entries with the single consolidated entry.
+# This does not run any SQL — it only rewrites the version-tracking table.
+docker compose exec phpfpm bin/console doctrine:migrations:rollup --no-interaction
 ```
 
+> **Prerequisite:** the database must be on the final 2.8.x release with every 2.x migration
+> applied. If `doctrine:migrations:status` (run while still on 2.8.x) reports any pending
+> migrations, run `doctrine:migrations:migrate` on 2.8.x first, then upgrade to 3.0 and continue
+> here.
+
+Fresh installs (no prior 2.x database) skip the rollup and run
+`doctrine:migrations:migrate` instead — it executes the single consolidated migration and brings
+the schema up in one step.
+
 #### 4 - Run template list command to see status for installed templates
 
 ```shell

assets/shared/templates/brnd/brnd-idraetsanlaeg.jsx

@@ -112,7 +112,7 @@ function BrndIdraetsanlaeg({
                     rowIndex % 2 === 0 ? "row-even" : "row-odd"
                   }`}
                 >
-                  {getTitle(entry.area)}
+                  {getTitle(entry.facility)}
                 </ContentItem>
                 <ContentItem
                   className={`content-item content-item-activity ${

assets/shared/templates/calendar/calendar-single-booking.jsx

@@ -64,22 +64,21 @@ function CalendarSingleBooking({
   // Get values from client localstorage.
   const token = localStorage.getItem("apiToken");
   const tenantKey = localStorage.getItem("tenantKey");
-  const apiUrl = localStorage.getItem("apiUrl");
 
   const [bookableIntervals, setBookableIntervals] = useState([]);
   const [fetchingIntervals, setFetchingIntervals] = useState(false);
   const [currentTime, setCurrentTime] = useState(dayjs());
   const [bookingResult, setBookingResult] = useState(null);
   const [processingBooking, setProcessingBooking] = useState(false);
   const [secondsUntilNextEvent, setSecondsUntilNextEvent] = useState(null);
-  const [bookingError, setBookingError] = useState(false);
+  const [bookingError, setBookingError] = useState(null);
 
   const fetchBookingIntervals = () => {
     if (!instantBookingEnabled) {
       return;
     }
 
-    if (!apiUrl || !slide || !token || !tenantKey) {
+    if (!slide || !token || !tenantKey) {
       setFetchingIntervals(false);
       return;
     }
@@ -93,7 +92,7 @@ function CalendarSingleBooking({
     if (resources.length === 1) {
       setFetchingIntervals(true);
 
-      fetch(`${apiUrl}${slide["@id"]}/action`, {
+      fetch(`${slide["@id"]}/action`, {
         method: "POST",
         headers: {
           authorization: `Bearer ${token}`,
@@ -173,7 +172,7 @@ function CalendarSingleBooking({
   };
 
   const clickInterval = (interval) => {
-    if (!apiUrl || !slide || !token || !tenantKey) {
+    if (!slide || !token || !tenantKey) {
       return;
     }
 
@@ -183,7 +182,7 @@ function CalendarSingleBooking({
 
     setProcessingBooking(true);
 
-    fetch(`${apiUrl}${slide["@id"]}/action`, {
+    fetch(`${slide["@id"]}/action`, {
       method: "POST",
       headers: {
         authorization: `Bearer ${token}`,
@@ -198,14 +197,21 @@ function CalendarSingleBooking({
         },
       }),
     })
-      .then((r) => r.json())
+      .then((r) => {
+        if (!r.ok) {
+          const error = new Error(`Booking failed with status ${r.status}`);
+          error.status = r.status;
+          throw error;
+        }
+        return r.json();
+      })
       .then((data) => {
         setBookingResult(data);
         setInstantBookingFromLocalStorage(slide["@id"], data);
       })
-      .catch(() => {
-        setBookingError(true);
-        setTimeout(() => setBookingError(false), 10000);
+      .catch((err) => {
+        setBookingError(err?.status === 409 ? "conflict" : "generic");
+        setTimeout(() => setBookingError(null), 10000);
       })
       .finally(() => {
         setProcessingBooking(false);
@@ -217,7 +223,8 @@ function CalendarSingleBooking({
     dayjs.extend(localizedFormat);
 
     intervalChecking();
-    const interval = setInterval(intervalChecking, 5000);
+    // Check every minute if the current time has changed.
+    const interval = setInterval(intervalChecking, 60000);
 
     return () => {
       if (interval !== null) {
@@ -385,7 +392,15 @@ function CalendarSingleBooking({
                   />
                 </p>
               )}
-              {bookingError && (
+              {bookingError === "conflict" && (
+                <p>
+                  <FormattedMessage
+                    id="instant_booking_conflict"
+                    defaultMessage="Straksbooking fejlede. Intervallet er optaget."
+                  />
+                </p>
+              )}
+              {bookingError && bookingError !== "conflict" && (
                 <p>
                   <FormattedMessage
                     id="instant_booking_error"

assets/tests/template/template-calendar.spec.js

@@ -233,11 +233,12 @@ test("calendar-0-single-booking: ui tests", async ({ page }) => {
 test("calendar-1-single-booking: ui tests", async ({ page }) => {
   await fixTime(page);
   await page.goto("/template/calendar-1-single-booking");
-  await expect(page.getByText("Ledigt")).toHaveCount(1);
-  await expect(page.getByText("Ledigt")).toBeVisible();
+  await expect(page.locator(".room-info")).toBeVisible();
 
-  await page.waitForTimeout(5500);
+  const status = page.locator(".status");
+  await expect(status).toHaveText("Ledigt");
+
+  await page.clock.runFor(61000);
 
-  await expect(page.getByText("Optaget")).toHaveCount(1);
-  await expect(page.getByText("Optaget")).toBeVisible();
+  await expect(status).toHaveText("Optaget");
 });

composer.json

@@ -21,7 +21,7 @@
         "doctrine/doctrine-migrations-bundle": "^3.1",
         "doctrine/orm": "^2.9",
         "gesdinet/jwt-refresh-token-bundle": "^1.0",
-        "itk-dev/openid-connect-bundle": "^3.1",
+        "itk-dev/openid-connect-bundle": "^4.1",
         "justinrainbow/json-schema": "^5.2",
         "kubawerlos/php-cs-fixer-custom-fixers": "^3.11",
         "lexik/jwt-authentication-bundle": "^2.14",
@@ -90,6 +90,7 @@
     },
     "autoload-dev": {
         "psr-4": {
+            "App\\PhpStan\\": "tools/phpstan/",
             "App\\Tests\\": "tests/"
         }
     },