add optional maybeAspectRatioFilter arg to listItems Query so the…

… `FrontsPinboardArticleButton` can request matching crops without having to get ALL the items for that pinboard and filter out the majority that it doesn't need
guardian · Nov 23, 2024 · bb03b86 · bb03b86
1 parent 21fe195
commit bb03b86
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 48 deletions.
diff --git a/cdk/lib/__snapshots__/stack.test.ts.snap b/cdk/lib/__snapshots__/stack.test.ts.snap
@@ -2449,7 +2449,7 @@ Object {
 
 type Query {
   # database-bridge-lambda queries
-  listItems(pinboardId: String!): [Item]
+  listItems(pinboardId: String!, maybeAspectRatioFilter: String): [Item]
   listLastItemSeenByUsers(pinboardId: String!): [LastItemSeenByUser]
   getMyUser: MyUser
   searchMentionableUsers(prefix: String!): UsersAndGroups
@@ -2680,7 +2680,7 @@ type PinboardIdWithItemCounts {
         "DataSourceName": "database_bridge_lambda_ds",
         "FieldName": "addManuallyOpenedPinboardIds",
         "Kind": "UNIT",
-        "ResponseMappingTemplate": "## schema checksum : 707f5a6af9682053bcaf47d47c4f26d0
+        "ResponseMappingTemplate": "## schema checksum : da5ab4d1435d8fb629c068ee4933d29c
 $util.toJson($ctx.result)",
         "TypeName": "Mutation",
       },
@@ -2701,7 +2701,7 @@ $util.toJson($ctx.result)",
         "DataSourceName": "database_bridge_lambda_ds",
         "FieldName": "changeFeatureFlag",
         "Kind": "UNIT",
-        "ResponseMappingTemplate": "## schema checksum : 707f5a6af9682053bcaf47d47c4f26d0
+        "ResponseMappingTemplate": "## schema checksum : da5ab4d1435d8fb629c068ee4933d29c
 $util.toJson($ctx.result)",
         "TypeName": "Mutation",
       },
@@ -2722,7 +2722,7 @@ $util.toJson($ctx.result)",
         "DataSourceName": "database_bridge_lambda_ds",
         "FieldName": "claimItem",
         "Kind": "UNIT",
-        "ResponseMappingTemplate": "## schema checksum : 707f5a6af9682053bcaf47d47c4f26d0
+        "ResponseMappingTemplate": "## schema checksum : da5ab4d1435d8fb629c068ee4933d29c
 $util.toJson($ctx.result)",
         "TypeName": "Mutation",
       },
@@ -2743,7 +2743,7 @@ $util.toJson($ctx.result)",
         "DataSourceName": "database_bridge_lambda_ds",
         "FieldName": "createItem",
         "Kind": "UNIT",
-        "ResponseMappingTemplate": "## schema checksum : 707f5a6af9682053bcaf47d47c4f26d0
+        "ResponseMappingTemplate": "## schema checksum : da5ab4d1435d8fb629c068ee4933d29c
 $util.toJson($ctx.result)",
         "TypeName": "Mutation",
       },
@@ -2764,7 +2764,7 @@ $util.toJson($ctx.result)",
         "DataSourceName": "database_bridge_lambda_ds",
         "FieldName": "deleteItem",
         "Kind": "UNIT",
-        "ResponseMappingTemplate": "## schema checksum : 707f5a6af9682053bcaf47d47c4f26d0
+        "ResponseMappingTemplate": "## schema checksum : da5ab4d1435d8fb629c068ee4933d29c
 $util.toJson($ctx.result)",
         "TypeName": "Mutation",
       },
@@ -2785,7 +2785,7 @@ $util.toJson($ctx.result)",
         "DataSourceName": "database_bridge_lambda_ds",
         "FieldName": "editItem",
         "Kind": "UNIT",
-        "ResponseMappingTemplate": "## schema checksum : 707f5a6af9682053bcaf47d47c4f26d0
+        "ResponseMappingTemplate": "## schema checksum : da5ab4d1435d8fb629c068ee4933d29c
 $util.toJson($ctx.result)",
         "TypeName": "Mutation",
       },
@@ -2806,7 +2806,7 @@ $util.toJson($ctx.result)",
         "DataSourceName": "database_bridge_lambda_ds",
         "FieldName": "removeManuallyOpenedPinboardIds",
         "Kind": "UNIT",
-        "ResponseMappingTemplate": "## schema checksum : 707f5a6af9682053bcaf47d47c4f26d0
+        "ResponseMappingTemplate": "## schema checksum : da5ab4d1435d8fb629c068ee4933d29c
 $util.toJson($ctx.result)",
         "TypeName": "Mutation",
       },
@@ -2827,7 +2827,7 @@ $util.toJson($ctx.result)",
         "DataSourceName": "database_bridge_lambda_ds",
         "FieldName": "seenItem",
         "Kind": "UNIT",
-        "ResponseMappingTemplate": "## schema checksum : 707f5a6af9682053bcaf47d47c4f26d0
+        "ResponseMappingTemplate": "## schema checksum : da5ab4d1435d8fb629c068ee4933d29c
 $util.toJson($ctx.result)",
         "TypeName": "Mutation",
       },
@@ -2848,7 +2848,7 @@ $util.toJson($ctx.result)",
         "DataSourceName": "database_bridge_lambda_ds",
         "FieldName": "setWebPushSubscriptionForUser",
         "Kind": "UNIT",
-        "ResponseMappingTemplate": "## schema checksum : 707f5a6af9682053bcaf47d47c4f26d0
+        "ResponseMappingTemplate": "## schema checksum : da5ab4d1435d8fb629c068ee4933d29c
 $util.toJson($ctx.result)",
         "TypeName": "Mutation",
       },
@@ -2869,7 +2869,7 @@ $util.toJson($ctx.result)",
         "DataSourceName": "database_bridge_lambda_ds",
         "FieldName": "visitTourStep",
         "Kind": "UNIT",
-        "ResponseMappingTemplate": "## schema checksum : 707f5a6af9682053bcaf47d47c4f26d0
+        "ResponseMappingTemplate": "## schema checksum : da5ab4d1435d8fb629c068ee4933d29c
 $util.toJson($ctx.result)",
         "TypeName": "Mutation",
       },
@@ -2890,7 +2890,7 @@ $util.toJson($ctx.result)",
         "DataSourceName": "database_bridge_lambda_ds",
         "FieldName": "getGroupPinboardIds",
         "Kind": "UNIT",
-        "ResponseMappingTemplate": "## schema checksum : 707f5a6af9682053bcaf47d47c4f26d0
+        "ResponseMappingTemplate": "## schema checksum : da5ab4d1435d8fb629c068ee4933d29c
 $util.toJson($ctx.result)",
         "TypeName": "Query",
       },
@@ -2911,7 +2911,7 @@ $util.toJson($ctx.result)",
         "DataSourceName": "database_bridge_lambda_ds",
         "FieldName": "getItemCounts",
         "Kind": "UNIT",
-        "ResponseMappingTemplate": "## schema checksum : 707f5a6af9682053bcaf47d47c4f26d0
+        "ResponseMappingTemplate": "## schema checksum : da5ab4d1435d8fb629c068ee4933d29c
 $util.toJson($ctx.result)",
         "TypeName": "Query",
       },
@@ -2932,7 +2932,7 @@ $util.toJson($ctx.result)",
         "DataSourceName": "database_bridge_lambda_ds",
         "FieldName": "getMyUser",
         "Kind": "UNIT",
-        "ResponseMappingTemplate": "## schema checksum : 707f5a6af9682053bcaf47d47c4f26d0
+        "ResponseMappingTemplate": "## schema checksum : da5ab4d1435d8fb629c068ee4933d29c
 $util.toJson($ctx.result)",
         "TypeName": "Query",
       },
@@ -2953,7 +2953,7 @@ $util.toJson($ctx.result)",
         "DataSourceName": "database_bridge_lambda_ds",
         "FieldName": "getUsers",
         "Kind": "UNIT",
-        "ResponseMappingTemplate": "## schema checksum : 707f5a6af9682053bcaf47d47c4f26d0
+        "ResponseMappingTemplate": "## schema checksum : da5ab4d1435d8fb629c068ee4933d29c
 $util.toJson($ctx.result)",
         "TypeName": "Query",
       },
@@ -2974,7 +2974,7 @@ $util.toJson($ctx.result)",
         "DataSourceName": "database_bridge_lambda_ds",
         "FieldName": "listItems",
         "Kind": "UNIT",
-        "ResponseMappingTemplate": "## schema checksum : 707f5a6af9682053bcaf47d47c4f26d0
+        "ResponseMappingTemplate": "## schema checksum : da5ab4d1435d8fb629c068ee4933d29c
 $util.toJson($ctx.result)",
         "TypeName": "Query",
       },
@@ -2995,7 +2995,7 @@ $util.toJson($ctx.result)",
         "DataSourceName": "database_bridge_lambda_ds",
         "FieldName": "listLastItemSeenByUsers",
         "Kind": "UNIT",
-        "ResponseMappingTemplate": "## schema checksum : 707f5a6af9682053bcaf47d47c4f26d0
+        "ResponseMappingTemplate": "## schema checksum : da5ab4d1435d8fb629c068ee4933d29c
 $util.toJson($ctx.result)",
         "TypeName": "Query",
       },
@@ -3016,7 +3016,7 @@ $util.toJson($ctx.result)",
         "DataSourceName": "database_bridge_lambda_ds",
         "FieldName": "searchMentionableUsers",
         "Kind": "UNIT",
-        "ResponseMappingTemplate": "## schema checksum : 707f5a6af9682053bcaf47d47c4f26d0
+        "ResponseMappingTemplate": "## schema checksum : da5ab4d1435d8fb629c068ee4933d29c
 $util.toJson($ctx.result)",
         "TypeName": "Query",
       },
@@ -3145,7 +3145,7 @@ $util.toJson($ctx.result)",
         "DataSourceName": "grid_bridge_lambda_ds",
         "FieldName": "asGridPayload",
         "Kind": "UNIT",
-        "ResponseMappingTemplate": "## schema checksum : 707f5a6af9682053bcaf47d47c4f26d0
+        "ResponseMappingTemplate": "## schema checksum : da5ab4d1435d8fb629c068ee4933d29c
 $util.toJson($ctx.result)",
         "TypeName": "Query",
       },
@@ -3166,7 +3166,7 @@ $util.toJson($ctx.result)",
         "DataSourceName": "grid_bridge_lambda_ds",
         "FieldName": "getGridSearchSummary",
         "Kind": "UNIT",
-        "ResponseMappingTemplate": "## schema checksum : 707f5a6af9682053bcaf47d47c4f26d0
+        "ResponseMappingTemplate": "## schema checksum : da5ab4d1435d8fb629c068ee4933d29c
 $util.toJson($ctx.result)",
         "TypeName": "Query",
       },
@@ -3295,7 +3295,7 @@ $util.toJson($ctx.result)",
         "DataSourceName": "workflow_bridge_lambda_ds",
         "FieldName": "getPinboardByComposerId",
         "Kind": "UNIT",
-        "ResponseMappingTemplate": "## schema checksum : 707f5a6af9682053bcaf47d47c4f26d0
+        "ResponseMappingTemplate": "## schema checksum : da5ab4d1435d8fb629c068ee4933d29c
 $util.toJson($ctx.result)",
         "TypeName": "Query",
       },
@@ -3316,7 +3316,7 @@ $util.toJson($ctx.result)",
         "DataSourceName": "workflow_bridge_lambda_ds",
         "FieldName": "getPinboardsByIds",
         "Kind": "UNIT",
-        "ResponseMappingTemplate": "## schema checksum : 707f5a6af9682053bcaf47d47c4f26d0
+        "ResponseMappingTemplate": "## schema checksum : da5ab4d1435d8fb629c068ee4933d29c
 $util.toJson($ctx.result)",
         "TypeName": "Query",
       },
@@ -3337,7 +3337,7 @@ $util.toJson($ctx.result)",
         "DataSourceName": "workflow_bridge_lambda_ds",
         "FieldName": "getPinboardsByPaths",
         "Kind": "UNIT",
-        "ResponseMappingTemplate": "## schema checksum : 707f5a6af9682053bcaf47d47c4f26d0
+        "ResponseMappingTemplate": "## schema checksum : da5ab4d1435d8fb629c068ee4933d29c
 $util.toJson($ctx.result)",
         "TypeName": "Query",
       },
@@ -3358,7 +3358,7 @@ $util.toJson($ctx.result)",
         "DataSourceName": "workflow_bridge_lambda_ds",
         "FieldName": "listPinboards",
         "Kind": "UNIT",
-        "ResponseMappingTemplate": "## schema checksum : 707f5a6af9682053bcaf47d47c4f26d0
+        "ResponseMappingTemplate": "## schema checksum : da5ab4d1435d8fb629c068ee4933d29c
 $util.toJson($ctx.result)",
         "TypeName": "Query",
       },

diff --git a/client/gql.ts b/client/gql.ts
@@ -81,8 +81,8 @@ const itemReturnFields = `
 
 // TODO: consider updating the resolver (cdk/stack.ts) to use a Query with a secondary index (if performance degrades when we have lots of items)
 export const gqlGetInitialItems = gql`
-    query MyQuery($pinboardId: String!) {
-        listItems(pinboardId: $pinboardId) {
+    query MyQuery($pinboardId: String!, $maybeAspectRatioFilter: String) {
+        listItems(pinboardId: $pinboardId, maybeAspectRatioFilter: $maybeAspectRatioFilter) {
             ${itemReturnFields}
         }
     }

diff --git a/client/src/fronts/frontsPinboardArticleButton.tsx b/client/src/fronts/frontsPinboardArticleButton.tsx
@@ -34,36 +34,22 @@ export const FrontsPinboardArticleButton = ({
     Array<[PayloadWithThumbnail, Item]>
   >([]);
 
-  const [getItems, { loading }] = useLazyQuery(
-    gqlGetInitialItems //TODO consider creating new query,
-  );
+  const [getItems, { loading }] = useLazyQuery(gqlGetInitialItems);
 
   useEffect(() => {
     if (isPinboardData(maybePinboardData) && withDraggableThumbsOfRatio) {
       getItems({
         variables: {
           pinboardId: maybePinboardData.id,
+          maybeAspectRatioFilter: withDraggableThumbsOfRatio,
         },
       }).then(({ data }) => {
         data?.listItems &&
           setCropsAtRequiredRatio(
-            data.listItems.reduce(
-              (acc: Array<[PayloadWithThumbnail, Item]>, item: Item) => {
-                const parsedPayload =
-                  item.payload &&
-                  (JSON.parse(item.payload) as PayloadWithThumbnail);
-                if (
-                  item.type === "grid-crop" &&
-                  parsedPayload &&
-                  parsedPayload.aspectRatio === withDraggableThumbsOfRatio
-                ) {
-                  return [...acc, [parsedPayload, item]];
-                } else {
-                  return acc;
-                }
-              },
-              []
-            )
+            data.listItems.map((item: Item) => [
+              JSON.parse(item.payload!),
+              item,
+            ])
           );
       });
     }

diff --git a/database-bridge-lambda/src/sql/Item.ts b/database-bridge-lambda/src/sql/Item.ts
@@ -97,13 +97,18 @@ export const deleteItem = async (
 
 export const listItems = (
   sql: Sql,
-  args: { pinboardId: string },
+  args: { pinboardId: string; maybeAspectRatioFilter?: string },
   userEmail: string
 ) => sql`
     SELECT ${fragmentItemFields(sql, userEmail)}
     FROM "Item"
     WHERE "pinboardId" = ${args.pinboardId}
       AND "isArchived" = false
+    ${
+      args.maybeAspectRatioFilter
+        ? sql`AND "type" = 'grid-crop' AND  "payload" ->> 'aspectRatio' = ${args.maybeAspectRatioFilter}`
+        : sql``
+    }
 `;
 
 export const claimItem = (

diff --git a/shared/graphql/schema.graphql b/shared/graphql/schema.graphql
@@ -6,7 +6,7 @@ schema {
 
 type Query {
   # database-bridge-lambda queries
-  listItems(pinboardId: String!): [Item]
+  listItems(pinboardId: String!, maybeAspectRatioFilter: String): [Item]
   listLastItemSeenByUsers(pinboardId: String!): [LastItemSeenByUser]
   getMyUser: MyUser
   searchMentionableUsers(prefix: String!): UsersAndGroups