feat: add timestamp to model filter

ponder-sh · Jun 26, 2023 · 6ce1907 · 6ce1907
1 parent 5b8297b
commit 6ce1907
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 4 deletions.
diff --git a/packages/core/src/server/graphql/buildPluralField.ts b/packages/core/src/server/graphql/buildPluralField.ts
@@ -25,6 +25,7 @@ type PluralArgs = {
   skip?: number;
   orderBy?: string;
   orderDirection?: "asc" | "desc";
+  timestamp?: number;
 };
 type PluralResolver = GraphQLFieldResolver<Source, Context, PluralArgs>;
 
@@ -176,6 +177,7 @@ const buildPluralField = (
       skip: { type: GraphQLInt },
       orderBy: { type: GraphQLString },
       orderDirection: { type: GraphQLString },
+      timestamp: { type: GraphQLInt },
     },
     resolve: resolver,
   };

diff --git a/packages/core/src/server/graphql/buildSingularField.ts b/packages/core/src/server/graphql/buildSingularField.ts
@@ -2,16 +2,19 @@ import {
   GraphQLFieldConfig,
   GraphQLFieldResolver,
   GraphQLID,
+  GraphQLInt,
   GraphQLNonNull,
   GraphQLObjectType,
 } from "graphql";
 
 import type { Entity } from "@/schema/types";
+import { MAX_INTEGER } from "@/user-store/utils";
 
 import type { Context, Source } from "./buildGqlSchema";
 
 type SingularArgs = {
   id?: string;
+  timestamp?: number;
 };
 type SingularResolver = GraphQLFieldResolver<Source, Context, SingularArgs>;
 
@@ -22,11 +25,14 @@ const buildSingularField = (
   const resolver: SingularResolver = async (_, args, context) => {
     const { store } = context;
     const { id } = args;
+    let { timestamp } = args;
 
     if (!id) return null;
+    if (!timestamp) timestamp = MAX_INTEGER;
 
     const entityInstance = await store.findUnique({
       modelName: entity.name,
+      timestamp,
       id,
     });
 
@@ -65,6 +71,7 @@ const buildSingularField = (
     type: entityType,
     args: {
       id: { type: new GraphQLNonNull(GraphQLID) },
+      timestamp: { type: GraphQLInt },
     },
     resolve: resolver,
   };

diff --git a/packages/core/src/user-store/postgres/store.ts b/packages/core/src/user-store/postgres/store.ts
@@ -12,6 +12,7 @@ import {
   formatModelInstance,
   getWhereOperatorAndValue,
   parseModelFilter,
+  MAX_INTEGER,
 } from "../utils";
 
 const gqlScalarToSqlType = {
@@ -23,8 +24,6 @@ const gqlScalarToSqlType = {
   Float: "text",
 } as const;
 
-const MAX_INTEGER = 2_147_483_647 as const;
-
 export class PostgresUserStore implements UserStore {
   db: Kysely<any>;
 
@@ -432,6 +431,8 @@ export class PostgresUserStore implements UserStore {
   }) => {
     const tableName = `${modelName}_${this.versionId}`;
 
+    if (filter.timestamp) timestamp = filter.timestamp;
+
     let query = this.db
       .selectFrom(tableName)
       .selectAll()

diff --git a/packages/core/src/user-store/sqlite/store.ts b/packages/core/src/user-store/sqlite/store.ts
@@ -12,6 +12,7 @@ import {
   formatModelInstance,
   getWhereOperatorAndValue,
   parseModelFilter,
+  MAX_INTEGER,
 } from "../utils";
 
 const gqlScalarToSqlType = {
@@ -23,8 +24,6 @@ const gqlScalarToSqlType = {
   Float: "text",
 } as const;
 
-const MAX_INTEGER = 2_147_483_647 as const;
-
 export class SqliteUserStore implements UserStore {
   db: Kysely<any>;
 
@@ -412,6 +411,8 @@ export class SqliteUserStore implements UserStore {
   }) => {
     const tableName = `${modelName}_${this.versionId}`;
 
+    if (filter.timestamp) timestamp = filter.timestamp;
+
     let query = this.db
       .selectFrom(tableName)
       .selectAll()

diff --git a/packages/core/src/user-store/store.ts b/packages/core/src/user-store/store.ts
@@ -18,6 +18,7 @@ export type ModelFilter = {
   skip?: number;
   orderBy?: string;
   orderDirection?: "asc" | "desc";
+  timestamp?: number;
 };
 
 export type ModelInstance = {

diff --git a/packages/core/src/user-store/utils.ts b/packages/core/src/user-store/utils.ts
@@ -181,10 +181,13 @@ export function parseModelFilter(filter: ModelFilter = {}): ModelFilter {
   parsedFilter.orderBy = filter.orderBy;
   parsedFilter.orderDirection = filter.orderDirection;
   parsedFilter.where = filter.where;
+  parsedFilter.timestamp = filter.timestamp;
 
   return parsedFilter;
 }
 
 const DEFAULT_LIMIT = 100;
 const MAX_LIMIT = 1000;
 const MAX_SKIP = 5000;
+
+export const MAX_INTEGER = 2_147_483_647 as const;