fix(resolver types): use correct output type for aggregation resolvers

rfermann · Apr 23, 2021 · 29b642a · 29b642a
1 parent 1e03ebc
commit 29b642a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/Handlers/ResolverHandler/__snapshots__/index.test.ts.snap b/src/Handlers/ResolverHandler/__snapshots__/index.test.ts.snap
@@ -5,7 +5,7 @@ exports[`ResolverHandler should parse resolvers and create correct resolver file
 import { } from \\"\\";
 import { User } from \\"../../User/model\\";
 import { AggregateUser } from \\"../inputTypes/AggregateUser\\";
-import { AggregateUser } from \\"./AggregateUser\\";
+import { AggregateUser } from \\"../outputTypes/AggregateUser\\";
 import { Prisma } from \\"@prisma/client\\";
 
 @Resolver(() => User, {

diff --git a/src/Handlers/ResolverHandler/index.ts b/src/Handlers/ResolverHandler/index.ts
@@ -111,6 +111,7 @@ export class ResolverHandler extends BaseHandler {
 
         if (this._getResolverName(outputType) !== name) {
           this.baseFileGenerator.addOutputTypeImports({
+            isResolver: true,
             model,
             sourceFile,
             types: [outputType],
@@ -222,7 +223,9 @@ export class ResolverHandler extends BaseHandler {
                 } })`
               )
               .conditionalWriteLine(
-                (!this.config.includePrismaSelect && !isAggregation) || isAggregation || isBatchOperation,
+                (!this.config.includePrismaSelect && !isAggregation) ||
+                  (!this.config.includePrismaSelect && isAggregation) ||
+                  isBatchOperation,
                 `return this._prismaService.${this._camelCase(model)}.${operation}({ ...${
                   this.config.inputArgumentsName
                 } })`