edit inngest build query

BibliothecaDAO · Dec 15, 2023 · 1164062 · 1164062
1 parent da34ccb
commit 1164062
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 14 deletions.
diff --git a/apps/nextjs/src/app/collection/[id]/(list)/L2ERC721Card.tsx b/apps/nextjs/src/app/collection/[id]/(list)/L2ERC721Card.tsx
@@ -108,22 +108,22 @@ const GridDetails = ({
       token={token}
       attributeKeys={["type", "tier", "level", "health"]}
     />
-    <Price listing={token?.listings?.[0]} />
+    <Price token={token} />
     <div className="mt-3 text-xs opacity-70">{starkName}</div>
   </div>
 );
 
 const Price = ({
-  listing,
+  token,
 }: {
-  listing: RouterOutputs["erc721Tokens"]["all"]["items"][number]["listings"][number];
+  token: RouterOutputs["erc721Tokens"]["all"]["items"][number];
 }) => {
   return (
     <div className="flex justify-between">
-      {listing?.price && (
+      {token?.price && (
         <div>
           <h6 className="uppercase">Price</h6>
-          <div>{listing?.price}</div>
+          <div>{token?.price}</div>
         </div>
       )}
       <div>

diff --git a/apps/nextjs/src/inngest/fetch_metadata.ts b/apps/nextjs/src/inngest/fetch_metadata.ts
@@ -1,7 +1,7 @@
 import { NextResponse } from "next/server";
 import { hash, shortString, uint256 } from "starknet";
 
-import { db, eq, schema } from "@realms-world/db";
+import { and, db, eq, schema, sql } from "@realms-world/db";
 
 import { getTokenContractAddresses } from "../utils/utils";
 //import { Client } from "https://esm.sh/ts-postgres";
@@ -101,9 +101,12 @@ export const fetchMetadata = inngest.createFunction(
             metadata: { attributes: parsedJson.attributes },
           })
           .where(
-            eq(
-              schema.erc721Tokens.id,
-              event.data.contract_address + ":" + event.data.tokenId,
+            and(
+              eq(
+                schema.erc721Tokens.id,
+                event.data.contract_address + ":" + event.data.tokenId,
+              ),
+              sql`upper_inf(_cursor)`,
             ),
           )
           .returning({ updatedId: schema.erc721Tokens.id });

diff --git a/packages/api/src/router/erc721Tokens.ts b/packages/api/src/router/erc721Tokens.ts
@@ -30,12 +30,12 @@ export const erc721TokensRouter = createTRPCRouter({
       const orderByFilter: SQL[] = [];
       const orderByVariable =
         orderBy == "floorAskPrice"
-          ? schema.erc721Tokens.listings
+          ? schema.erc721Tokens.price
           : schema.erc721Tokens.token_id;
       if (direction === "asc") {
-        orderByFilter.push(asc(schema.erc721Tokens.token_id));
+        orderByFilter.push(asc(orderByVariable));
       } else {
-        orderByFilter.push(desc(schema.erc721Tokens.token_id));
+        orderByFilter.push(desc(orderByVariable));
       }
 
       if (contractAddress) {

diff --git a/packages/db/index.ts b/packages/db/index.ts
@@ -29,7 +29,7 @@ if (!process.env.VERCEL_ENV) {
 
 neonConfig.fetchConnectionCache = true;
 
-export const sql = neon(process.env.DATABASE_URL!);
+export const neonSql = neon(process.env.DATABASE_URL!);
 //const queryClient = postgres('postgres://postgres:postgres@localhost:5432');
 
-export const db = drizzle(sql, { schema });
+export const db = drizzle(neonSql, { schema });