only have one set of resolvers and schema, keep folders for dev

beethovenxfi · Nov 21, 2023 · a6342c9 · a6342c9
1 parent c802c46
commit a6342c9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 33 deletions.
diff --git a/app.ts b/app.ts
@@ -12,10 +12,8 @@ import {
     ApolloServerPluginLandingPageGraphQLPlayground,
     ApolloServerPluginUsageReporting,
 } from 'apollo-server-core';
-import { ApolloServerPlugin } from 'apollo-server-plugin-base';
-import { beethovenSchema } from './graphql_schema_generated_beethoven';
-import { balancerSchema } from './graphql_schema_generated_balancer';
-import { balancerResolvers, beethovenResolvers } from './app/gql/resolvers';
+import { schema } from './graphql_schema_generated';
+import { resolvers } from './app/gql/resolvers';
 import helmet from 'helmet';
 import GraphQLJSON from 'graphql-type-json';
 import * as Sentry from '@sentry/node';
@@ -103,9 +101,9 @@ async function startServer() {
     const server = new ApolloServer({
         resolvers: {
             JSON: GraphQLJSON,
-            ...(env.PROTOCOL === 'beethoven' ? beethovenResolvers : balancerResolvers),
+            ...resolvers,
         },
-        typeDefs: env.PROTOCOL === 'beethoven' ? beethovenSchema : balancerSchema,
+        typeDefs: schema,
         introspection: true,
         plugins,
         context: ({ req }) => req.context,

diff --git a/app/gql/resolvers.ts b/app/gql/resolvers.ts
@@ -2,9 +2,5 @@ import { loadFilesSync } from '@graphql-tools/load-files';
 import path from 'path';
 import { mergeResolvers } from '@graphql-tools/merge';
 
-const balancerResolversArray = loadFilesSync(path.join(__dirname, '../../modules/!(beethoven)/**/*.resolvers.*'));
-
-const beethovenResolversArray = loadFilesSync(path.join(__dirname, '../../modules/!(balancer)/**/*.resolvers.*'));
-
-export const balancerResolvers = mergeResolvers(balancerResolversArray);
-export const beethovenResolvers = mergeResolvers(beethovenResolversArray);
+const resolversArray = loadFilesSync(path.join(__dirname, '../../modules/**/*.resolvers.*'));
+export const resolvers = mergeResolvers(resolversArray);
diff --git a/codegen.yml b/codegen.yml
@@ -137,31 +137,13 @@ generates:
         schema: ${USER_SNAPSHOT_SUBGRAPH}
         plugins:
             - schema-ast
-    graphql_schema_generated_balancer.ts:
-        schema:
-            - ./modules/**/*.gql
-            - '!./modules/beethoven/beets.gql'
-            - '!./modules/**/*.beets.gql'
-        plugins:
-            - add:
-                  content: |
-                      import { gql } from 'apollo-server-express';
-                      export const balancerSchema = gql`
-                      #\n# THIS FILE IS AUTOGENERATED — DO NOT EDIT IT\n#
-            - schema-ast
-            - add:
-                  placement: 'append'
-                  content: '`;'
-    graphql_schema_generated_beethoven.ts:
-        schema:
-            - ./modules/**/*.gql
-            - '!./modules/balancer/balancer.gql'
-            - '!./modules/**/*.balancer.gql'
+    graphql_schema_generated.ts:
+        schema: ./modules/**/*.gql
         plugins:
             - add:
                   content: |
                       import { gql } from 'apollo-server-express';
-                      export const beethovenSchema = gql`
+                      export const schema = gql`
                       #\n# THIS FILE IS AUTOGENERATED — DO NOT EDIT IT\n#
             - schema-ast
             - add: