From 0b471ee5de6f5032e898f5290b745b2178df34fe Mon Sep 17 00:00:00 2001 From: Sergey Elpashev Date: Fri, 24 Nov 2023 17:53:25 +0300 Subject: [PATCH] Some changes in entities --- backend/libs/database/payment.entity.ts | 16 ++++++++-------- backend/libs/database/post.entity.ts | 5 ++++- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/backend/libs/database/payment.entity.ts b/backend/libs/database/payment.entity.ts index 14e7844..71f68a0 100644 --- a/backend/libs/database/payment.entity.ts +++ b/backend/libs/database/payment.entity.ts @@ -1,22 +1,22 @@ -import { Entity, PrimaryGeneratedColumn, Column, ManyToOne, JoinColumn } from 'typeorm'; +import { Column, Entity, JoinColumn, ManyToOne, PrimaryGeneratedColumn } from 'typeorm'; import { ProxyUser } from './proxy_user.entity'; @Entity() export class Payment { + constructor(props?: Partial) { + Object.assign(this, props); + } + @PrimaryGeneratedColumn('increment') public id!: number; @Column() - public uuidUser!: string; + public user_uuid!: string; @Column({ type: 'timestamptz' }) public payTime!: Date; - @ManyToOne(() => ProxyUser, { onDelete: 'CASCADE' }) // Assuming you want to cascade delete when a user is deleted - @JoinColumn({ name: 'uuidUser' }) + @ManyToOne(() => ProxyUser, { onDelete: 'CASCADE' }) + @JoinColumn({ name: 'user_uuid' }) user: ProxyUser; - - constructor(props?: Partial) { - Object.assign(this, props); - } } diff --git a/backend/libs/database/post.entity.ts b/backend/libs/database/post.entity.ts index 4ff2e89..1bebb15 100644 --- a/backend/libs/database/post.entity.ts +++ b/backend/libs/database/post.entity.ts @@ -1,4 +1,4 @@ -import { Entity, PrimaryGeneratedColumn, Column, OneToOne, JoinColumn } from 'typeorm'; +import { Column, Entity, JoinColumn, OneToOne, PrimaryGeneratedColumn } from 'typeorm'; import { Admin } from './admin.entity'; @Entity() export class Post { @@ -14,10 +14,13 @@ export class Post { @Column({ nullable: false }) from_user_id: string; + @Column() text: string; + @Column() media_group_id: string; + @Column({ type: 'timestamptz' }) timestamps: Date;