From 9919ff53866cccc67e049087135f1e092e5aef27 Mon Sep 17 00:00:00 2001
From: Steven Baughman <steve@iworkinprogress.com>
Date: Fri, 23 Sep 2022 14:57:00 -0400
Subject: [PATCH 1/2] Add artifactUri, thumbnailUri, and displayUri to top
 level of Objkt

---
 src/Entity/Objkt.ts           | 23 +++++++++++++++++++++++
 src/Resolver/ObjktResolver.ts | 24 ++++++++++++++++++++++++
 2 files changed, 47 insertions(+)

diff --git a/src/Entity/Objkt.ts b/src/Entity/Objkt.ts
index 20070f8..c780179 100644
--- a/src/Entity/Objkt.ts
+++ b/src/Entity/Objkt.ts
@@ -103,6 +103,29 @@ export class Objkt extends BaseEntity {
   @Column({ nullable: true })
   metadataUri: string
 
+  @Field({
+    nullable: true,
+    description:
+      "IPFS uri pointing to the web page hosting the Generator code.",
+  })
+  @Column({ nullable: true })
+  artifactUri?: string;
+
+  @Field({
+    nullable: true,
+    description:
+      "IPFS uri pointing to the 300x300 (contained) thumbnail of the gentk",
+  })
+  @Column({ nullable: true })
+  thumbnailUri?: string;
+
+  @Field({
+    nullable: true,
+    description: "IPFS uri pointing to the full res image of the gentk",
+  })
+  @Column({ nullable: true })
+  displayUri?: string;
+
   @Field(() => [String], {
     nullable: true,
     description: "A list of tags, set by the author(s) at mint time. Corresponds the the Generative Token tags."
diff --git a/src/Resolver/ObjktResolver.ts b/src/Resolver/ObjktResolver.ts
index 2060db2..2c0ea25 100644
--- a/src/Resolver/ObjktResolver.ts
+++ b/src/Resolver/ObjktResolver.ts
@@ -47,6 +47,30 @@ export class ObjktResolver {
 		return ctx.genTokLoader.load(objkt.issuerId)
 	}
 
+	@FieldResolver((returns) => String, {
+		description: "IPFS uri pointing to the web page hosting the Generator code.",
+	})
+	artifactUri(@Root() objkt: Objkt, @Ctx() ctx: RequestContext) {
+		if (objkt.artifactUri) return objkt.artifactUri;
+		return ctx.genTokLoader.load(objkt.metadata?.artifactUri);
+	}
+
+	@FieldResolver((returns) => String, {
+		description: "IPFS uri pointing to the 300x300 (contained) thumbnail",
+	})
+	thumbnailUri(@Root() objkt: Objkt, @Ctx() ctx: RequestContext) {
+		if (objkt.thumbnailUri) return objkt.thumbnailUri;
+		return ctx.genTokLoader.load(objkt.metadata?.thumbnailUri);
+	}
+
+	@FieldResolver((returns) => String, {
+		description: "IPFS uri pointing to the full res image",
+	})
+	displayUri(@Root() objkt: Objkt, @Ctx() ctx: RequestContext) {
+		if (objkt.displayUri) return objkt.displayUri;
+		return ctx.genTokLoader.load(objkt.metadata?.displayUri);
+	}
+
 	@FieldResolver(returns => [Split], {
 		description: "A list of the royalties split for this gentk."
 	})

From 594ab620ed7c6f9a203c5e796d4b395ae03d7f78 Mon Sep 17 00:00:00 2001
From: Steven Baughman <steve@iworkinprogress.com>
Date: Sun, 25 Sep 2022 13:48:22 -0400
Subject: [PATCH 2/2] Updates based on PR feedback

- Remove artificatUri
- Remove Data Loader wrapper for displayUri and thumbnailUri
---
 src/Entity/Objkt.ts           |  8 --------
 src/Resolver/ObjktResolver.ts | 14 ++------------
 2 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/src/Entity/Objkt.ts b/src/Entity/Objkt.ts
index c780179..c8590c8 100644
--- a/src/Entity/Objkt.ts
+++ b/src/Entity/Objkt.ts
@@ -103,14 +103,6 @@ export class Objkt extends BaseEntity {
   @Column({ nullable: true })
   metadataUri: string
 
-  @Field({
-    nullable: true,
-    description:
-      "IPFS uri pointing to the web page hosting the Generator code.",
-  })
-  @Column({ nullable: true })
-  artifactUri?: string;
-
   @Field({
     nullable: true,
     description:
diff --git a/src/Resolver/ObjktResolver.ts b/src/Resolver/ObjktResolver.ts
index 2c0ea25..31ec741 100644
--- a/src/Resolver/ObjktResolver.ts
+++ b/src/Resolver/ObjktResolver.ts
@@ -47,28 +47,18 @@ export class ObjktResolver {
 		return ctx.genTokLoader.load(objkt.issuerId)
 	}
 
-	@FieldResolver((returns) => String, {
-		description: "IPFS uri pointing to the web page hosting the Generator code.",
-	})
-	artifactUri(@Root() objkt: Objkt, @Ctx() ctx: RequestContext) {
-		if (objkt.artifactUri) return objkt.artifactUri;
-		return ctx.genTokLoader.load(objkt.metadata?.artifactUri);
-	}
-
 	@FieldResolver((returns) => String, {
 		description: "IPFS uri pointing to the 300x300 (contained) thumbnail",
 	})
 	thumbnailUri(@Root() objkt: Objkt, @Ctx() ctx: RequestContext) {
-		if (objkt.thumbnailUri) return objkt.thumbnailUri;
-		return ctx.genTokLoader.load(objkt.metadata?.thumbnailUri);
+		return objkt.metadata?.thumbnailUri;
 	}
 
 	@FieldResolver((returns) => String, {
 		description: "IPFS uri pointing to the full res image",
 	})
 	displayUri(@Root() objkt: Objkt, @Ctx() ctx: RequestContext) {
-		if (objkt.displayUri) return objkt.displayUri;
-		return ctx.genTokLoader.load(objkt.metadata?.displayUri);
+		return objkt.metadata?.displayUri;
 	}
 
 	@FieldResolver(returns => [Split], {