add featureFlags JSONB column to database, added to the MyUser ty…

…pe (as json string) and updated via new mutation `changeFeatureFlag`
guardian · Nov 4, 2024 · c844f2a · c844f2a
1 parent df69b6d
commit c844f2a
Show file tree

Hide file tree

Showing 8 changed files with 77 additions and 22 deletions.
diff --git a/cdk/lib/__snapshots__/stack.test.ts.snap b/cdk/lib/__snapshots__/stack.test.ts.snap
@@ -2475,6 +2475,7 @@ type Mutation {
   addManuallyOpenedPinboardIds(pinboardId: String!, maybeEmailOverride: String): MyUser
   removeManuallyOpenedPinboardIds(pinboardIdToClose: String!): MyUser
   visitTourStep(tourStepId: String!): MyUser
+  changeFeatureFlag(flagId: String!, newValue: Boolean!): MyUser
 }
 
 type Subscription {
@@ -2539,6 +2540,7 @@ type MyUser {
   hasWebPushSubscription: Boolean
   manuallyOpenedPinboardIds: [String!]
   hasEverUsedTour: Boolean!
+  featureFlags: AWSJSON
 }
 
 type Group {
@@ -2669,7 +2671,28 @@ type PinboardIdWithItemCounts {
         "DataSourceName": "database_bridge_lambda_ds",
         "FieldName": "addManuallyOpenedPinboardIds",
         "Kind": "UNIT",
-        "ResponseMappingTemplate": "## schema checksum : aa02bae16942e48366fa36a1cd643d16
+        "ResponseMappingTemplate": "## schema checksum : 7988db64c71d520310206ab1f55f3ca3
+$util.toJson($ctx.result)",
+        "TypeName": "Mutation",
+      },
+      "Type": "AWS::AppSync::Resolver",
+    },
+    "pinboardappsyncapidatabasebridgelambdadsMutationchangeFeatureFlagResolver77AF20F3": Object {
+      "DependsOn": Array [
+        "pinboardappsyncapidatabasebridgelambdads970CB9A7",
+        "pinboardappsyncapiSchema868D9F5B",
+      ],
+      "Properties": Object {
+        "ApiId": Object {
+          "Fn::GetAtt": Array [
+            "pinboardappsyncapi9D519400",
+            "ApiId",
+          ],
+        },
+        "DataSourceName": "database_bridge_lambda_ds",
+        "FieldName": "changeFeatureFlag",
+        "Kind": "UNIT",
+        "ResponseMappingTemplate": "## schema checksum : 7988db64c71d520310206ab1f55f3ca3
 $util.toJson($ctx.result)",
         "TypeName": "Mutation",
       },
@@ -2690,7 +2713,7 @@ $util.toJson($ctx.result)",
         "DataSourceName": "database_bridge_lambda_ds",
         "FieldName": "claimItem",
         "Kind": "UNIT",
-        "ResponseMappingTemplate": "## schema checksum : aa02bae16942e48366fa36a1cd643d16
+        "ResponseMappingTemplate": "## schema checksum : 7988db64c71d520310206ab1f55f3ca3
 $util.toJson($ctx.result)",
         "TypeName": "Mutation",
       },
@@ -2711,7 +2734,7 @@ $util.toJson($ctx.result)",
         "DataSourceName": "database_bridge_lambda_ds",
         "FieldName": "createItem",
         "Kind": "UNIT",
-        "ResponseMappingTemplate": "## schema checksum : aa02bae16942e48366fa36a1cd643d16
+        "ResponseMappingTemplate": "## schema checksum : 7988db64c71d520310206ab1f55f3ca3
 $util.toJson($ctx.result)",
         "TypeName": "Mutation",
       },
@@ -2732,7 +2755,7 @@ $util.toJson($ctx.result)",
         "DataSourceName": "database_bridge_lambda_ds",
         "FieldName": "deleteItem",
         "Kind": "UNIT",
-        "ResponseMappingTemplate": "## schema checksum : aa02bae16942e48366fa36a1cd643d16
+        "ResponseMappingTemplate": "## schema checksum : 7988db64c71d520310206ab1f55f3ca3
 $util.toJson($ctx.result)",
         "TypeName": "Mutation",
       },
@@ -2753,7 +2776,7 @@ $util.toJson($ctx.result)",
         "DataSourceName": "database_bridge_lambda_ds",
         "FieldName": "editItem",
         "Kind": "UNIT",
-        "ResponseMappingTemplate": "## schema checksum : aa02bae16942e48366fa36a1cd643d16
+        "ResponseMappingTemplate": "## schema checksum : 7988db64c71d520310206ab1f55f3ca3
 $util.toJson($ctx.result)",
         "TypeName": "Mutation",
       },
@@ -2774,7 +2797,7 @@ $util.toJson($ctx.result)",
         "DataSourceName": "database_bridge_lambda_ds",
         "FieldName": "removeManuallyOpenedPinboardIds",
         "Kind": "UNIT",
-        "ResponseMappingTemplate": "## schema checksum : aa02bae16942e48366fa36a1cd643d16
+        "ResponseMappingTemplate": "## schema checksum : 7988db64c71d520310206ab1f55f3ca3
 $util.toJson($ctx.result)",
         "TypeName": "Mutation",
       },
@@ -2795,7 +2818,7 @@ $util.toJson($ctx.result)",
         "DataSourceName": "database_bridge_lambda_ds",
         "FieldName": "seenItem",
         "Kind": "UNIT",
-        "ResponseMappingTemplate": "## schema checksum : aa02bae16942e48366fa36a1cd643d16
+        "ResponseMappingTemplate": "## schema checksum : 7988db64c71d520310206ab1f55f3ca3
 $util.toJson($ctx.result)",
         "TypeName": "Mutation",
       },
@@ -2816,7 +2839,7 @@ $util.toJson($ctx.result)",
         "DataSourceName": "database_bridge_lambda_ds",
         "FieldName": "setWebPushSubscriptionForUser",
         "Kind": "UNIT",
-        "ResponseMappingTemplate": "## schema checksum : aa02bae16942e48366fa36a1cd643d16
+        "ResponseMappingTemplate": "## schema checksum : 7988db64c71d520310206ab1f55f3ca3
 $util.toJson($ctx.result)",
         "TypeName": "Mutation",
       },
@@ -2837,7 +2860,7 @@ $util.toJson($ctx.result)",
         "DataSourceName": "database_bridge_lambda_ds",
         "FieldName": "visitTourStep",
         "Kind": "UNIT",
-        "ResponseMappingTemplate": "## schema checksum : aa02bae16942e48366fa36a1cd643d16
+        "ResponseMappingTemplate": "## schema checksum : 7988db64c71d520310206ab1f55f3ca3
 $util.toJson($ctx.result)",
         "TypeName": "Mutation",
       },
@@ -2858,7 +2881,7 @@ $util.toJson($ctx.result)",
         "DataSourceName": "database_bridge_lambda_ds",
         "FieldName": "getGroupPinboardIds",
         "Kind": "UNIT",
-        "ResponseMappingTemplate": "## schema checksum : aa02bae16942e48366fa36a1cd643d16
+        "ResponseMappingTemplate": "## schema checksum : 7988db64c71d520310206ab1f55f3ca3
 $util.toJson($ctx.result)",
         "TypeName": "Query",
       },
@@ -2879,7 +2902,7 @@ $util.toJson($ctx.result)",
         "DataSourceName": "database_bridge_lambda_ds",
         "FieldName": "getItemCounts",
         "Kind": "UNIT",
-        "ResponseMappingTemplate": "## schema checksum : aa02bae16942e48366fa36a1cd643d16
+        "ResponseMappingTemplate": "## schema checksum : 7988db64c71d520310206ab1f55f3ca3
 $util.toJson($ctx.result)",
         "TypeName": "Query",
       },
@@ -2900,7 +2923,7 @@ $util.toJson($ctx.result)",
         "DataSourceName": "database_bridge_lambda_ds",
         "FieldName": "getMyUser",
         "Kind": "UNIT",
-        "ResponseMappingTemplate": "## schema checksum : aa02bae16942e48366fa36a1cd643d16
+        "ResponseMappingTemplate": "## schema checksum : 7988db64c71d520310206ab1f55f3ca3
 $util.toJson($ctx.result)",
         "TypeName": "Query",
       },
@@ -2921,7 +2944,7 @@ $util.toJson($ctx.result)",
         "DataSourceName": "database_bridge_lambda_ds",
         "FieldName": "getUsers",
         "Kind": "UNIT",
-        "ResponseMappingTemplate": "## schema checksum : aa02bae16942e48366fa36a1cd643d16
+        "ResponseMappingTemplate": "## schema checksum : 7988db64c71d520310206ab1f55f3ca3
 $util.toJson($ctx.result)",
         "TypeName": "Query",
       },
@@ -2942,7 +2965,7 @@ $util.toJson($ctx.result)",
         "DataSourceName": "database_bridge_lambda_ds",
         "FieldName": "listItems",
         "Kind": "UNIT",
-        "ResponseMappingTemplate": "## schema checksum : aa02bae16942e48366fa36a1cd643d16
+        "ResponseMappingTemplate": "## schema checksum : 7988db64c71d520310206ab1f55f3ca3
 $util.toJson($ctx.result)",
         "TypeName": "Query",
       },
@@ -2963,7 +2986,7 @@ $util.toJson($ctx.result)",
         "DataSourceName": "database_bridge_lambda_ds",
         "FieldName": "listLastItemSeenByUsers",
         "Kind": "UNIT",
-        "ResponseMappingTemplate": "## schema checksum : aa02bae16942e48366fa36a1cd643d16
+        "ResponseMappingTemplate": "## schema checksum : 7988db64c71d520310206ab1f55f3ca3
 $util.toJson($ctx.result)",
         "TypeName": "Query",
       },
@@ -2984,7 +3007,7 @@ $util.toJson($ctx.result)",
         "DataSourceName": "database_bridge_lambda_ds",
         "FieldName": "searchMentionableUsers",
         "Kind": "UNIT",
-        "ResponseMappingTemplate": "## schema checksum : aa02bae16942e48366fa36a1cd643d16
+        "ResponseMappingTemplate": "## schema checksum : 7988db64c71d520310206ab1f55f3ca3
 $util.toJson($ctx.result)",
         "TypeName": "Query",
       },
@@ -3113,7 +3136,7 @@ $util.toJson($ctx.result)",
         "DataSourceName": "grid_bridge_lambda_ds",
         "FieldName": "asGridPayload",
         "Kind": "UNIT",
-        "ResponseMappingTemplate": "## schema checksum : aa02bae16942e48366fa36a1cd643d16
+        "ResponseMappingTemplate": "## schema checksum : 7988db64c71d520310206ab1f55f3ca3
 $util.toJson($ctx.result)",
         "TypeName": "Query",
       },
@@ -3134,7 +3157,7 @@ $util.toJson($ctx.result)",
         "DataSourceName": "grid_bridge_lambda_ds",
         "FieldName": "getGridSearchSummary",
         "Kind": "UNIT",
-        "ResponseMappingTemplate": "## schema checksum : aa02bae16942e48366fa36a1cd643d16
+        "ResponseMappingTemplate": "## schema checksum : 7988db64c71d520310206ab1f55f3ca3
 $util.toJson($ctx.result)",
         "TypeName": "Query",
       },
@@ -3263,7 +3286,7 @@ $util.toJson($ctx.result)",
         "DataSourceName": "workflow_bridge_lambda_ds",
         "FieldName": "getPinboardByComposerId",
         "Kind": "UNIT",
-        "ResponseMappingTemplate": "## schema checksum : aa02bae16942e48366fa36a1cd643d16
+        "ResponseMappingTemplate": "## schema checksum : 7988db64c71d520310206ab1f55f3ca3
 $util.toJson($ctx.result)",
         "TypeName": "Query",
       },
@@ -3284,7 +3307,7 @@ $util.toJson($ctx.result)",
         "DataSourceName": "workflow_bridge_lambda_ds",
         "FieldName": "getPinboardsByIds",
         "Kind": "UNIT",
-        "ResponseMappingTemplate": "## schema checksum : aa02bae16942e48366fa36a1cd643d16
+        "ResponseMappingTemplate": "## schema checksum : 7988db64c71d520310206ab1f55f3ca3
 $util.toJson($ctx.result)",
         "TypeName": "Query",
       },
@@ -3305,7 +3328,7 @@ $util.toJson($ctx.result)",
         "DataSourceName": "workflow_bridge_lambda_ds",
         "FieldName": "listPinboards",
         "Kind": "UNIT",
-        "ResponseMappingTemplate": "## schema checksum : aa02bae16942e48366fa36a1cd643d16
+        "ResponseMappingTemplate": "## schema checksum : 7988db64c71d520310206ab1f55f3ca3
 $util.toJson($ctx.result)",
         "TypeName": "Query",
       },

diff --git a/client/gql.ts b/client/gql.ts
@@ -119,6 +119,7 @@ const myUserReturnFields = `${userReturnFields}
   hasWebPushSubscription
   manuallyOpenedPinboardIds
   hasEverUsedTour
+  featureFlags
 `;
 
 export const gqlSearchMentionableUsers = (prefix: string) => gql`

diff --git a/database-bridge-lambda/src/index.ts b/database-bridge-lambda/src/index.ts
@@ -15,6 +15,7 @@ import { Sql } from "../../shared/database/types";
 import { listLastItemSeenByUsers, seenItem } from "./sql/LastItemSeenByUser";
 import {
   addManuallyOpenedPinboardIds,
+  changeFeatureFlag,
   getMyUser,
   getUsers,
   removeManuallyOpenedPinboardIds,
@@ -66,6 +67,8 @@ const run = (
       return getItemCounts(sql, args, userEmail);
     case "visitTourStep":
       return visitTourStep(sql, args, userEmail);
+    case "changeFeatureFlag":
+      return changeFeatureFlag(sql, args, userEmail);
   }
 
   throw Error(

diff --git a/database-bridge-lambda/src/sql/User.ts b/database-bridge-lambda/src/sql/User.ts
@@ -47,7 +47,7 @@ export const getUsers = (sql: Sql, args: { emails: string[] }) =>
   `;
 
 const fragmentMyUserWithoutPushSubscriptionSecrets = (sql: Sql) =>
-  sql`"email", "firstName", "lastName", "avatarUrl", "manuallyOpenedPinboardIds", "visitedTourSteps" IS NOT NULL AS "hasEverUsedTour", "webPushSubscription" IS NOT NULL AS "hasWebPushSubscription"`;
+  sql`"email", "firstName", "lastName", "avatarUrl", "manuallyOpenedPinboardIds", "visitedTourSteps" IS NOT NULL AS "hasEverUsedTour", "webPushSubscription" IS NOT NULL AS "hasWebPushSubscription", "featureFlags"`;
 
 export const getMyUser = (sql: Sql, userEmail: string) =>
   sql`
@@ -112,3 +112,25 @@ export const visitTourStep = async (
     WHERE "email" = ${userEmail}
     RETURNING ${fragmentMyUserWithoutPushSubscriptionSecrets(sql)}
 `.then((rows) => rows[0]);
+
+export const changeFeatureFlag = async (
+  sql: Sql,
+  args: { flagId: string; newValue: boolean },
+  userEmail: string
+) =>
+  sql`
+    UPDATE "User"
+    SET "featureFlags" = jsonb_set(
+        COALESCE("featureFlags", '{}'::jsonb), 
+        ${[args.flagId]},
+        jsonb_set(
+          COALESCE("featureFlags" -> ${args.flagId}, '{}'::jsonb),
+          NOW(),
+          to_jsonb(${args.newValue}),
+          true
+        )
+        true
+    )
+    WHERE "email" = ${userEmail}
+    RETURNING ${fragmentMyUserWithoutPushSubscriptionSecrets(sql)}
+`.then((rows) => rows[0]);
diff --git a/shared/database/local/runDatabaseSetup.ts b/shared/database/local/runDatabaseSetup.ts
@@ -85,6 +85,8 @@ const runSetupTriggerSqlFile = (
           getEmailLambdaFunctionName(stage),
           EMAIL_DATABASE_TRIGGER_NAME
         ),
+    "add featureFlags column to User table": () =>
+      runSetupSqlFile(sql, "020-AddFeatureFlagsColumnToUserTable.sql"),
   };
 
   const allSteps = async () => {

diff --git a/shared/database/local/setup/020-AddFeatureFlagsColumnToUserTable.sql b/shared/database/local/setup/020-AddFeatureFlagsColumnToUserTable.sql
@@ -0,0 +1 @@
+ALTER TABLE "User" ADD COLUMN "featureFlags" JSONB;
diff --git a/shared/graphql/operations.ts b/shared/graphql/operations.ts
@@ -38,6 +38,7 @@ export const MUTATIONS = {
     "addManuallyOpenedPinboardIds",
     "removeManuallyOpenedPinboardIds",
     "visitTourStep",
+    "changeFeatureFlag",
   ] as const,
 } as const;
 

diff --git a/shared/graphql/schema.graphql b/shared/graphql/schema.graphql
@@ -32,6 +32,7 @@ type Mutation {
   addManuallyOpenedPinboardIds(pinboardId: String!, maybeEmailOverride: String): MyUser
   removeManuallyOpenedPinboardIds(pinboardIdToClose: String!): MyUser
   visitTourStep(tourStepId: String!): MyUser
+  changeFeatureFlag(flagId: String!, newValue: Boolean!): MyUser
 }
 
 type Subscription {
@@ -96,6 +97,7 @@ type MyUser {
   hasWebPushSubscription: Boolean
   manuallyOpenedPinboardIds: [String!]
   hasEverUsedTour: Boolean!
+  featureFlags: AWSJSON
 }
 
 type Group {