chore: update way to get query resolvers and schema

src/apollo-server-config.ts

@@ -29,10 +29,10 @@ const context = async ({ req, connection }) => {
 
 const generateDatasources = (datasourcesArray) => {
   const datasources = {};
-  datasourcesArray.map((DataSource) => {
+
+  for (const DataSource of datasourcesArray) {
     datasources[DataSource.name] = new DataSource();
-    return true;
-  });
+  }
 
   return datasources;
 };

src/datasources/index.ts

@@ -4,15 +4,15 @@ Auto export all datasources
 
 */
 
-import * as glob from 'glob';
-import * as path from 'path';
-import { pull } from 'lodash';
+import * as glob from "glob";
+import * as path from "path";
+import { pull } from "lodash";
 
-let datasourceFiles = glob.sync(path.resolve(__dirname, './*.ts'))
-  .map(p => path.basename(p));
+let datasourceFiles = glob
+  .sync(path.resolve(__dirname, "./*.ts"))
+  .map((p) => path.basename(p));
 
-
-datasourceFiles = pull(datasourceFiles, 'index.ts');
+datasourceFiles = pull(datasourceFiles, "index.ts");
 
 const dataSources = [];
 

src/schema/index.ts

@@ -17,6 +17,10 @@ queryFiles.forEach((queryFile) => {
 
 const rootQuery = gql`
   scalar Date
+
+  type Query {
+    ${queries.map((n) => n.query).join("\n")}
+  }
 `;
 
 export const queryTypeDefs: Array<DocumentNode> = [rootQuery];

src/schema/resolvers/Query/me.ts

@@ -13,6 +13,7 @@ export default {
     me: User
   `,
   resolver: async (_, args, { dataSources }) => {
-    return dataSources.User.me();
+    const meResponse = await dataSources.Users.me();
+    return meResponse.user;
   },
 };

src/schema/resolvers/index.ts

@@ -14,14 +14,20 @@ queryFiles.forEach((queryFile) => {
   queries.push(Query);
 });
 
+const queryResolvers = [];
+
 let queryResolverFiles = glob
-  .sync(path.resolve(__dirname, "./QueryResolvers/*.ts"))
-  .map((p) => path.basename(p));
+  .sync(path.resolve(__dirname, "./QueryResolvers/**/*.ts"))
+  .map((p) => p);
 
 queryResolverFiles.forEach((queryResolverFile) => {
-  const QueryResolver = require(`./QueryResolvers/${queryResolverFile}`)
-    .default; // eslint-disable-line global-require,import/no-dynamic-require
-  queries.push(QueryResolver);
+  const name = path.basename(queryResolverFile);
+  const splitName = queryResolverFile.split("/QueryResolvers/");
+
+  const nameFolder = splitName[1].replace("/" + name, "");
+
+  const QueryResolver = require(`${queryResolverFile}`).default; // eslint-disable-line global-require,import/no-dynamic-require
+  queryResolvers.push({ name: nameFolder, resObj: QueryResolver });
 });
 
 export const allQueryResolvers = { Query: {} };
@@ -30,6 +36,15 @@ queries.forEach((q) => {
   allQueryResolvers.Query[q.name] = q.resolver;
 });
 
+export const resolvers = {};
+
+for (const item of queryResolvers) {
+  let obj = {};
+
+  obj[item.resObj.name] = item.resObj.resolver;
+  resolvers[item.name] = obj;
+}
+
 export default {
   Date: new GraphQLScalarType({
     name: "Date",
@@ -48,4 +63,5 @@ export default {
     },
   }),
   ...allQueryResolvers,
+  ...resolvers,
 };