Revert "EFS-1360 Remove subgraph" (#1783)

icanbwell · Dec 28, 2024 · a4e2c55 · a4e2c55
1 parent 85c4f06
commit a4e2c55
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/fhir/generator/fhir_xml_schema_parser.py b/src/fhir/generator/fhir_xml_schema_parser.py
@@ -65,6 +65,7 @@ class FhirProperty:
     type_: str
     cleaned_type: str
     type_snake_case: str
+    scalar_type: Optional[str] = None
     optional: bool
     is_list: bool
     documentation: List[str]
@@ -74,7 +75,6 @@ class FhirProperty:
     is_back_bone_element: bool
     is_basic_type: bool
     codeable_type: Optional[SmartName]
-    scalar_type: Optional[str] = None
     is_resource: bool = False
     is_extension: bool = False
     is_code: bool = False

diff --git a/src/middleware/graphql/graphqlServerV2.js b/src/middleware/graphql/graphqlServerV2.js
@@ -4,6 +4,7 @@
 const contentType = require('content-type');
 const httpContext = require('express-http-context');
 const { ApolloServer } = require('@apollo/server');
+const { buildSubgraphSchema } = require('@apollo/subgraph');
 const { expressMiddleware } = require('@apollo/server/express4');
 const {
     ApolloServerPluginLandingPageDisabled,
@@ -128,8 +129,9 @@ const graphqlV2 = async (fnGetContainer) => {
     const server = new ApolloServer(
         {
             // schema: schemaWithResolvers,
-            typeDefs: typeDefs,
-            resolvers: resolvers,
+            schema: buildSubgraphSchema({ typeDefs, resolvers }),
+            // typeDefs: typeDefs,
+            // resolvers: resolvers,
             introspection: configManagerInstance.enableGraphQLV2Playground,
             cache: 'bounded',
             plugins,