Merge pull request #142 from hypercerts-org/fix/order_field_resolver

Order field resolver

Author: bitbeckers

src/graphql/schemas/resolvers/orderResolver.ts

@@ -52,15 +52,15 @@ class OrderResolver extends OrderBaseResolver {
       // TODO: Update this once array filters are available
       const allHypercerts = await Promise.all(
         allHypercertIds.map(async (hypercertId) => {
-          const hypercertRes = await this.supabaseCachingService
-            .getHypercerts({
-              where: {
-                hypercert_id: {
-                  eq: hypercertId,
-                },
+          const hypercertRes = await this.getHypercerts({
+            where: {
+              hypercert_id: {
+                eq: hypercertId,
               },
-            })
-            .execute();
+            },
+          });
+
+          console.log("Found hypercert for order: ", hypercertRes);
 
           return hypercertRes?.[0] as HypercertBaseType;
         }),
@@ -146,46 +146,32 @@ class OrderResolver extends OrderBaseResolver {
 
     const hypercertId = getHypercertTokenId(BigInt(tokenId));
     const formattedHypercertId = `${chainId}-${getAddress(collectionId)}-${hypercertId.toString()}`;
-    const hypercert = await this.supabaseCachingService
-      .getHypercerts({
+    const hypercert = await this.getHypercerts(
+      {
         where: {
           hypercert_id: {
             eq: formattedHypercertId,
           },
         },
-      })
-      .executeTakeFirst();
-
-    if (!hypercert) {
-      console.warn(
-        `[OrderResolver::hypercert] No hypercert found for tokenId: ${tokenId}`,
-      );
-      return null;
-    }
-
-    const resultOrder = hypercert as HypercertBaseType;
-
-    if (!resultOrder) {
-      console.warn(
-        `[OrderResolver::hypercert] No hypercert found for tokenId: ${tokenId}`,
-      );
-      return null;
-    }
-
-    const uri = (hypercertData?.[0] as HypercertBaseType)?.uri;
+      },
+      true,
+    );
 
-    const metadata = await this.supabaseCachingService
-      .getMetadata({
+    const metadata = await this.getMetadata(
+      {
         where: {
-          uri: {
-            eq: uri,
+          hypercerts: {
+            hypercert_id: {
+              eq: formattedHypercertId,
+            },
           },
         },
-      })
-      .executeTakeFirst();
+      },
+      true,
+    );
 
     return {
-      ...resultOrder,
+      ...hypercert,
       metadata: metadata || null,
     };
   }

src/services/SupabaseCachingService.ts

@@ -114,7 +114,7 @@ export class SupabaseCachingService {
           .selectFrom(tableName)
           .selectAll("metadata")
           .$if(args.where?.hypercerts, (qb) =>
-            qb.innerJoin("claims", "claims.id", "fractions.claims_id"),
+            qb.innerJoin("claims", "claims.uri", "metadata.uri"),
           );
       case "sales":
         return kysely.selectFrom(tableName).selectAll();