Feat: Update plop template file

Author: Ho-s

generator/templates/resolver.hbs

@@ -2,31 +2,39 @@ import { UseAuthGuard } from 'src/common/decorators/auth-guard.decorator';
 import { Args, Mutation, Query, Resolver } from '@nestjs/graphql'
 import { {{pascalCase tableName}}Service } from './{{tableName}}.service'
 import { GetManyInput, GetOneInput } from 'src/common/graphql/custom.input'
-import { CurrentQuery } from 'src/common/decorators/query.decorator'
 import GraphQLJSON from 'graphql-type-json';
 
+import { GetInfoFromQueryProps } from 'src/common/graphql/utils/types';
+import { GraphQLQueryToOption } from 'src/common/decorators/option.decorator';
+import { UseRepositoryInterceptor } from 'src/common/decorators/repository-interceptor.decorator';
+
 import { Get{{pascalCase tableName}}Type, {{pascalCase tableName}} } from './entities/{{tableName}}.entity';
 import { Create{{pascalCase tableName}}Input, Update{{pascalCase tableName}}Input } from './inputs/{{tableName}}.input';
 
 @Resolver()
 export class {{pascalCase tableName}}Resolver {
   constructor(private readonly {{tableName}}Service: {{pascalCase tableName}}Service) {}
+  
   @Query(() => Get{{pascalCase tableName}}Type)
   @UseAuthGuard('admin')
+  @UseRepositoryInterceptor({{pascalCase tableName}})
   getMany{{pascalCase tableName}}List(
-    @Args({ name: 'input', nullable: true }) qs: GetManyInput<{{pascalCase tableName}}>,
-    @CurrentQuery() gqlQuery: string,
+    @Args({ name: 'input', nullable: true }) condition: GetManyInput<{{pascalCase tableName}}>,
+    @GraphQLQueryToOption<{{pascalCase tableName}}>(true)
+    option: GetInfoFromQueryProps<{{pascalCase tableName}}>,
   ) {
-    return this.{{tableName}}Service.getMany(qs, gqlQuery);
+    return this.{{tableName}}Service.getMany({ ...condition, ...option });
   }
 
   @Query(() => {{pascalCase tableName}})
   @UseAuthGuard('admin')
+  @UseRepositoryInterceptor({{pascalCase tableName}})
   getOne{{pascalCase tableName}}(
-    @Args({ name: 'input' }) qs: GetOneInput<{{pascalCase tableName}}>,
-    @CurrentQuery() gqlQuery: string,
+    @Args({ name: 'input' }) condition: GetOneInput<{{pascalCase tableName}}>,
+    @GraphQLQueryToOption<{{pascalCase tableName}}>()
+    option: GetInfoFromQueryProps<{{pascalCase tableName}}>,
   ) {
-    return this.{{tableName}}Service.getOne(qs, gqlQuery);
+    return this.{{tableName}}Service.getOne({ ...condition, ...option });
   }
 
   @Mutation(() => {{pascalCase tableName}})

generator/templates/resolver.spec.hbs

@@ -9,6 +9,7 @@ import { GetManyInput, GetOneInput } from 'src/common/graphql/custom.input'
 import { {{pascalCase tableName}} } from './entities/{{tableName}}.entity'
 import { UtilModule } from 'src/common/shared/services/util.module';
 import { UtilService } from 'src/common/shared/services/util.service';
+import { DataSource } from 'typeorm';
 
 import { Create{{pascalCase tableName}}Input, Update{{pascalCase tableName}}Input } from './inputs/{{tableName}}.input'
 
@@ -26,6 +27,10 @@ describe('{{pascalCase tableName}}Resolver', () => {
           provide: {{pascalCase tableName}}Service,
           useFactory: MockServiceFactory.getMockService({{pascalCase tableName}}Service),
         },
+        {
+          provide: DataSource,
+          useValue: undefined,
+        },
       ],
     }).compile()
 
@@ -39,7 +44,7 @@ describe('{{pascalCase tableName}}Resolver', () => {
   })
 
   it('Calling "Get many {{tableName}} list" method', () => {
-    const qs: GetManyInput<{{pascalCase tableName}}> = {
+    const condition: GetManyInput<{{pascalCase tableName}}> = {
       where: { 
   {{#if (is "increment" idType)}}
         id: utilService.getRandomNumber(0,999999)
@@ -49,22 +54,17 @@ describe('{{pascalCase tableName}}Resolver', () => {
       },
     }
 
-    const gqlQuery = `
-      query GetMany{{pascalCase tableName}}List {
-        getMany{{pascalCase tableName}}List {
-          data {
-            id
-          }
-        }
-      }
-    `
-
-    expect(resolver.getMany{{pascalCase tableName}}List(qs, gqlQuery)).not.toEqual(null)
-    expect(mockedService.getMany).toHaveBeenCalledWith(qs, gqlQuery)
+    const option = { relations: undefined, select: undefined };
+
+    expect(resolver.getMany{{pascalCase tableName}}List(condition, option)).not.toEqual(null)
+    expect(mockedService.getMany).toHaveBeenCalledWith({
+      ...condition,
+      ...option,
+    })
   })
 
   it('Calling "Get one {{tableName}} list" method', () => {
-    const qs: GetOneInput<{{pascalCase tableName}}> = {
+    const condition: GetOneInput<{{pascalCase tableName}}> = {
       where: { 
 {{#if (is "increment" idType)}}
         id: utilService.getRandomNumber(0,999999)
@@ -74,18 +74,13 @@ describe('{{pascalCase tableName}}Resolver', () => {
       },
     }
 
-    const gqlQuery = `
-      query GetOne{{pascalCase tableName}} {
-        getOne{{pascalCase tableName}} {
-          data {
-            id
-          }
-        }
-      }
-    `
-
-    expect(resolver.getOne{{pascalCase tableName}}(qs, gqlQuery)).not.toEqual(null)
-    expect(mockedService.getOne).toHaveBeenCalledWith(qs, gqlQuery)
+   const option = { relations: undefined, select: undefined };
+
+    expect(resolver.getOne{{pascalCase tableName}}(condition, option)).not.toEqual(null)
+    expect(mockedService.getOne).toHaveBeenCalledWith({
+      ...condition,
+      ...option,
+    })
   })
 
   it('Calling "Create {{tableName}}" method', () => {

generator/templates/service.hbs

@@ -1,18 +1,20 @@
 import { Injectable } from '@nestjs/common'
+
 import { OneRepoQuery, RepoQuery } from 'src/common/graphql/types'
+
 import { {{pascalCase tableName}}Repository } from './{{tableName}}.repository'
 import { {{pascalCase tableName}} } from './entities/{{tableName}}.entity';
 import { Create{{pascalCase tableName}}Input, Update{{pascalCase tableName}}Input } from './inputs/{{tableName}}.input';
 
 @Injectable()
 export class {{pascalCase tableName}}Service {
 constructor(private readonly {{tableName}}Repository: {{pascalCase tableName}}Repository) {}
-  getMany(qs: RepoQuery<{{pascalCase tableName}}> = {}, gqlQuery?: string) {
-    return this.{{tableName}}Repository.getMany(qs, gqlQuery);
+  getMany(option?: RepoQuery<{{pascalCase tableName}}>) {
+    return this.{{tableName}}Repository.getMany(option);
   }
 
-  getOne(qs: OneRepoQuery<{{pascalCase tableName}}>, gqlQuery?: string) {
-    return this.{{tableName}}Repository.getOne(qs, gqlQuery);
+  getOne(option: OneRepoQuery<{{pascalCase tableName}}>) {
+    return this.{{tableName}}Repository.getOne(option);
   }
 
   create(input: Create{{pascalCase tableName}}Input) {

generator/templates/service.spec.hbs

@@ -42,7 +42,7 @@ describe('{{pascalCase tableName}}Service', () => {
   })
 
   it('Calling "Get many" method', () => {
-  const qs: RepoQuery<{{pascalCase tableName}}> = {
+  const option: RepoQuery<{{pascalCase tableName}}> = {
     where: { 
 {{#if (is "increment" idType)}}
       id: utilService.getRandomNumber(0,999999)
@@ -52,12 +52,12 @@ describe('{{pascalCase tableName}}Service', () => {
     },
   }
 
-  expect(service.getMany(qs)).not.toEqual(null)
+  expect(service.getMany(option)).not.toEqual(null)
   expect(mockedRepository.getMany).toHaveBeenCalled()
   })
 
   it('Calling "Get one" method', () => {
-  const qs: OneRepoQuery<{{pascalCase tableName}}> = {
+  const option: OneRepoQuery<{{pascalCase tableName}}> = {
     where: { 
 {{#if (is "increment" idType)}}
       id: utilService.getRandomNumber(0,999999)
@@ -67,7 +67,7 @@ describe('{{pascalCase tableName}}Service', () => {
     },
   }
 
-  expect(service.getOne(qs)).not.toEqual(null)
+  expect(service.getOne(option)).not.toEqual(null)
   expect(mockedRepository.getOne).toHaveBeenCalled()
   })