From f7a4126718d80f3f72378f73ae32d3a6fe4bb528 Mon Sep 17 00:00:00 2001
From: Jeppe Bundgaard <jb@truckwash.dk>
Date: Tue, 30 Jun 2026 13:10:06 +0200
Subject: [PATCH] Fix router matching for underscored route params

---
 services/nginx/app/classes/router.php            |  2 +-
 .../Unit/Router/RouterDynamicSegmentTest.php     | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 services/nginx/app/tests/Unit/Router/RouterDynamicSegmentTest.php

diff --git a/services/nginx/app/classes/router.php b/services/nginx/app/classes/router.php
index b9f6e9d3..c4d416a1 100644
--- a/services/nginx/app/classes/router.php
+++ b/services/nginx/app/classes/router.php
@@ -89,7 +89,7 @@ class router
         }
         // Regex
         $route = str_replace('/', '\/', $route);
-        $route = preg_replace('/{[a-zA-Z0-9]+}/', '([a-zA-Z0-9]+)', $route);
+        $route = preg_replace('/{[a-zA-Z0-9_]+}/', '([a-zA-Z0-9]+)', $route);
         if (preg_match('/^' . $route . '$/', $this->url)) {
             return true;
         }
diff --git a/services/nginx/app/tests/Unit/Router/RouterDynamicSegmentTest.php b/services/nginx/app/tests/Unit/Router/RouterDynamicSegmentTest.php
new file mode 100644
index 00000000..42b2211e
--- /dev/null
+++ b/services/nginx/app/tests/Unit/Router/RouterDynamicSegmentTest.php
@@ -0,0 +1,16 @@
+<?php
+
+use classes\router;
+
+it('matches dynamic route parameter names containing underscores', function (): void {
+    $_SERVER['REQUEST_URI'] = '/modules/self-serve/lane/hardware/batch/916cdba1981e52f3dc728ea06fc39cf0';
+    $_SERVER['REQUEST_METHOD'] = 'GET';
+
+    $router = new router();
+    $matcher = new ReflectionMethod(router::class, 'doesRouteMatchCurrent');
+
+    expect($matcher->invoke(
+        $router,
+        '/modules/self-serve/lane/hardware/batch/{batch_id}'
+    ))->toBeTrue();
+});