Fix articles feed endpoint

Author: lujakob

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nestjs-realworld-example-app",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "[![Build Status](https://travis-ci.org/anishkny/node-express-realworld-example-app.svg?branch=master)](https://travis-ci.org/anishkny/node-express-realworld-example-app)",
   "main": "index.js",
   "scripts": {

src/article/article.controller.ts

@@ -27,6 +27,15 @@ export class ArticleController {
     return await this.articleService.findAll(query);
   }
 
+
+  @ApiOperation({ title: 'Get article feed' })
+  @ApiResponse({ status: 200, description: 'Return article feed.'})
+  @ApiResponse({ status: 403, description: 'Forbidden.' })
+  @Get('feed')
+  async getFeed(@User('id') userId: number, @Query() query): Promise<ArticlesRO> {
+    return await this.articleService.findFeed(userId, query);
+  }
+
   @Get(':slug')
   async findOne(@Param('slug') slug): Promise<ArticleRO> {
     return await this.articleService.findOne({slug});
@@ -95,12 +104,4 @@ export class ArticleController {
     return await this.articleService.unFavorite(userId, slug);
   }
 
-  @ApiOperation({ title: 'Get article feed' })
-  @ApiResponse({ status: 200, description: 'Return article feed.'})
-  @ApiResponse({ status: 403, description: 'Forbidden.' })
-  @Get('feed')
-  async getFeed(@User('id') userId: number, @Query() query): Promise<ArticlesRO> {
-    return await this.articleService.findFeed(userId, query);
-  }
-
 }

src/article/article.service.ts

@@ -65,6 +65,11 @@ export class ArticleService {
 
   async findFeed(userId: number, query): Promise<ArticlesRO> {
     const _follows = await this.followsRepository.find( {followerId: userId});
+
+    if (!(Array.isArray(_follows) && _follows.length > 0)) {
+      return {articles: [], articlesCount: 0};
+    }
+
     const ids = _follows.map(el => el.followingId);
 
     const qb = await getRepository(ArticleEntity)

src/user/user.decorator.ts

@@ -3,11 +3,10 @@ import { SECRET } from '../config';
 import * as jwt from 'jsonwebtoken';
 
 export const User = createParamDecorator((data, req) => {
-
   // if route is protected, there is a user set in auth.middleware
   if (!!req.user) {
     return !!data ? req.user[data] : req.user;
-  };
+  }
 
   // in case a route is not protected, we still want to get the optional auth user from jwt
   const token = req.headers.authorization ? (req.headers.authorization as string).split(' ') : null;

src/user/user.entity.ts

@@ -1,4 +1,4 @@
-import {Entity, PrimaryGeneratedColumn, Column, BeforeInsert, JoinTable, ManyToMany, OneToMany} from "typeorm";
+import {Entity, PrimaryGeneratedColumn, Column, BeforeInsert, JoinTable, ManyToMany, OneToMany} from 'typeorm';
 import { IsEmail } from 'class-validator';
 import * as argon2 from 'argon2';
 import { ArticleEntity } from '../article/article.entity';

src/user/user.service.ts

@@ -90,7 +90,7 @@ export class UserService {
     if (!user) {
       const errors = {User: ' not found'};
       throw new HttpException({errors}, 401);
-    };
+    }
 
     return this.buildUserRO(user);
   }
@@ -115,6 +115,7 @@ export class UserService {
 
   private buildUserRO(user: UserEntity) {
     const userRO = {
+      id: user.id,
       username: user.username,
       email: user.email,
       bio: user.bio,