Merge pull request #6094 from artsy/egdbear/chore/clean-up-devices

chore: remove unstitched user devices feature flag
artsy · Oct 9, 2024 · fc6a57a · fc6a57a
2 parents d5bcd2b + c6ba24c
commit fc6a57a
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 50 deletions.
diff --git a/_schemaV2.graphql b/_schemaV2.graphql
@@ -16097,7 +16097,6 @@ type Query {
     last: Int
     userId: ID!
   ): AuctionsLotStandingConnection!
-  _unused_gravity_devices(userId: ID!): [Device!]!
 
   # Autocomplete resolvers.
   _unused_gravity_matchPartners(

diff --git a/package.json b/package.json
@@ -19,7 +19,7 @@
     "deploy-cloudflare-workers": "yarn wrangler deploy --keep-vars --config=workers/caching/metaphysics-cdn.toml --env production",
     "dev": "DEBUG=info,warn,error babel-node --extensions '.ts,.js' --inspect index.js",
     "dump-schema": "babel-node --extensions '.ts,.js' ./scripts/dump-schema.ts",
-    "dump:local": "USE_UNSTITCHED_USER_DEVICES=false yarn dump-schema _schemaV2.graphql & wait",
+    "dump:local": "yarn dump-schema _schemaV2.graphql & wait",
     "dump:staging": "node scripts/dump-staging-schema.js",
     "lint": "eslint . --ext ts",
     "lint:fix": "eslint . --fix --ext ts",

diff --git a/src/config.ts b/src/config.ts
@@ -76,7 +76,6 @@ const {
   STATSD_HOST,
   STATSD_PORT,
   SYSTEM_ENVIRONMENT,
-  USE_UNSTITCHED_USER_DEVICES,
   UNLEASH_ADMIN_TOKEN,
   UNLEASH_API,
   UNLEASH_APP_NAME,
@@ -216,7 +215,6 @@ export default {
   UNLEASH_API: UNLEASH_API || "",
   UNLEASH_APP_NAME: UNLEASH_APP_NAME || "",
   UNLEASH_SERVER_KEY: UNLEASH_SERVER_KEY || "",
-  USE_UNSTITCHED_USER_DEVICES: USE_UNSTITCHED_USER_DEVICES === "true",
   VORTEX_API_BASE,
   VORTEX_APP_ID,
   VORTEX_TOKEN,

diff --git a/src/lib/stitching/gravity/schema.ts b/src/lib/stitching/gravity/schema.ts
@@ -8,8 +8,6 @@ import {
 } from "graphql-tools"
 import { readFileSync } from "fs"
 
-import config from "config"
-
 const rootFieldsAllowList = [
   "agreement",
   "viewingRoom",
@@ -35,6 +33,7 @@ export const executableGravitySchema = () => {
     "Artwork",
     "ArtworkConnection",
     "ArtworkEdge",
+    "Device",
     "Lot",
     "Money",
     "MoneyInput",
@@ -50,10 +49,6 @@ export const executableGravitySchema = () => {
     "ArtistSeriesConnection",
   ]
 
-  if (config.USE_UNSTITCHED_USER_DEVICES) {
-    duplicatedTypes.push("Device")
-  }
-
   // Types which come from Gravity that are not (yet) needed in MP.
   // In the future, these can be removed from this list as they are needed.
   const unusedTypes = [

diff --git a/src/lib/stitching/gravity/v2/stitching.ts b/src/lib/stitching/gravity/v2/stitching.ts
@@ -5,9 +5,6 @@ import { defineCustomLocale } from "lib/helpers"
 import { toGlobalId } from "graphql-relay"
 import { dateRange } from "lib/date"
 import { GraphQLSchemaWithTransforms } from "graphql-tools"
-import config from "config"
-
-const useUnstitchedUserDevices = !!config.USE_UNSTITCHED_USER_DEVICES
 
 const LocaleEnViewingRoomRelativeShort = "en-viewing-room-relative-short"
 defineCustomLocale(LocaleEnViewingRoomRelativeShort, {
@@ -81,14 +78,6 @@ export const gravityStitchingEnvironment = (
         id: ID!
       }
 
-      ${!useUnstitchedUserDevices
-        ? `
-          extend type User {
-            devices: [Device!]!
-          }
-        `
-        : ""}
-
       extend type ViewingRoom {
         artworksConnection(
           first: Int
@@ -220,27 +209,6 @@ export const gravityStitchingEnvironment = (
           },
         },
       },
-      ...(!useUnstitchedUserDevices && {
-        User: {
-          devices: {
-            fragment: gql`
-            ... on User {
-            internalID
-          }
-          `,
-            resolve: ({ internalID: userId }, _args, context, info) => {
-              return info.mergeInfo.delegateToSchema({
-                schema: gravitySchema,
-                operation: "query",
-                fieldName: "_unused_gravity_devices",
-                args: { userId },
-                context,
-                info,
-              })
-            },
-          },
-        },
-      }),
       UserAddress: {
         id: {
           fragment: gql`

diff --git a/src/schema/v2/__tests__/user.test.ts b/src/schema/v2/__tests__/user.test.ts
@@ -2,7 +2,6 @@ import { toGlobalId } from "graphql-relay"
 import { HTTPError } from "lib/HTTPError"
 import gql from "lib/gql"
 import { runAuthenticatedQuery } from "schema/v2/test/utils"
-import config from "config"
 
 describe("User", () => {
   it("implements the NodeInterface", async () => {
@@ -1089,10 +1088,6 @@ describe("User", () => {
     })
   })
 
-  beforeAll(() => {
-    config.USE_UNSTITCHED_USER_DEVICES = true
-  })
-
   describe("Devices", () => {
     let context
 

diff --git a/src/schema/v2/devices.ts b/src/schema/v2/devices.ts
@@ -5,6 +5,7 @@ import {
   GraphQLList,
   GraphQLNonNull,
   GraphQLBoolean,
+  GraphQLID,
 } from "graphql"
 import { ResolverContext } from "types/graphql"
 
@@ -13,7 +14,7 @@ const DeviceType = new GraphQLObjectType<any, ResolverContext>({
   fields: {
     // FIXME: Use the InternalIDFields
     id: {
-      type: GraphQLNonNull(GraphQLString),
+      type: GraphQLNonNull(GraphQLID),
       description: "Unique ID for this device",
     },
     name: {

diff --git a/src/schema/v2/user.ts b/src/schema/v2/user.ts
@@ -35,7 +35,6 @@ import {
 import { UserInterestConnection } from "./userInterests"
 import { UserSaleProfile } from "./userSaleProfile"
 import { Devices } from "./devices"
-import config from "config"
 
 export const UserAdminNoteType = new GraphQLObjectType<any, ResolverContext>({
   name: "UserAdminNotes",
@@ -203,7 +202,7 @@ export const UserType = new GraphQLObjectType<any, ResolverContext>({
           return profiles[0]
         },
       },
-      ...(config.USE_UNSTITCHED_USER_DEVICES ? { devices: Devices } : {}),
+      devices: Devices,
       name: {
         description: "The given name of the user.",
         type: new GraphQLNonNull(GraphQLString),