refactor: replace ApiResultsResponse with specialized response class

app/Data/WpOrg/Themes/QueryThemesResponse.php

@@ -3,12 +3,26 @@
 namespace App\Data\WpOrg\Themes;
 
 use App\Data\WpOrg\PageInfo;
+use Spatie\LaravelData\Attributes\MapOutputName;
 use Spatie\LaravelData\Data;
+use stdClass;
+
+// WORK IN PROGRESS: ThemeController is still using
 
 class QueryThemesResponse extends Data
 {
+    /**
+     * @param PageInfo $pageInfo
+     * @param array<string,mixed> $themes   // TODO: use Collection<ThemeResponse>
+     */
     public function __construct(
+        #[MapOutputName('info')]
         public readonly PageInfo $pageInfo,
-        // TODO
+        public readonly array $themes,
     ) {}
+
+    /** for API version 1.0 responses only -- do not use this otherwise! */
+    public function toStdClass(): stdClass {
+        return (object) ['info' => $this->pageInfo->toArray(), 'themes' => $this->themes];
+    }
 }

app/Data/WpOrg/Themes/ThemeResponse.php

@@ -6,6 +6,8 @@
 use Carbon\CarbonImmutable;
 use Spatie\LaravelData\Data;
 
+// WORK IN PROGRESS: not used yet.  many fields need to be made nullable or Optional.
+
 class ThemeResponse extends Data
 {
     /**

app/Http/Controllers/API/WpOrg/Themes/ThemeController.php

@@ -3,14 +3,16 @@
 namespace App\Http\Controllers\API\WpOrg\Themes;
 
 use App\Data\WpOrg\Themes\QueryThemesRequest;
+use App\Data\WpOrg\Themes\QueryThemesResponse;
 use App\Data\WpOrg\Themes\ThemeInformationRequest;
 use App\Http\Controllers\Controller;
-use App\DTO\ApiResultsResponse;
 use Illuminate\Http\Request;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Response;
 use Illuminate\Support\Facades\DB;
 
+use function Safe\json_decode;
+
 class ThemeController extends Controller
 {
     public function info(Request $request): JsonResponse|Response
@@ -19,23 +21,31 @@ public function info(Request $request): JsonResponse|Response
         $response = match ($action) {
             'query_themes' => $this->doQueryThemes(QueryThemesRequest::fromRequest($request)),
             'theme_information' => $this->doThemeInformation(ThemeInformationRequest::fromRequest($request)),
-            'hot_tags' => $this->doHotTags($request),
-            'feature_list' => $this->doFeatureList($request),
+            'hot_tags' => $this->doHotTags(),
+            'feature_list' => $this->doFeatureList(),
             default => $this->unknownAction()
         };
         return $this->sendResponse($response);
     }
 
-    private function doQueryThemes(QueryThemesRequest $req): ApiResultsResponse
+    private function doQueryThemes(QueryThemesRequest $req): QueryThemesResponse
     {
         $page = $req->page;
         $perPage = $req->per_page;
         $skip = ($page - 1) * $perPage;
 
-        $themes = DB::table('themes')->skip($skip)->take($perPage)->get()->toArray();
+        // TODO: process search and other filters
+        $themes = DB::table('themes')
+            ->skip($skip)
+            ->take($perPage)
+            ->get()
+            ->map(fn($theme) => json_decode($theme->metadata))
+            ->toArray();
+
         $total = DB::table('themes')->count();
 
-        return new ApiResultsResponse('themes', $themes, $page, $perPage, $total);
+        $pageInfo = ['page' => $page, 'pages' => (int)ceil($total / $perPage), 'results' => $total];
+        return QueryThemesResponse::from(['pageInfo' => $pageInfo, 'themes' => $themes]);
     }
 
     /** @return array<string, mixed> */
@@ -45,13 +55,13 @@ private function doThemeInformation(ThemeInformationRequest $req): array
     }
 
     /** @return array<string, mixed> */
-    private function doHotTags(Request $request): array
+    private function doHotTags(): array
     {
         return ['error' => 'not implemented'];
     }
 
     /** @return array<string, mixed> */
-    private function doFeatureList(Request $request): array
+    private function doFeatureList(): array
     {
         return ['error' => 'not implemented'];
     }
@@ -65,23 +75,23 @@ private function unknownAction(): Response
         );
     }
 
-
     /**
      * Send response based on API version.
      *
-     * @param mixed $data
+     * @param array<string,mixed>|QueryThemesResponse $response
      * @param int $statusCode
      * @return Response|JsonResponse
      */
-    private function sendResponse($data, $statusCode = 200): JsonResponse|Response
+    private function sendResponse(array|QueryThemesResponse $response, int $statusCode = 200): JsonResponse|Response
     {
         $version = request()->route('version');
         if ($version === '1.0') {
-            if (is_object($data) && method_exists($data, 'toStdClass')) {
-                $data = $data->toStdClass();
+            if (is_object($response) && method_exists($response, 'toStdClass')) {
+                /** @noinspection CallableParameterUseCaseInTypeContextInspection */
+                $response = $response->toStdClass();
             }
-            return response(serialize((object) $data), $statusCode);
+            return response(serialize((object) $response), $statusCode);
         }
-        return response()->json($data, $statusCode);
+        return response()->json($response, $statusCode);
     }
 }