Merge branch 'worktree-agent-aed43cff'

packages/api/src/router/resource-read-shared.ts

@@ -2,12 +2,13 @@ import { FieldType, ResourceType } from "@capakraken/shared";
 import { TRPCError } from "@trpc/server";
 import { z } from "zod";
 import {
-  ROLE_BRIEF_SELECT,
   RESOURCE_DIRECTORY_SELECT,
   RESOURCE_IDENTIFIER_DETAIL_SELECT,
   RESOURCE_IDENTIFIER_SELECT,
+  RESOURCE_LIST_SELECT,
   RESOURCE_SUMMARY_DETAIL_SELECT,
   RESOURCE_SUMMARY_SELECT,
+  ROLE_BRIEF_SELECT,
 } from "../db/selects.js";
 import { buildDynamicFieldWhereClauses } from "./custom-field-filters.js";
 import {
@@ -167,7 +168,8 @@ export async function listStaffResources(
     const rawResources = await (includeRoles
       ? ctx.db.resource.findMany({
           where,
-          include: {
+          select: {
+            ...RESOURCE_LIST_SELECT,
             resourceRoles: {
               include: { role: { select: ROLE_BRIEF_SELECT } },
             },
@@ -176,6 +178,7 @@ export async function listStaffResources(
         })
       : ctx.db.resource.findMany({
           where,
+          select: RESOURCE_LIST_SELECT,
           orderBy: [{ displayName: "asc" }, { id: "asc" }],
         }));
 
@@ -264,13 +267,17 @@ export async function listStaffResources(
     includeRoles
       ? ctx.db.resource.findMany({
           ...baseQuery,
-          include: {
+          select: {
+            ...RESOURCE_LIST_SELECT,
             resourceRoles: {
               include: { role: { select: ROLE_BRIEF_SELECT } },
             },
           },
         })
-      : ctx.db.resource.findMany(baseQuery),
+      : ctx.db.resource.findMany({
+          ...baseQuery,
+          select: RESOURCE_LIST_SELECT,
+        }),
     ctx.db.resource.count({ where }),
   ]);