Merge pull request #217 from hypercerts-org/feat/attestation_resolver_with_schemas

Attestation resolver with schemas

Author: bitbeckers

schema.graphql

@@ -81,8 +81,11 @@ type Attestation {
   """Encoded data of the attestation"""
   data: JSON
 
+  """Schema related to the attestation"""
+  eas_schema: AttestationSchemaBaseType!
+
   """Hypercert related to the attestation"""
-  hypercert: HypercertBaseType
+  hypercert: HypercertBaseType!
   id: ID!
 
   """Block number at which the attestation was last updated"""
@@ -98,10 +101,40 @@ type Attestation {
   resolver: String
 
   """Unique identifier of the EAS schema used to create the attestation"""
-  schema: String
+  schema_uid: String
+
+  """Unique identifier for the attestation on EAS"""
+  uid: ID
+}
+
+type AttestationBaseType {
+  """Address of the creator of the attestation"""
+  attester: String
+
+  """Block number at which the attestation was created"""
+  creation_block_number: EthBigInt
+
+  """Timestamp at which the attestation was created"""
+  creation_block_timestamp: EthBigInt
+
+  """Encoded data of the attestation"""
+  data: JSON
+  id: ID!
+
+  """Block number at which the attestation was last updated"""
+  last_update_block_number: EthBigInt
+
+  """Timestamp at which the attestation was last updated"""
+  last_update_block_timestamp: EthBigInt
+
+  """Address of the recipient of the attestation"""
+  recipient: String
+
+  """Address of the resolver contract for the attestation"""
+  resolver: String
 
-  """ID referencing the supported EAS schema in the database"""
-  supported_schemas_id: ID
+  """Unique identifier of the EAS schema used to create the attestation"""
+  schema_uid: String
 
   """Unique identifier for the attestation on EAS"""
   uid: ID
@@ -114,23 +147,42 @@ input AttestationFetchInput {
 """Supported EAS attestation schemas and their related records"""
 type AttestationSchema {
   """Chain ID of the chains where the attestation schema is supported"""
-  chain_id: EthBigInt
+  chain_id: EthBigInt!
   id: ID!
 
   """List of attestations related to the attestation schema"""
-  records: [Attestation!]
+  records: [AttestationBaseType!]!
 
   """Address of the resolver contract for the attestation schema"""
-  resolver: String
+  resolver: String!
 
   """Whether the attestation schema is revocable"""
-  revocable: Boolean
+  revocable: Boolean!
 
   """String representation of the attestation schema"""
-  schema: String
+  schema: String!
 
   """Unique identifier for the attestation schema"""
-  uid: ID
+  uid: ID!
+}
+
+"""Supported EAS attestation schemas and their related records"""
+type AttestationSchemaBaseType {
+  """Chain ID of the chains where the attestation schema is supported"""
+  chain_id: EthBigInt!
+  id: ID!
+
+  """Address of the resolver contract for the attestation schema"""
+  resolver: String!
+
+  """Whether the attestation schema is revocable"""
+  revocable: Boolean!
+
+  """String representation of the attestation schema"""
+  schema: String!
+
+  """Unique identifier for the attestation schema"""
+  uid: ID!
 }
 
 input AttestationSortOptions {
@@ -151,33 +203,36 @@ input AttestationWhereInput {
   contract_address: StringSearchOptions
   creation_block_number: BigIntSearchOptions
   creation_block_timestamp: BigIntSearchOptions
+  eas_schema: BasicAttestationSchemaWhereInput
   hypercerts: BasicHypercertWhereArgs
-  id: IdSearchOptions
   last_update_block_number: BigIntSearchOptions
   last_update_block_timestamp: BigIntSearchOptions
   metadata: BasicMetadataWhereInput
   recipient: StringSearchOptions
   resolver: StringSearchOptions
-  schema: StringSearchOptions
-  supported_schemas_id: StringSearchOptions
   token_id: StringSearchOptions
   uid: StringSearchOptions
 }
 
+input BasicAttestationSchemaWhereInput {
+  chain_id: BigIntSearchOptions
+  resolver: StringSearchOptions
+  revocable: BooleanSearchOptions
+  schema: StringSearchOptions
+  uid: StringSearchOptions
+}
+
 input BasicAttestationWhereInput {
   attestation: StringSearchOptions
   attester: StringSearchOptions
   chain_id: BigIntSearchOptions
   contract_address: StringSearchOptions
   creation_block_number: BigIntSearchOptions
   creation_block_timestamp: BigIntSearchOptions
-  id: IdSearchOptions
   last_update_block_number: BigIntSearchOptions
   last_update_block_timestamp: BigIntSearchOptions
   recipient: StringSearchOptions
   resolver: StringSearchOptions
-  schema: StringSearchOptions
-  supported_schemas_id: StringSearchOptions
   token_id: StringSearchOptions
   uid: StringSearchOptions
 }

src/__generated__/routes/routes.ts

@@ -6,13 +6,16 @@ import { BasicHypercertWhereArgs } from "../inputs/hypercertsInput.js";
 import type { OrderOptions } from "../inputs/orderOptions.js";
 import type { Attestation } from "../typeDefs/attestationTypeDefs.js";
 import { AttestationSortOptions } from "../inputs/sortOptions.js";
+import { BasicAttestationSchemaWhereInput } from "../inputs/attestationSchemaInput.js";
 
 @InputType()
 class AttestationWhereInput extends BasicAttestationWhereInput {
   @Field(() => BasicHypercertWhereArgs, { nullable: true })
   hypercerts?: BasicHypercertWhereArgs;
   @Field(() => BasicMetadataWhereInput, { nullable: true })
   metadata?: BasicMetadataWhereInput;
+  @Field(() => BasicAttestationSchemaWhereInput, { nullable: true })
+  eas_schema?: BasicAttestationSchemaWhereInput;
 }
 
 @InputType()

src/__generated__/swagger.json

@@ -1,20 +1,12 @@
 import { Field, InputType } from "type-graphql";
 import type { WhereOptions } from "./whereOptions.js";
-import {
-  IdSearchOptions,
-  BigIntSearchOptions,
-  StringSearchOptions,
-} from "./searchOptions.js";
+import { BigIntSearchOptions, StringSearchOptions } from "./searchOptions.js";
 import type { Attestation } from "../typeDefs/attestationTypeDefs.js";
 
 @InputType()
 export class BasicAttestationWhereInput implements WhereOptions<Attestation> {
-  @Field(() => IdSearchOptions, { nullable: true })
-  id?: IdSearchOptions;
   @Field(() => StringSearchOptions, { nullable: true })
   uid?: StringSearchOptions;
-  @Field(() => StringSearchOptions, { nullable: true })
-  supported_schemas_id?: StringSearchOptions;
   @Field(() => BigIntSearchOptions, { nullable: true })
   creation_block_timestamp?: BigIntSearchOptions;
   @Field(() => BigIntSearchOptions, { nullable: true })
@@ -30,8 +22,6 @@ export class BasicAttestationWhereInput implements WhereOptions<Attestation> {
   @Field(() => StringSearchOptions, { nullable: true })
   resolver?: StringSearchOptions;
   @Field(() => StringSearchOptions, { nullable: true })
-  schema?: StringSearchOptions;
-  @Field(() => StringSearchOptions, { nullable: true })
   attestation?: StringSearchOptions;
   @Field(() => BigIntSearchOptions, { nullable: true })
   chain_id?: BigIntSearchOptions;

src/graphql/schemas/args/attestationArgs.ts

@@ -1,19 +1,16 @@
 import { Field, InputType } from "type-graphql";
-import type { WhereOptions } from "./whereOptions.js";
+import type { AttestationSchema } from "../typeDefs/attestationSchemaTypeDefs.js";
 import {
-  BooleanSearchOptions,
-  IdSearchOptions,
   BigIntSearchOptions,
+  BooleanSearchOptions,
   StringSearchOptions,
 } from "./searchOptions.js";
-import type { AttestationSchema } from "../typeDefs/attestationSchemaTypeDefs.js";
+import type { WhereOptions } from "./whereOptions.js";
 
 @InputType()
 export class BasicAttestationSchemaWhereInput
   implements WhereOptions<AttestationSchema>
 {
-  @Field(() => IdSearchOptions, { nullable: true })
-  id?: IdSearchOptions | null;
   @Field(() => StringSearchOptions, { nullable: true })
   uid?: StringSearchOptions | null;
   @Field(() => BigIntSearchOptions, { nullable: true })

src/graphql/schemas/inputs/attestationInput.ts

@@ -54,6 +54,20 @@ class AttestationResolver extends AttestationBaseResolver {
       true,
     );
   }
+
+  @FieldResolver()
+  async eas_schema(@Root() attestation: Attestation) {
+    if (!attestation.schema_uid) return;
+
+    return await this.getAttestationSchemas(
+      {
+        where: {
+          uid: { eq: attestation.schema_uid },
+        },
+      },
+      true,
+    );
+  }
 }
 
 export { AttestationResolver };

src/graphql/schemas/inputs/attestationSchemaInput.ts

@@ -11,7 +11,9 @@ import { GetAttestationSchemasArgs } from "../args/attestationSchemaArgs.js";
 import { createBaseResolver, DataResponse } from "./baseTypes.js";
 
 @ObjectType()
-class GetAttestationsSchemaResponse extends DataResponse(AttestationSchema) {}
+export default class GetAttestationsSchemaResponse extends DataResponse(
+  AttestationSchema,
+) {}
 
 const AttestationSchemaBaseResolver = createBaseResolver("attestationSchema");
 

src/graphql/schemas/resolvers/attestationResolver.ts

@@ -1,18 +1,19 @@
-import { type ClassType, Field, Int, Resolver, ObjectType } from "type-graphql";
-import { SupabaseDataService } from "../../../services/SupabaseDataService.js";
 import { container } from "tsyringe";
+import { type ClassType, Field, Int, ObjectType, Resolver } from "type-graphql";
 import { SupabaseCachingService } from "../../../services/SupabaseCachingService.js";
-import { GetMetadataArgs } from "../args/metadataArgs.js";
-import { GetContractsArgs } from "../args/contractArgs.js";
-import { GetFractionsArgs } from "../args/fractionArgs.js";
+import { SupabaseDataService } from "../../../services/SupabaseDataService.js";
 import { GetAllowlistRecordsArgs } from "../args/allowlistRecordArgs.js";
-import { GetAttestationSchemasArgs } from "../args/attestationSchemaArgs.js";
 import { GetAttestationsArgs } from "../args/attestationArgs.js";
+import { GetAttestationSchemasArgs } from "../args/attestationSchemaArgs.js";
+import { GetBlueprintArgs } from "../args/blueprintArgs.js";
+import { GetContractsArgs } from "../args/contractArgs.js";
+import { GetFractionsArgs } from "../args/fractionArgs.js";
 import { GetHypercertsArgs } from "../args/hypercertsArgs.js";
+import { GetMetadataArgs } from "../args/metadataArgs.js";
+import { GetOrdersArgs } from "../args/orderArgs.js";
 import { GetSalesArgs } from "../args/salesArgs.js";
-import { GetUserArgs } from "../args/userArgs.js";
-import { GetBlueprintArgs } from "../args/blueprintArgs.js";
 import { GetSignatureRequestArgs } from "../args/signatureRequestArgs.js";
+import { GetUserArgs } from "../args/userArgs.js";
 
 export function DataResponse<TItem extends object>(
   TItemClass: ClassType<TItem>,
@@ -256,6 +257,7 @@ export function createBaseResolver<T extends ClassType>(
 
       try {
         const queries = this.supabaseCachingService.getAttestations(args);
+
         if (single) {
           const res = await queries.data.executeTakeFirst();
           return res ? this.parseAttestation(res) : null;