Merge branch 'main' of https://github.com/Ho-s/NestJS-GraphQL-TypeORM-PostgresQL

Author: Ho-s

generator/templates/resolver.spec.hbs

@@ -7,8 +7,8 @@ import {
 import { {{pascalCase tableName}}Service } from './{{tableName}}.service'
 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 { UtilModule } from 'src/common/util/util.module';
+import { UtilService } from 'src/common/util/util.service';
 import { DataSource } from 'typeorm';
 
 import { Create{{pascalCase tableName}}Input, Update{{pascalCase tableName}}Input } from './inputs/{{tableName}}.input'

generator/templates/service.spec.hbs

@@ -11,8 +11,8 @@ import { {{pascalCase tableName}} } from './entities/{{tableName}}.entity'
 import { Create{{pascalCase tableName}}Input, Update{{pascalCase tableName}}Input } from './inputs/{{tableName}}.input'
 import { ExtendedRepository } from 'src/common/graphql/customExtended'
 import { OneRepoQuery, RepoQuery } from 'src/common/graphql/types'
-import { UtilModule } from 'src/common/shared/services/util.module';
-import { UtilService } from 'src/common/shared/services/util.service';
+import { UtilModule } from 'src/common/util/util.module';
+import { UtilService } from 'src/common/util/util.service';
 
 describe('{{pascalCase tableName}}Service', () => {
   let service: {{pascalCase tableName}}Service

src/app.module.ts

@@ -6,11 +6,10 @@ import { TypeOrmModule } from '@nestjs/typeorm';
 
 import { AuthModule } from './auth/auth.module';
 import { CustomCacheModule } from './cache/custom-cache.module';
+import { GraphqlConfigService } from './common/config/graphql-config.service';
 import { TypeORMConfigService } from './common/config/ormconfig.service';
 import { getEnvPath } from './common/helper/env.helper';
 import { envValidation } from './common/helper/env.validation';
-import { SettingModule } from './common/shared/setting/setting.module';
-import { SettingService } from './common/shared/setting/setting.service';
 import { HealthModule } from './health/health.module';
 import { UploadModule } from './upload/upload.module';
 import { UserModule } from './user/user.module';
@@ -23,10 +22,8 @@ import { UserModule } from './user/user.module';
     }),
     GraphQLModule.forRootAsync<ApolloDriverConfig>({
       driver: ApolloDriver,
-      imports: [SettingModule],
-      inject: [SettingService],
-      useFactory: (settingService: SettingService) =>
-        settingService.graphqlUseFactory,
+      useClass: GraphqlConfigService,
+      imports: [ConfigModule],
     }),
     TypeOrmModule.forRootAsync({
       useClass: TypeORMConfigService,

src/auth/auth.module.ts

@@ -4,7 +4,7 @@ import { JwtModule } from '@nestjs/jwt';
 import { PassportModule } from '@nestjs/passport';
 
 import { EnvironmentVariables } from 'src/common/helper/env.validation';
-import { UtilModule } from 'src/common/shared/services/util.module';
+import { UtilModule } from 'src/common/util/util.module';
 import { UserModule } from 'src/user/user.module';
 
 import { AuthResolver } from './auth.resolver';

src/auth/auth.service.ts

@@ -6,7 +6,7 @@ import * as bcrypt from 'bcrypt';
 
 import { SignInInput, SignUpInput } from 'src/auth/inputs/auth.input';
 import { EnvironmentVariables } from 'src/common/helper/env.validation';
-import { UtilService } from 'src/common/shared/services/util.service';
+import { UtilService } from 'src/common/util/util.service';
 import { User } from 'src/user/entities/user.entity';
 
 import { UserService } from '../user/user.service';

src/common/config/graphql-config.service.ts

@@ -0,0 +1,42 @@
+import { ApolloDriverConfig } from '@nestjs/apollo';
+import { Injectable } from '@nestjs/common';
+import { ConfigService } from '@nestjs/config';
+import { GqlOptionsFactory } from '@nestjs/graphql';
+
+import {
+  ApolloServerPluginLandingPageLocalDefault,
+  ApolloServerPluginLandingPageProductionDefault,
+} from '@apollo/server/plugin/landingPage/default';
+import GraphQLJSON from 'graphql-type-json';
+import { join } from 'path';
+import { cwd } from 'process';
+
+import { formatError } from '../format/graphql-error.format';
+
+@Injectable()
+export class GraphqlConfigService
+  implements GqlOptionsFactory<ApolloDriverConfig>
+{
+  constructor(private readonly configService: ConfigService) {}
+
+  createGqlOptions(): Promise<ApolloDriverConfig> | ApolloDriverConfig {
+    return {
+      resolvers: { JSON: GraphQLJSON },
+      autoSchemaFile: join(
+        cwd(),
+        `${this.configService.get('NODE_ENV') === 'test' ? 'test' : 'src'}/graphql-schema.gql`,
+      ),
+      sortSchema: true,
+      playground: false,
+      plugins: [
+        this.configService.get('NODE_ENV') === 'production'
+          ? ApolloServerPluginLandingPageProductionDefault()
+          : ApolloServerPluginLandingPageLocalDefault(),
+      ],
+
+      context: ({ req }) => ({ req }),
+      cache: 'bounded',
+      formatError,
+    };
+  }
+}

src/common/shared/setting/setting.module.ts

@@ -7,8 +7,8 @@ import {
   MockServiceFactory,
 } from 'src/common/factory/mockFactory';
 import { GetManyInput, GetOneInput } from 'src/common/graphql/custom.input';
-import { UtilModule } from 'src/common/shared/services/util.module';
-import { UtilService } from 'src/common/shared/services/util.service';
+import { UtilModule } from 'src/common/util/util.module';
+import { UtilService } from 'src/common/util/util.service';
 
 import { User } from './entities/user.entity';
 import { CreateUserInput, UpdateUserInput } from './inputs/user.input';

src/common/shared/setting/setting.service.ts

@@ -7,8 +7,8 @@ import {
 } from 'src/common/factory/mockFactory';
 import { ExtendedRepository } from 'src/common/graphql/customExtended';
 import { OneRepoQuery, RepoQuery } from 'src/common/graphql/types';
-import { UtilModule } from 'src/common/shared/services/util.module';
-import { UtilService } from 'src/common/shared/services/util.service';
+import { UtilModule } from 'src/common/util/util.module';
+import { UtilService } from 'src/common/util/util.service';
 
 import { User } from './entities/user.entity';
 import { CreateUserInput, UpdateUserInput } from './inputs/user.input';