fix(hyperboard): update hyperboard response types

Makes the hyperboard owners and sections response type consistent with
other return types.

Author: bitbeckers

src/graphql/schemas/typeDefs/hyperboardTypeDefs.ts

@@ -17,65 +17,24 @@ export class GetHyperboardOwnersResponse extends DataResponse(
 ) {}
 
 @ObjectType({
-  description: "Hyperboard of hypercerts for reference and display purposes",
-})
-export class Hyperboard extends BasicTypeDef {
-  @Field({ description: "Name of the hyperboard" })
-  name?: string;
-  @Field(() => [EthBigInt], {
-    nullable: true,
-    description: "Chain ID of the hyperboard",
-  })
-  chain_ids?: (bigint | number | string)[];
-  @Field({ nullable: true, description: "Background image of the hyperboard" })
-  background_image?: string;
-  @Field({
-    nullable: true,
-    description:
-      "Whether the hyperboard should be rendered as a grayscale image",
-  })
-  grayscale_images?: boolean;
-  @Field({
-    nullable: true,
-    description: "Color of the borders of the hyperboard",
-  })
-  tile_border_color?: string;
-
-  @Field(() => GetUsersResponse)
-  admins?: GetUsersResponse;
-
-  @Field(() => [SectionResponseType])
-  sections?: SectionResponseType[];
-
-  @Field(() => GetHyperboardOwnersResponse)
-  owners?: GetHyperboardOwnersResponse;
-}
-
-@ObjectType({})
-export class SectionResponseType {
-  @Field(() => [Section])
-  data?: Section[];
-
-  @Field()
-  count?: number;
-}
-
-@ObjectType({
-  description: "Section representing a collection within a hyperboard",
+  description:
+    "Section representing one or more collectionswithin a hyperboard",
 })
 export class Section {
   @Field()
   label?: string;
 
-  @Field(() => Collection)
-  collection?: Collection;
+  @Field(() => [Collection])
+  collections?: Collection[];
 
   @Field(() => [SectionEntry])
   entries?: SectionEntry[];
 
   @Field(() => GetHyperboardOwnersResponse)
   owners?: GetHyperboardOwnersResponse;
 }
+@ObjectType({})
+export class GetSectionsResponse extends DataResponse(Section) {}
 
 @ObjectType()
 class SectionEntryOwner extends User {
@@ -111,5 +70,40 @@ class SectionEntry {
   owners?: GetSectionEntryOwnersResponse;
 }
 
+@ObjectType({
+  description: "Hyperboard of hypercerts for reference and display purposes",
+})
+export class Hyperboard extends BasicTypeDef {
+  @Field({ description: "Name of the hyperboard" })
+  name?: string;
+  @Field(() => [EthBigInt], {
+    nullable: true,
+    description: "Chain ID of the hyperboard",
+  })
+  chain_ids?: (bigint | number | string)[];
+  @Field({ nullable: true, description: "Background image of the hyperboard" })
+  background_image?: string;
+  @Field({
+    nullable: true,
+    description:
+      "Whether the hyperboard should be rendered as a grayscale image",
+  })
+  grayscale_images?: boolean;
+  @Field({
+    nullable: true,
+    description: "Color of the borders of the hyperboard",
+  })
+  tile_border_color?: string;
+
+  @Field(() => GetUsersResponse)
+  admins?: GetUsersResponse;
+
+  @Field(() => GetSectionsResponse)
+  sections?: GetSectionsResponse;
+
+  @Field(() => GetHyperboardOwnersResponse)
+  owners?: GetHyperboardOwnersResponse;
+}
+
 @ObjectType()
 export class GetHyperboardsResponse extends DataResponse(Hyperboard) {}

src/services/graphql/resolvers/hyperboardResolver.ts

@@ -8,7 +8,7 @@ import {
   GetHyperboardsResponse,
   Hyperboard,
   HyperboardOwner,
-  SectionResponseType,
+  GetSectionsResponse,
 } from "../../../graphql/schemas/typeDefs/hyperboardTypeDefs.js";
 import GetUsersResponse from "../../../graphql/schemas/typeDefs/userTypeDefs.js";
 import { CachingDatabase } from "../../../types/kyselySupabaseCaching.js";
@@ -151,7 +151,7 @@ class HyperboardResolver {
    * }
    * ```
    */
-  @FieldResolver(() => [SectionResponseType])
+  @FieldResolver(() => GetSectionsResponse)
   async sections(@Root() hyperboard: Hyperboard) {
     if (!hyperboard.id) {
       console.error(
@@ -253,7 +253,7 @@ class HyperboardResolver {
         }),
       );
 
-      return [{ data: sections, count: sections.length }];
+      return { data: sections, count: sections.length };
     } catch (e) {
       console.error(
         `[HyperboardResolver::sections] Error fetching sections for hyperboard ${hyperboard.id}: ${(e as Error).message}`,
@@ -280,8 +280,7 @@ class HyperboardResolver {
         return [];
       }
 
-      const allSections = sections.flatMap((section) => section.data || []);
-      return processSectionsToHyperboardOwnership(allSections);
+      return processSectionsToHyperboardOwnership(sections.data);
     } catch (e) {
       console.error(
         `[HyperboardResolver::owners] Error fetching owners for hyperboard ${hyperboard.id}: ${(e as Error).message}`,

src/utils/processCollectionToSection.ts

@@ -353,7 +353,7 @@ export const processCollectionToSection = ({
     .value();
 
   return {
-    collection,
+    collections: [collection],
     label: collection.name,
     entries: entries || [],
     owners: {

test/services/graphql/resolvers/hyperboardResolver.test.ts

@@ -248,21 +248,20 @@ describe("HyperboardResolver", () => {
         throw new Error("Result should not be null");
       }
 
-      expect(result).toHaveLength(1);
-      expect(result[0].data).toHaveLength(1);
+      expect(result.data).toHaveLength(1);
+      expect(result.data[0].collections).toHaveLength(1);
       expect(
         mockHyperboardService.getHyperboardCollections,
       ).toHaveBeenCalledWith(mockHyperboard.id);
 
       // Verify the section data structure
-      const section = result[0].data[0];
+      const section = result.data[0];
       expect(section).toHaveProperty("label");
-      expect(section).toHaveProperty("collection");
+      expect(section).toHaveProperty("collections");
       expect(section).toHaveProperty("entries");
       expect(section).toHaveProperty("owners");
-      expect(section.collection).toBeDefined();
-      expect(section.entries).toBeInstanceOf(Array);
-      expect(section.owners).toBeInstanceOf(Array);
+      expect(section.collections).toBeInstanceOf(Array);
+      expect(section.owners?.data).toHaveLength(2);
     });
 
     it("should return empty sections when hyperboard has no id", async () => {

test/utils/testUtils.ts

@@ -637,7 +637,7 @@ export function generateMockHyperboard(
     grayscale_images: boolean;
     tile_border_color: string;
     admins: { data: ReturnType<typeof generateMockUser>[]; count: number };
-    sections: Array<{
+    sections: {
       data: Array<{
         label: string;
         collection: ReturnType<typeof generateMockCollection>;
@@ -666,7 +666,7 @@ export function generateMockHyperboard(
         }>;
       }>;
       count: number;
-    }>;
+    };
     owners: {
       data: Array<
         ReturnType<typeof generateMockUser> & { percentage_owned: number }