fix: article author relation

Author: lujakob

src/article/article.entity.ts

@@ -1,4 +1,4 @@
-import { Entity, PrimaryGeneratedColumn, Column, OneToOne, OneToMany, JoinColumn, AfterUpdate, BeforeUpdate } from 'typeorm';
+import { Entity, PrimaryGeneratedColumn, Column, OneToOne, ManyToOne, OneToMany, JoinColumn, AfterUpdate, BeforeUpdate } from 'typeorm';
 import { UserEntity } from '../user/user.entity';
 import { Comment } from './comment.entity';
 
@@ -14,10 +14,10 @@ export class ArticleEntity {
   @Column()
   title: string;
 
-  @Column()
+  @Column({default: ''})
   description: string;
 
-  @Column()
+  @Column({default: ''})
   body: string;
 
   @Column({ type: 'timestamp', default: () => "CURRENT_TIMESTAMP"})
@@ -34,8 +34,7 @@ export class ArticleEntity {
   @Column('simple-array')
   tagList: string[];
 
-  @OneToOne(type => UserEntity)
-  @JoinColumn()
+  @ManyToOne(type => UserEntity, user => user.articles)
   author: UserEntity;
 
   @OneToMany(type => Comment, comment => comment.article, {eager: true})

src/article/article.service.ts

@@ -26,7 +26,8 @@ export class ArticleService {
   async findAll(query): Promise<ArticlesRO> {
 
     const qb = await getRepository(ArticleEntity)
-      .createQueryBuilder('article');
+      .createQueryBuilder('article')
+      .leftJoinAndSelect('article.author', 'author');
 
     qb.where("1 = 1");
 
@@ -83,7 +84,7 @@ export class ArticleService {
     }
 
     const articles = await qb.getMany();
-    
+
     return {articles, articlesCount};
   }
 
@@ -162,16 +163,28 @@ export class ArticleService {
   }
 
   async create(userId: number, articleData: CreateArticleDto): Promise<ArticleEntity> {
-    const author = await this.userRepository.findOneById(userId);
+
     let article = new ArticleEntity();
     article.title = articleData.title;
     article.description = articleData.description;
     article.slug = this.slugify(articleData.title);
     article.tagList = articleData.tagList || [];
     article.comments = [];
-    article.author = author;
 
-    return await this.articleRepository.save(article);
+    const newArticle = await this.articleRepository.save(article);
+
+    const author = await this.userRepository.findOneById(userId);
+
+    if (Array.isArray(author.articles)) {
+      author.articles.push(article);
+    } else {
+      author.articles = [article];
+    }
+
+    await this.userRepository.save(author);
+
+    return newArticle;
+
   }
 
   async update(slug: string, articleData: any): Promise<ArticleRO> {

src/profile/profile.controller.ts

@@ -22,8 +22,8 @@ export class ProfileController {
   }
 
   @Post(':username/follow')
-  async follow(@User('id') userId: number, @Param('username') username: string): Promise<ProfileRO> {
-    return await this.profileService.follow(userId, username);
+  async follow(@User('email') email: string, @Param('username') username: string): Promise<ProfileRO> {
+    return await this.profileService.follow(email, username);
   }
 
   @Delete(':username/follow')

src/profile/profile.service.ts

@@ -47,22 +47,23 @@ export class ProfileService {
     return {profile};
   }
 
-  async follow(followerId: number, username: string): Promise<ProfileRO> {
-    if (!followerId || !username) {
-      throw new HttpException('FollowerId and username not provided.', HttpStatus.BAD_REQUEST);
+  async follow(followerEmail: string, username: string): Promise<ProfileRO> {
+    if (!followerEmail || !username) {
+      throw new HttpException('Follower email and username not provided.', HttpStatus.BAD_REQUEST);
     }
 
     const followingUser = await this.userRepository.findOne({username});
+    const followerUser = await this.userRepository.findOne({email: followerEmail});
 
-    if (followingUser.id === followerId) {
-      throw new HttpException('FollowerId and FollowingId cannot be equal.', HttpStatus.BAD_REQUEST);
+    if (followingUser.email === followerEmail) {
+      throw new HttpException('FollowerEmail and FollowingId cannot be equal.', HttpStatus.BAD_REQUEST);
     }
 
-    const _follows = await this.followsRepository.findOne( {followerId, followingId: followingUser.id});
+    const _follows = await this.followsRepository.findOne( {followerId: followerUser.id, followingId: followingUser.id});
 
     if (!_follows) {
       const follows = new FollowsEntity();
-      follows.followerId = followerId;
+      follows.followerId = followerUser.id;
       follows.followingId = followingUser.id;
       await this.followsRepository.save(follows);
     }

src/user/user.entity.ts

@@ -1,4 +1,4 @@
-import {Entity, PrimaryGeneratedColumn, Column, BeforeInsert, JoinTable, ManyToMany} from "typeorm";
+import {Entity, PrimaryGeneratedColumn, Column, BeforeInsert, JoinTable, ManyToMany, OneToMany} from "typeorm";
 import { IsEmail, Validate } from 'class-validator';
 import * as crypto from 'crypto';
 import { ArticleEntity } from '../article/article.entity';
@@ -30,8 +30,10 @@ export class UserEntity {
     this.password = crypto.createHmac('sha256', this.password).digest('hex');
   }
 
-  @ManyToMany(type => ArticleEntity, {eager: true})
+  @ManyToMany(type => ArticleEntity)
   @JoinTable()
-  favorites: ArticleEntity[]
+  favorites: ArticleEntity[];
 
+  @OneToMany(type => ArticleEntity, article => article.author)
+  articles: ArticleEntity[];
 }

src/user/user.service.ts

@@ -53,6 +53,7 @@ export class UserService {
     newUser.username = username;
     newUser.email = email;
     newUser.password = password;
+    newUser.articles = [];
 
     const errors = await validate(newUser);
     if (errors.length > 0) {