Comments schema update

Author: ArtemKolodko

src/app.controller.ts

@@ -51,10 +51,14 @@ export class AppController {
 
   @Post('/comment')
   async addComment(@Body() dto: AddCommentDto) {
-    const token = await this.appService.getTokenById(dto.tokenId)
+    const token = await this.appService.getTokenByAddress(dto.tokenAddress)
     if(!token) {
       throw new NotFoundException('Token not found')
     }
+    const user = await this.userService.getUserByAddress(dto.userAddress)
+    if(!user) {
+      throw new NotFoundException('User not found')
+    }
     return await this.appService.addComment(dto)
   }
 

src/app.service.ts

@@ -241,13 +241,13 @@ export class AppService {
         return await this.dataSource.manager.find(Comment, {
             where: {
                 token: {
-                    id: dto.tokenId
+                    address: dto.tokenAddress
                 }
             },
             take: +dto.limit,
             skip: +dto.offset,
             order: {
-                createdAt: 'desc'
+                createdAt: 'asc'
             }
         })
     }
@@ -257,6 +257,7 @@ export class AppService {
         const query = this.dataSource.getRepository(Token)
           .createQueryBuilder('token')
           .leftJoinAndSelect('token.user', 'user')
+          // .leftJoinAndSelect('token.comments', 'comments')
           .offset(offset)
           .limit(limit)
           .orderBy({
@@ -267,7 +268,6 @@ export class AppService {
             query.where('token.name = :name', { name: search })
               .orWhere('token.address = :address', { address: search })
               .orWhere('token.symbol = :symbol', { symbol: search })
-              .orWhere('token.id = :id', { id: search })
               .orWhere('token.txnHash = :txnHash', { txnHash: search })
         }
 
@@ -306,10 +306,12 @@ export class AppService {
     }
 
     async addComment(dto: AddCommentDto): Promise<string> {
-        const token = await this.getTokenById(dto.tokenId)
+        const token = await this.getTokenByAddress(dto.tokenAddress)
+        const user = await this.userService.getUserByAddress(dto.userAddress)
         const comment = this.dataSource.manager.create(Comment, {
             ...dto,
-            token
+            token,
+            user
         })
         const { identifiers } = await this.dataSource.manager.insert(Comment, comment)
         return identifiers[0].id

src/dto/comment.dto.ts

@@ -7,7 +7,7 @@ export class AddCommentDto {
   @Transform((address) => address.value.trim().toLowerCase())
   @Type(() => String)
   @IsString()
-  tokenId: string;
+  tokenAddress: string;
 
   @ApiProperty({ type: String, required: true })
   @Transform((address) => address.value.trim().toLowerCase())
@@ -27,7 +27,7 @@ export class GetCommentsDto {
   @Transform((address) => address.value.trim().toLowerCase())
   @Type(() => String)
   @IsString()
-  tokenId: string;
+  tokenAddress: string;
 
   @ApiProperty({ type: Number, required: false, default: '100' })
   // @Transform((limit) => limit.value.toNumber())

src/entities/comment.entity.ts

@@ -7,22 +7,26 @@ import {
 } from 'typeorm';
 import { ApiProperty } from '@nestjs/swagger';
 import {Token} from "./token.entity";
+import {UserAccount} from "./user-account.entity";
 
 @Entity({ name: 'comments' })
 export class Comment {
   @ApiProperty()
-  @PrimaryGeneratedColumn('uuid')
-  id: string;
-
-  @ApiProperty()
-  @Column()
-  userAddress: string;
+  @PrimaryGeneratedColumn()
+  id: number;
 
   @ApiProperty()
   @Column()
   text: string;
 
-  @ManyToOne(() => Token, (token) => token.comments)
+  @ManyToOne(() => UserAccount, (userAccount) => userAccount.comments, {
+    eager: true
+  })
+  user: UserAccount
+
+  @ManyToOne(() => Token, (token) => token.comments, {
+    eager: true
+  })
   token: Token
 
   @ApiProperty()

src/entities/token.entity.ts

@@ -48,9 +48,7 @@ export class Token {
   @JoinTable()
   user: UserAccount
 
-  @OneToMany(() => Comment, (comment) => comment.token, {
-    eager: true
-  })
+  @OneToMany(() => Comment, (comment) => comment.token)
   @JoinTable()
   comments: Comment[]
 

src/entities/user-account.entity.ts

@@ -10,6 +10,7 @@ import {
 } from 'typeorm';
 import { ApiProperty } from '@nestjs/swagger';
 import {Token} from "./token.entity";
+import {Comment} from "./comment.entity";
 
 @Entity({ name: 'users' })
 export class UserAccount {
@@ -28,6 +29,9 @@ export class UserAccount {
   @OneToMany(() => Token, (token) => token.user)
   tokens: Token[]
 
+  @OneToMany(() => Comment, (comment) => comment.user)
+  comments: Comment[]
+
   @ApiProperty()
   @CreateDateColumn({ name: 'createdAt' })
   createdAt: Date;