feat(order): add order resolver and enhance marketplace order services

- Implements and polishes marketplace order entities handlers.
- Enhanced MarketplaceOrdersService with comprehensive documentation and new methods for order management
- Updated test coverage for OrderResolver and MarketplaceOrdersService, including error handling and mock data generation
- Introduced new utility functions for generating mock orders and collections

Author: bitbeckers

package.json

@@ -54,6 +54,7 @@
     "@web3-storage/w3up-client": "^16.0.0",
     "axios": "^1.6.5",
     "cors": "^2.8.5",
+    "date-fns": "^4.1.0",
     "ethers": "^6.12.2",
     "express": "^4.19.2",
     "file-type": "^19.6.0",

pnpm-lock.yaml

@@ -6,6 +6,15 @@ import type { CachingDatabase } from "../types/kyselySupabaseCaching.js";
 import type { DataDatabase } from "../types/kyselySupabaseData.js";
 import { cachingDatabaseUrl, dataDatabaseUrl } from "../utils/constants.js";
 import { container } from "tsyringe";
+import { format } from "date-fns";
+
+pkg.types.setTypeParser(pkg.types.builtins.TIMESTAMPTZ, (val) => {
+  return format(new Date(val), "t");
+});
+
+pkg.types.setTypeParser(pkg.types.builtins.TIMESTAMP, (val) => {
+  return format(new Date(val), "t");
+});
 
 export abstract class BaseKyselyService<
   DB extends CachingDatabase | DataDatabase,

src/client/kysely.ts

@@ -4,7 +4,7 @@ import { ContractResolver } from "../../../services/graphql/resolvers/contractRe
 import { FractionResolver } from "../../../services/graphql/resolvers/fractionResolver.js";
 import { AttestationResolver } from "../../../services/graphql/resolvers/attestationResolver.js";
 import { AttestationSchemaResolver } from "../../../services/graphql/resolvers/attestationSchemaResolver.js";
-import { OrderResolver } from "./orderResolver.js";
+import { OrderResolver } from "../../../services/graphql/resolvers/orderResolver.js";
 import { HyperboardResolver } from "./hyperboardResolver.js";
 import { AllowlistRecordResolver } from "../../../services/graphql/resolvers/allowlistRecordResolver.js";
 import { SalesResolver } from "../../../services/graphql/resolvers/salesResolver.js";

src/graphql/schemas/resolvers/composed.ts

@@ -1,6 +1,6 @@
-import { Field, ObjectType } from "type-graphql";
-import { EthBigInt } from "../../scalars/ethBigInt.js";
+import { Field, Int, ObjectType } from "type-graphql";
 import { DataResponse } from "../../../lib/graphql/DataResponse.js";
+import { EthBigInt } from "../../scalars/ethBigInt.js";
 import { BasicTypeDef } from "./baseTypes/basicTypeDef.js";
 import { HypercertBaseType } from "./baseTypes/hypercertBaseType.js";
 
@@ -11,7 +11,7 @@ export class Order extends BasicTypeDef {
   @Field()
   hypercert_id?: string;
   @Field()
-  createdAt?: string;
+  createdAt?: number;
   @Field()
   quoteType?: number;
   @Field()
@@ -48,8 +48,8 @@ export class Order extends BasicTypeDef {
   amounts?: number[];
   @Field()
   invalidated?: boolean;
-  @Field(() => [String], { nullable: true })
-  validator_codes?: string[];
+  @Field(() => [Int], { nullable: true })
+  validator_codes?: number[];
 
   @Field()
   pricePerPercentInUSD?: string;

src/graphql/schemas/resolvers/orderResolver.ts

@@ -240,6 +240,31 @@ export function buildWhereCondition<
               and ${nestedConditions}
             )`,
           );
+        } else if (tableName === "collections" && relatedTable === "users") {
+          // TODO: This is a hack to support the collections.users relation
+          // TODO: This should be removed once we have a proper relation in TABLE_RELATIONS or a view in the database
+          conditions.push(
+            sql<SqlBool>`exists (
+              select 1 from "users"
+              inner join "collection_admins" on "users".id = "collection_admins".user_id
+              inner join "collections" on "collections".id = "collection_admins".collection_id
+              and ${nestedConditions}
+            )`,
+          );
+        } else if (
+          tableName === "collections" &&
+          relatedTable === "blueprints_with_admins"
+        ) {
+          // TODO: This is a hack to support the collections.blueprints relation
+          // TODO: This should be removed once we have a proper relation in TABLE_RELATIONS or a view in the database
+          conditions.push(
+            sql<SqlBool>`exists (
+              select from "blueprints_with_admins"
+              inner join "collection_blueprints" on "blueprints_with_admins".id = "collection_blueprints".blueprint_id
+              inner join "collections" on "collections".id = "collection_blueprints".collection_id
+              and ${nestedConditions}
+            )`,
+          );
         } else {
           // Fall back to default foreign key pattern for standard relationships
           conditions.push(

src/graphql/schemas/typeDefs/orderTypeDefs.ts

@@ -35,12 +35,6 @@ export const TABLE_RELATIONS: TableRelations = {
       joinCondition: "claims.hypercert_id = fractions_view.hypercert_id",
     },
   },
-  collections: {
-    users: {
-      joinCondition:
-        "users.id = collection_admins.user_id AND collections.id = collection_admins.collection_id",
-    },
-  },
   sales: {
     claims: {
       joinCondition: "claims.hypercert_id = sales.hypercert_id",

src/lib/db/queryModifiers/buildWhereCondition.ts

@@ -228,6 +228,7 @@ export class CollectionService {
           hidden: eb.ref("excluded.hidden"),
         })),
       )
+      .returningAll()
       .execute();
   }