fix: VOL-4642 routing in olcs-transfer now sorted out, allowing tempo…

…rary code to be removed. Code has been reset to how it was previously although tech debt ticket raised as the old code was itself a bit rubbish (#93)

module/Api/src/Mvc/PayloadValidationListener.php

@@ -60,30 +60,14 @@ public function onRoute(MvcEvent $e)
         }
 
         $dtoClass = $matches->getParam('dto', false);
-        $data = $matches->getParams();
 
-        /**
-         * there is an edge case, where Laminas route match is not bringing in the parameters correctly
-         * problem was introduced by:
-         * https://dvsa.atlassian.net/browse/VOL-3752
-         *
-         * Where this happens, we're able to get the params from the query parameters instead, as they seem unaffected
-         *
-         * The only query known to be broken is olcs-transfer/src/Query/Correspondence/Correspondences.php
-         *
-         * A ticket has been created for a more permanent fix for VOL-3752, and also mentions this issue:
-         * https://dvsa.atlassian.net/browse/VOL-4642
-         */
         if (!$dtoClass) {
-            $queryParams = $request->getQuery()->toArray();
-            $dtoClass = $queryParams['dto'] ?? false;
-
-            if (!$dtoClass) {
-                // no controller matched, nothing to do
-                return;
-            }
+            // no controller matched, nothing to do
+            return;
         }
 
+        $data = $matches->getParams();
+
         $dto = new $dtoClass();
         $matches->setParam('dto', $dto);
 

test/module/Api/src/Mvc/PayloadValidationListenerTest.php

@@ -68,10 +68,8 @@ public function testOnRouteNoRouteMatch()
     public function testOnRouteNoDtoClass()
     {
         $mockHttpRequest = m::mock(HttpRequest::class);
-        $mockHttpRequest->expects('getQuery->toArray')->withNoArgs()->andReturn([]);
 
         $mockRouteMatch = m::mock(RouteMatch::class);
-        $mockRouteMatch->expects('getParams')->withNoArgs()->andReturn([]);
         $mockRouteMatch->shouldReceive('getParam')
             ->with('dto', false)
             ->once()