Merge pull request #5978 from artsy/cover-artwork-fallback

chore: allow a missing _or_ unpublished cover artwork to fallback on Artist
artsy · Sep 5, 2024 · 53e17e3 · 53e17e3
2 parents 62fb361 + c554b1a
commit 53e17e3
Showing 1 changed file with 14 additions and 13 deletions.
diff --git a/src/schema/v2/artist/index.ts b/src/schema/v2/artist/index.ts
@@ -696,22 +696,23 @@ export const ArtistType = new GraphQLObjectType<any, ResolverContext>({
           _options,
           { artistArtworksLoader, artworkLoader }
         ) => {
-          try {
-            if (cover_artwork_id) {
-              return artworkLoader(cover_artwork_id)
+          if (cover_artwork_id) {
+            try {
+              return await artworkLoader(cover_artwork_id)
+            } catch {
+              // Intentionally ignore errors from unpublished/deleted artworks
+              // that are set as cover artworks.
             }
+          }
 
-            const [fallbackArtwork] = await artistArtworksLoader(id, {
-              offset: 0,
-              size: 1,
-              sort: "-iconicity",
-              published: true,
-            })
+          const [fallbackArtwork] = await artistArtworksLoader(id, {
+            offset: 0,
+            size: 1,
+            sort: "-iconicity",
+            published: true,
+          })
 
-            return fallbackArtwork
-          } catch (error) {
-            return null
-          }
+          return fallbackArtwork
         },
       },
       createdAt: date(),