Update deps & code to work properly

package.json

@@ -23,32 +23,34 @@
   },
   "homepage": "https://github.com/lujakob/nestjs-realworld-example-app#readme",
   "dependencies": {
-    "@nestjs/common": "^4.6.3",
-    "@nestjs/core": "^4.6.3",
-    "@nestjs/microservices": "^4.6.1",
-    "@nestjs/swagger": "^1.1.4",
-    "@nestjs/testing": "^4.6.1",
-    "@nestjs/typeorm": "^2.0.0",
-    "@nestjs/websockets": "^4.5.8",
+    "@nestjs/common": "^5.6.2",
+    "@nestjs/core": "^5.6.2",
+    "@nestjs/microservices": "^5.6.2",
+    "@nestjs/swagger": "^2.5.1",
+    "@nestjs/testing": "^5.6.2",
+    "@nestjs/typeorm": "^5.2.2",
+    "@nestjs/websockets": "^5.6.2",
+    "class-transformer": "^0.2.0",
+    "class-validator": "^0.9.1",
     "crypto": "^1.0.1",
     "crypto-js": "^3.1.9-1",
     "jsonwebtoken": "^8.1.1",
     "mysql": "^2.15.0",
     "passport": "^0.4.0",
-    "passport-jwt": "^3.0.1",
+    "passport-jwt": "^4.0.0",
     "reflect-metadata": "^0.1.12",
-    "rxjs": "^5.5.6",
+    "rxjs": "^6.4.0",
     "slug": "^0.9.1",
-    "typeorm": "^0.1.12",
-    "typescript": "^2.7.2"
+    "typeorm": "^0.2.12",
+    "typescript": "^3.3.1"
   },
   "devDependencies": {
-    "@types/jest": "^22.1.3",
-    "@types/node": "^9.4.6",
-    "jest": "^22.4.2",
+    "@types/jest": "^23.3.13",
+    "@types/node": "^10.12.21",
+    "jest": "^24.0.0",
     "nodemon": "^1.15.0",
     "supertest": "^3.0.0",
-    "ts-jest": "^22.0.4",
-    "ts-node": "^4.1.0"
+    "ts-jest": "^23.10.5",
+    "ts-node": "^8.0.2"
   }
 }

src/app.module.ts

@@ -18,8 +18,8 @@ import { TagModule } from './tag/tag.module';
   controllers: [
     AppController
   ],
-  components: []
+  providers: []
 })
 export class ApplicationModule {
   constructor(private readonly connection: Connection) {}
-}
+}

src/article/article.module.ts

@@ -1,4 +1,4 @@
-import { MiddlewaresConsumer, Module, NestModule, RequestMethod } from '@nestjs/common';
+import { MiddlewareConsumer, Module, NestModule, RequestMethod } from '@nestjs/common';
 import { ArticleController } from './article.controller';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { ArticleEntity } from './article.entity';
@@ -11,13 +11,13 @@ import { UserModule } from '../user/user.module';
 
 @Module({
   imports: [TypeOrmModule.forFeature([ArticleEntity, Comment, UserEntity, FollowsEntity]), UserModule],
-  components: [ArticleService],
+  providers: [ArticleService],
   controllers: [
     ArticleController
   ]
 })
 export class ArticleModule implements NestModule {
-  public configure(consumer: MiddlewaresConsumer) {
+  public configure(consumer: MiddlewareConsumer) {
     consumer
       .apply(AuthMiddleware)
       .forRoutes(

src/article/article.service.ts

@@ -1,6 +1,6 @@
-import { Component, Inject } from '@nestjs/common';
+import { Component, Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
-import { Repository, getRepository } from 'typeorm';
+import { Repository, getRepository, DeleteResult } from 'typeorm';
 import { ArticleEntity } from './article.entity';
 import { Comment } from './comment.entity';
 import { UserEntity } from '../user/user.entity';
@@ -10,7 +10,7 @@ import { CreateArticleDto } from './dto';
 import {ArticleRO, ArticlesRO, CommentsRO} from './article.interface';
 const slug = require('slug');
 
-@Component()
+@Injectable()
 export class ArticleService {
   constructor(
     @InjectRepository(ArticleEntity)
@@ -82,7 +82,7 @@ export class ArticleService {
     if ('offset' in query) {
       qb.offset(query.offset);
     }
-    
+
     const articles = await qb.getMany();
 
     return {articles, articlesCount};
@@ -109,12 +109,12 @@ export class ArticleService {
   async deleteComment(slug: string, id: string): Promise<ArticleRO> {
     let article = await this.articleRepository.findOne({slug});
 
-    const comment = await this.commentRepository.findOneById(id);
+    const comment = await this.commentRepository.findOne(id);
     const deleteIndex = article.comments.findIndex(_comment => _comment.id === comment.id);
 
     if (deleteIndex >= 0) {
       const deleteComments = article.comments.splice(deleteIndex, 1);
-      await this.commentRepository.deleteById(deleteComments[0].id);
+      await this.commentRepository.delete(deleteComments[0].id);
       article =  await this.articleRepository.save(article);
       return {article};
     } else {
@@ -125,7 +125,7 @@ export class ArticleService {
 
   async favorite(id: number, slug: string): Promise<ArticleRO> {
     let article = await this.articleRepository.findOne({slug});
-    const user = await this.userRepository.findOneById(id);
+    const user = await this.userRepository.findOne(id);
 
     const isNewFavorite = user.favorites.findIndex(_article => _article.id === article.id) < 0;
     if (isNewFavorite) {
@@ -141,7 +141,7 @@ export class ArticleService {
 
   async unFavorite(id: number, slug: string): Promise<ArticleRO> {
     let article = await this.articleRepository.findOne({slug});
-    const user = await this.userRepository.findOneById(id);
+    const user = await this.userRepository.findOne(id);
 
     const deleteIndex = user.favorites.findIndex(_article => _article.id === article.id);
 
@@ -173,7 +173,7 @@ export class ArticleService {
 
     const newArticle = await this.articleRepository.save(article);
 
-    const author = await this.userRepository.findOneById(userId);
+    const author = await this.userRepository.findOne(userId);
 
     if (Array.isArray(author.articles)) {
       author.articles.push(article);
@@ -194,11 +194,11 @@ export class ArticleService {
     return {article};
   }
 
-  async delete(slug: string): Promise<void> {
+  async delete(slug: string): Promise<DeleteResult> {
     return await this.articleRepository.delete({ slug: slug});
   }
 
   slugify(title: string) {
     return slug(title, {lower: true}) + '-' + (Math.random() * Math.pow(36, 6) | 0).toString(36)
   }
-}
+}

src/profile/follows.entity.ts

@@ -1,7 +1,7 @@
 import { Entity, PrimaryGeneratedColumn, Column } from "typeorm";
 import {IsEmail, Validate} from "class-validator";
 import * as crypto from 'crypto';
-import { CustomEmail } from '../user/CustomEmail';
+// import { CustomEmail } from '../user/CustomEmail';
 
 @Entity('follows')
 export class FollowsEntity {
@@ -15,4 +15,4 @@ export class FollowsEntity {
   @Column()
   followingId: number;
 
-}
+}

src/profile/profile.module.ts

@@ -1,4 +1,4 @@
-import {MiddlewaresConsumer, Module, NestModule, RequestMethod} from '@nestjs/common';
+import {MiddlewareConsumer, Module, NestModule, RequestMethod} from '@nestjs/common';
 import { ProfileController } from './profile.controller';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { ProfileService } from './profile.service';
@@ -9,14 +9,14 @@ import {AuthMiddleware} from "../user/auth.middleware";
 
 @Module({
   imports: [TypeOrmModule.forFeature([UserEntity, FollowsEntity]), UserModule],
-  components: [ProfileService],
+  providers: [ProfileService],
   controllers: [
     ProfileController
   ],
   exports: []
 })
 export class ProfileModule implements NestModule {
-  public configure(consumer: MiddlewaresConsumer) {
+  public configure(consumer: MiddlewareConsumer) {
     consumer
       .apply(AuthMiddleware)
       .forRoutes({path: 'profiles/:username/follow', method: RequestMethod.ALL});

src/profile/profile.service.ts

@@ -1,13 +1,13 @@
-import {Component, HttpStatus, Inject} from '@nestjs/common';
+import {Component, HttpStatus, Injectable} from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 import { Repository } from 'typeorm';
 import { UserEntity } from '../user/user.entity';
 import { DeepPartial } from 'typeorm/common/DeepPartial';
 import { ProfileRO, ProfileData } from './profile.interface';
 import {FollowsEntity} from "./follows.entity";
-import {HttpException} from "@nestjs/core";
+import {HttpException} from "@nestjs/common/exceptions/http.exception";
 
-@Component()
+@Injectable()
 export class ProfileService {
   constructor(
     @InjectRepository(UserEntity)
@@ -101,4 +101,4 @@ export class ProfileService {
     return {profile};
   }
 
-}
+}

src/shared/pipes/validation.pipe.ts

@@ -1,9 +1,9 @@
-import {PipeTransform, Pipe, ArgumentMetadata, BadRequestException, HttpStatus} from '@nestjs/common';
+import {PipeTransform, Pipe, ArgumentMetadata, BadRequestException, HttpStatus, Injectable} from '@nestjs/common';
 import { validate } from 'class-validator';
 import { plainToClass } from 'class-transformer';
 import {HttpException} from "@nestjs/common/exceptions/http.exception";
 
-@Pipe()
+@Injectable()
 export class ValidationPipe implements PipeTransform<any> {
   async transform(value, metadata: ArgumentMetadata) {
 
@@ -38,4 +38,4 @@ export class ValidationPipe implements PipeTransform<any> {
     const types = [String, Boolean, Number, Array, Object];
     return !types.find((type) => metatype === type);
   }
-}
+}

src/tag/tag.entity.ts

@@ -1,7 +1,7 @@
 import {Entity, PrimaryGeneratedColumn, Column, BeforeInsert} from "typeorm";
 import {IsEmail, Validate} from "class-validator";
 import * as crypto from 'crypto';
-import { CustomEmail } from './CustomEmail';
+// import { CustomEmail } from './CustomEmail';
 
 @Entity('tag')
 export class TagEntity {
@@ -12,4 +12,4 @@ export class TagEntity {
   @Column()
   tag: string;
 
-}
+}

src/tag/tag.module.ts

@@ -1,4 +1,4 @@
-import {MiddlewaresConsumer, Module, NestModule, RequestMethod} from '@nestjs/common';
+import {MiddlewareConsumer, Module, NestModule, RequestMethod} from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { UserModule } from '../user/user.module';
 import { TagService } from './tag.service';
@@ -7,13 +7,13 @@ import { TagController } from './tag.controller';
 
 @Module({
   imports: [TypeOrmModule.forFeature([TagEntity]), UserModule],
-  components: [TagService],
+  providers: [TagService],
   controllers: [
     TagController
   ],
   exports: []
 })
 export class TagModule implements NestModule {
-  public configure(consumer: MiddlewaresConsumer) {
+  public configure(consumer: MiddlewareConsumer) {
   }
 }

src/tag/tag.service.ts

@@ -1,9 +1,9 @@
-import {Component, HttpStatus, Inject} from '@nestjs/common';
+import {Component, HttpStatus, Inject, Injectable} from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 import { Repository } from 'typeorm';
 import { TagEntity } from './tag.entity';
 
-@Component()
+@Injectable()
 export class TagService {
   constructor(
     @InjectRepository(TagEntity)
@@ -14,4 +14,4 @@ export class TagService {
     return await this.tagRepository.find();
   }
 
-}
+}

src/user/auth.middleware.ts

@@ -1,12 +1,12 @@
-import { HttpException } from '@nestjs/core';
-import { Middleware, NestMiddleware, HttpStatus } from '@nestjs/common';
+import { HttpException } from '@nestjs/common/exceptions/http.exception';
+import { Middleware, NestMiddleware, HttpStatus, Injectable } from '@nestjs/common';
 import { ExtractJwt, Strategy } from 'passport-jwt';
 import { Request, Response, NextFunction } from 'express';
 import * as jwt from 'jsonwebtoken';
 import { SECRET } from '../config';
 import { UserService } from './user.service';
 
-@Middleware()
+@Injectable()
 export class AuthMiddleware implements NestMiddleware {
   constructor(private readonly userService: UserService) {}
 
@@ -31,4 +31,4 @@ export class AuthMiddleware implements NestMiddleware {
       }
     };
   }
-}
+}

src/user/user.controller.ts

@@ -4,7 +4,7 @@ import { UserService } from './user.service';
 import { UserEntity } from './user.entity';
 import { UserRO } from './user.interface';
 import { CreateUserDto, UpdateUserDto, LoginUserDto } from './dto';
-import { HttpException } from '@nestjs/core';
+import { HttpException } from '@nestjs/common/exceptions/http.exception';
 import { User } from './user.decorator';
 import { ValidationPipe } from '../shared/pipes/validation.pipe';
 
@@ -54,4 +54,4 @@ export class UserController {
     const user = {email, token, username, bio, image};
     return {user}
   }
-}
+}

src/user/user.decorator.ts

@@ -1,8 +1,8 @@
-import { createRouteParamDecorator } from '@nestjs/common';
+import { createParamDecorator } from '@nestjs/common';
 import { SECRET } from '../config';
 import * as jwt from 'jsonwebtoken';
 
-export const User = createRouteParamDecorator((data, req) => {
+export const User = createParamDecorator((data, req) => {
 
   // if route is protected, there is a user set in auth.middleware
   if (!!req.user) {
@@ -16,4 +16,4 @@ export const User = createRouteParamDecorator((data, req) => {
     return !!data ? decoded[data] : decoded.user;
   }
 
-});
+});

src/user/user.entity.ts

@@ -36,4 +36,4 @@ export class UserEntity {
 
   @OneToMany(type => ArticleEntity, article => article.author)
   articles: ArticleEntity[];
-}
+}

src/user/user.module.ts

@@ -1,4 +1,4 @@
-import {MiddlewaresConsumer, Module, NestModule, RequestMethod} from '@nestjs/common';
+import {MiddlewareConsumer, Module, NestModule, RequestMethod} from '@nestjs/common';
 import { UserController } from './user.controller';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { UserEntity } from './user.entity';
@@ -7,14 +7,14 @@ import { AuthMiddleware } from './auth.middleware';
 
 @Module({
   imports: [TypeOrmModule.forFeature([UserEntity])],
-  components: [UserService],
+  providers: [UserService],
   controllers: [
     UserController
   ],
   exports: [UserService]
 })
 export class UserModule implements NestModule {
-  public configure(consumer: MiddlewaresConsumer) {
+  public configure(consumer: MiddlewareConsumer) {
     consumer
       .apply(AuthMiddleware)
       .forRoutes({path: 'user', method: RequestMethod.GET}, {path: 'user', method: RequestMethod.PUT});