[internal-api-client] Fix search grouped jobs response structure

Author: janvanicek

src/Client.php

@@ -386,7 +386,10 @@ public function searchAllJobs(
      * @param "asc"|"desc"|null $sortOrder
      * @param int<1, 500>|null $jobsPerGroup
      * @param int<1, 500>|null $limit
-     * @return array<JobInterface>
+     * @return array<int, array{
+     *     group: array<string, string>,
+     *     jobs: JobInterface[]
+     * }>
      */
     public function searchJobsGrouped(
         array $groupBy,
@@ -416,9 +419,20 @@ public function searchJobsGrouped(
         }
 
         $request = new Request('GET', 'search/grouped-jobs?' . http_build_query($query));
+        /** @var array<int, array{
+         *     group: array<string, string>,
+         *     jobs: array
+         * }> $response
+         */
         $response = $this->sendRequest($request);
 
-        return $this->mapJobsFromSearchResponse($response);
+        return array_map(
+            function (array $group): array {
+                $group['jobs'] = $this->mapJobsFromSearchResponse($group['jobs']);
+                return $group;
+            },
+            $response,
+        );
     }
 
     /** @return JobInterface[] */

tests/ClientSearchTest.php

@@ -231,18 +231,28 @@ public function testSearchJobsGrouped(
         $requests = [];
         $responses = [
             new Response(200, body: (string) json_encode([
-                $this->createJobData(1),
-                $this->createJobData(2),
+                [
+                    'group' => array_fill_keys($groupBy, true),
+                    'jobs' => [
+                        $this->createJobData(1),
+                        $this->createJobData(2),
+                    ],
+                ],
             ])),
         ];
 
         $client = $this->createClient($requests, $responses);
-        $jobs = $client->searchJobsGrouped($groupBy, $filters, $sortBy, $sortOrder, $jobsPerGroup, $limit);
+        $jobsGrouped = $client->searchJobsGrouped($groupBy, $filters, $sortBy, $sortOrder, $jobsPerGroup, $limit);
 
+        $jobs = $jobsGrouped[0]['jobs'];
         self::assertCount(2, $jobs);
         self::assertSame('1', $jobs[0]->getId());
         self::assertSame('2', $jobs[1]->getId());
 
+        $groups = $jobsGrouped[0]['group'];
+        self::assertCount(count($groupBy), $groups);
+        self::assertSame($groupBy, array_keys($groups));
+
         self::assertCount(1, $requests);
         $request = $requests[0]['request'];