Merge pull request #5 from dantehemerson/migrate-to-v7

Migrate to v7

Author: dantehemerson

package.json

@@ -20,69 +20,69 @@
     "test:e2e": "jest --config ./test/jest-e2e.json"
   },
   "dependencies": {
-    "@nestjs/common": "6.11.0",
-    "@nestjs/core": "6.11.0",
-    "@nestjs/graphql": "6.4.2",
-    "@nestjs/jwt": "^6.1.1",
-    "@nestjs/passport": "^6.1.0",
-    "@nestjs/platform-fastify": "^6.10.11",
-    "@nestjs/swagger": "^4.0.9",
-    "@typegoose/typegoose": "^6.3.2",
-    "apollo-server-fastify": "^2.9.14",
-    "automapper-nartc": "^3.0.19",
-    "bluebird": "3.5.5",
+    "@nestjs/common": "7.0.9",
+    "@nestjs/core": "7.0.9",
+    "@nestjs/graphql": "7.3.4",
+    "@nestjs/jwt": "^7.0.0",
+    "@nestjs/passport": "^7.0.0",
+    "@nestjs/platform-fastify": "^7.0.9",
+    "@nestjs/swagger": "^4.5.3",
+    "@typegoose/typegoose": "^7.0.0",
+    "apollo-server-fastify": "^2.12.0",
+    "automapper-nartc": "^6.1.3",
+    "bluebird": "3.7.2",
     "bunyan": "^1.8.12",
     "bunyan-prettystream": "^0.1.3",
     "class-transformer": "0.2.3",
-    "class-validator": "0.10.0",
+    "class-validator": "0.12.2",
     "dotenv": "^8.2.0",
     "faker": "^4.1.0",
-    "fastify-swagger": "^2.5.0",
-    "graphql": "14.5.0",
+    "fastify-swagger": "^2.5.1",
+    "graphql": "15.0.0",
     "graphql-objectid-scalar": "^0.1.3",
-    "graphql-tools": "4.0.5",
+    "graphql-tools": "5.0.0",
     "graphql-type-json": "^0.3.1",
-    "helmet": "3.21.2",
+    "helmet": "3.22.0",
     "lodash.get": "^4.4.2",
     "lodash.keyby": "^4.6.0",
-    "mongoose": "5.8.11",
-    "nestjs-dataloader": "^2.0.0",
-    "nestjs-typegoose": "^7.1.0",
+    "mongoose": "5.9.10",
+    "nestjs-dataloader-dan": "2.0.52-dan",
+    "nestjs-typegoose": "^7.1.16",
     "passport": "^0.4.0",
     "passport-google-oauth": "^2.0.0",
     "passport-jwt": "^4.0.0",
     "passport-local": "^1.0.0",
     "reflect-metadata": "0.1.13",
-    "rimraf": "3.0.0",
-    "rxjs": "6.5.2",
-    "slugify": "^1.3.5"
+    "rimraf": "3.0.2",
+    "rxjs": "6.5.5",
+    "slugify": "^1.4.0"
   },
   "devDependencies": {
-    "@nestjs/testing": "6.6.5",
-    "@types/faker": "^4.1.9",
-    "@types/jest": "24.0.18",
+    "@nestjs/testing": "7.0.9",
+    "@types/faker": "^4.1.11",
+    "@types/jest": "25.2.1",
     "@types/lodash.get": "^4.4.6",
     "@types/lodash.keyby": "^4.6.6",
-    "@types/mongoose": "5.5.22",
-    "@types/node": "12.11.2",
+    "@types/mongoose": "5.7.14",
+    "@types/node": "13.13.4",
     "@types/passport-google-oauth": "^1.0.41",
     "@types/passport-jwt": "^3.0.3",
     "@types/passport-local": "^1.0.33",
     "@types/supertest": "2.0.8",
-    "concurrently": "4.1.2",
-    "jest": "24.9.0",
-    "nodemon": "1.19.2",
-    "prettier": "1.18.2",
+    "concurrently": "5.2.0",
+    "jest": "25.4.0",
+    "nodemon": "2.0.3",
+    "prettier": "2.0.5",
     "supertest": "4.0.2",
-    "ts-jest": "24.0.2",
-    "ts-node": "8.3.0",
+    "ts-jest": "25.4.0",
+    "ts-node": "8.9.1",
     "tsconfig-paths": "3.8.0",
-    "tslint": "5.18.0",
-    "typescript": "3.5.3",
-    "wait-on": "3.3.0"
+    "tslint": "6.1.2",
+    "typescript": "3.8.3",
+    "wait-on": "4.0.2"
   },
   "resolutions": {
-    "graphql": "14.5.0"
+    "graphql": "15.0.0"
   },
   "jest": {
     "moduleFileExtensions": [

src/app.module.ts

@@ -15,7 +15,7 @@ import { CategoriesModule } from './modules/categories/categories.module'
       useClass: GraphqlOptions
     }),
     AuthModule,
-    WordsModule,
+    // WordsModule,
     CategoriesModule
   ]
 })

src/graphql.schema.generated.ts

@@ -34,6 +34,18 @@ export class Category {
     description?: string;
 }
 
+export abstract class IQuery {
+    abstract categories(): Category[] | Promise<Category[]>;
+
+    abstract category(_id: GraphQLObjectId): Category | Promise<Category>;
+
+    abstract words(): Word[] | Promise<Word[]>;
+
+    abstract word(_id: GraphQLObjectId): Word | Promise<Word>;
+
+    abstract randomWords(categoryId?: GraphQLObjectId, limit?: number): Word[] | Promise<Word[]>;
+}
+
 export abstract class IMutation {
     abstract createCategory(data: CategoryCreateInput): Category | Promise<Category>;
 
@@ -48,18 +60,6 @@ export abstract class IMutation {
     abstract deleteWord(_id: GraphQLObjectId): Word | Promise<Word>;
 }
 
-export abstract class IQuery {
-    abstract categories(): Category[] | Promise<Category[]>;
-
-    abstract category(_id: GraphQLObjectId): Category | Promise<Category>;
-
-    abstract words(): Word[] | Promise<Word[]>;
-
-    abstract word(_id: GraphQLObjectId): Word | Promise<Word>;
-
-    abstract randomWords(categoryId?: GraphQLObjectId, limit?: number): Word[] | Promise<Word[]>;
-}
-
 export class Word {
     _id: GraphQLObjectId;
     name: string;

src/modules/auth/auth.module.ts

@@ -1,12 +1,11 @@
 import { Module } from '@nestjs/common'
+import { JwtModule } from '@nestjs/jwt'
+import { PassportModule } from '@nestjs/passport'
+import { config } from '../../config'
 import { AuthController } from './auth.controller'
 import { AuthService } from './auth.service'
 import { JwtStrategy } from './strategies/jwt.strategy'
-import { PassportModule } from '@nestjs/passport'
-import { GoogleStrategy } from './strategies/google.strategy'
 import { LocalStrategy } from './strategies/local.strategy'
-import { JwtModule } from '@nestjs/jwt'
-import { config } from '../../config'
 
 @Module({
   imports: [
@@ -21,6 +20,6 @@ import { config } from '../../config'
     })
   ],
   controllers: [AuthController],
-  providers: [AuthService, LocalStrategy, JwtStrategy, GoogleStrategy]
+  providers: [AuthService, LocalStrategy, JwtStrategy /* GoogleStrategy */]
 })
 export class AuthModule {}

src/modules/categories/categories.loader.ts

@@ -1,6 +1,6 @@
 import * as DataLoader from 'dataloader'
 import { Injectable } from '@nestjs/common'
-import { NestDataLoader } from 'nestjs-dataloader'
+import { NestDataLoader } from 'nestjs-dataloader-dan'
 import { CategoriesService } from './categories.service'
 import { Category } from './categories.model'
 import { concatMap } from 'rxjs/operators'

src/modules/categories/categories.module.ts

@@ -1,6 +1,6 @@
 import { Module } from '@nestjs/common'
 import { APP_INTERCEPTOR } from '@nestjs/core'
-import { DataLoaderInterceptor } from 'nestjs-dataloader'
+import { DataLoaderInterceptor } from 'nestjs-dataloader-dan'
 import { MongoModule } from '../mongo/mongo.module'
 import { CategoriesLoader } from './categories.loader'
 import { Category } from './categories.model'

src/modules/categories/categories.resolver.ts

@@ -4,19 +4,20 @@ import { UpdateCategoryDto } from './dto/updateCategory.dto'
 import { CreateCategoryDto } from './dto/createCategory.dto'
 import { CategoriesLoader } from './categories.loader'
 import * as DataLoader from 'dataloader'
-import { Loader } from 'nestjs-dataloader'
+import { Loader } from 'nestjs-dataloader-dan'
 import { Category } from './categories.model'
 import { from } from 'rxjs'
-@Resolver('Category')
+import { CategoryGraphQLModel } from './category.graphql-model'
+@Resolver(of => CategoryGraphQLModel)
 export class CategoriesResolver {
   constructor(private readonly categoriesService: CategoriesService) {}
 
-  @Query()
+  @Query(returns => [CategoryGraphQLModel])
   categories() {
     return this.categoriesService.findAll()
   }
 
-  @Query()
+  @Query(() => [Category])
   category(@Args('_id') _id, @Loader(CategoriesLoader.name) categoriesLoader: DataLoader<string, Category>) {
     return from(categoriesLoader.load(_id))
   }

src/modules/categories/category.graphql-model.ts

@@ -0,0 +1,16 @@
+import { Field, ObjectType, ID } from '@nestjs/graphql'
+
+@ObjectType()
+export class CategoryGraphQLModel {
+  @Field(type => ID)
+  _id: string
+
+  @Field(type => String)
+  name: string
+
+  @Field(type => String, { nullable: true })
+  color?: string
+
+  @Field(type => String, { nullable: true })
+  description?: string
+}

src/modules/words/words.graphql-model.ts

@@ -0,0 +1,14 @@
+import { Field, ObjectType, ID } from '@nestjs/graphql'
+import { CategoryGraphQLModel } from '../categories/category.graphql-model'
+
+@ObjectType()
+export class Words {
+  @Field(type => ID)
+  _id: string
+
+  @Field(type => String)
+  name: string
+
+  @Field(type => [CategoryGraphQLModel])
+  posts: CategoryGraphQLModel[]
+}

src/modules/words/words.resolver.ts

@@ -1,15 +1,16 @@
-import { Args, Mutation, Query, Resolver, ResolveProperty, Parent } from '@nestjs/graphql'
+import { Args, Mutation, Query, Resolver, Parent, ResolveField } from '@nestjs/graphql'
 import { WordsService } from './words.service'
 import { CreateWord } from './interface/createWord.interface'
 import { UpdateWord } from './interface/updateWord.interface'
 import * as DataLoader from 'dataloader'
 import { Category } from '../categories/categories.model'
 import { Word } from './words.model'
-import { Loader } from 'nestjs-dataloader'
+import { Loader } from 'nestjs-dataloader-dan'
 import { CategoriesLoader } from '../categories/categories.loader'
 import { from, Observable } from 'rxjs'
+import { WordsGraphQLModel } from './words.graphql-model'
 
-@Resolver('Word')
+@Resolver(of => WordsGraphQLModel)
 export class WordsResolver {
   constructor(private readonly wordsService: WordsService) {}
 
@@ -43,7 +44,7 @@ export class WordsResolver {
     return this.wordsService.deleteById(_id)
   }
 
-  @ResolveProperty('category', () => Category)
+  @ResolveField('category', () => Category)
   resolveCategory(
     @Parent() word: Word,
     @Loader(CategoriesLoader.name) categoriesLoader: DataLoader<string, Category>