neuro_llc/neuro-reply-website
2
0
Fork 0
mirror of https://github.com/MrSedan/neuro-reply-website.git synced 2026-01-14 20:49:42 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Some entities changes

Browse Source
This commit is contained in:
Sergey Elpashev
2023-11-20 19:07:44 +03:00
parent c4a914c0a5
commit 41fef28cf7
3 changed files with 36 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
backend/libs/database/admin.entity.ts
View File

@@ -1,4 +1,4 @@
import { Entity, OneToOne, JoinColumn, PrimaryGeneratedColumn, Column } from 'typeorm'; import { Column, Entity, JoinColumn, OneToOne, PrimaryGeneratedColumn } from 'typeorm';
import { User } from './user.entity'; import { User } from './user.entity';
@Entity() @Entity()
@@ -10,10 +10,10 @@ export class Admin {
@PrimaryGeneratedColumn() @PrimaryGeneratedColumn()
public id!: number; public id!: number;
@Column() @Column({ nullable: false })
user_id: string; public user_id!: string;
@OneToOne(() => User) @OneToOne(() => User, (user) => user.id)
@JoinColumn({ name: 'user_id' }) @JoinColumn({ name: 'user_id' })
user: User; public user!: User;
} }

21
backend/libs/database/image.entity.ts
View File

@@ -1,4 +1,5 @@
import { Entity, PrimaryColumn, Column, OneToOne, JoinColumn } from 'typeorm'; import { ApiProperty } from '@nestjs/swagger';
import { Column, Entity, JoinColumn, ManyToOne, PrimaryColumn } from 'typeorm';
import { Post } from './post.entity'; import { Post } from './post.entity';
@Entity() @Entity()
@@ -8,17 +9,19 @@ export class Image {
} }
@PrimaryColumn() @PrimaryColumn()
message_id: number; public message_id!: number;
@Column({ nullable: false }) @Column({ nullable: false })
post_id: number; public file_id!: string;
@Column({ nullable: false })
file_id: string;
@Column({ default: false }) @Column({ default: false })
has_spoiler: boolean; public has_spoiler!: boolean;
@OneToOne(() => Post) @Column({ nullable: false })
@JoinColumn({ name: 'post_id' }) public post_uuid!: string;
user: Post;
@ApiProperty({})
@ManyToOne(() => Post, (post) => post.uuid)
@JoinColumn({ name: 'post_uuid' })
public post!: Post;
} }

31
backend/libs/database/post.entity.ts
View File

@@ -1,5 +1,6 @@
import { Entity, PrimaryGeneratedColumn, Column, Timestamp, OneToOne, JoinColumn } from 'typeorm'; import { Column, Entity, JoinColumn, OneToMany, OneToOne, PrimaryGeneratedColumn } from 'typeorm';
import { Admin } from './admin.entity'; import { Admin } from './admin.entity';
import { Image } from './image.entity';
@Entity() @Entity()
export class Post { export class Post {
constructor(props?: Partial<Post>) { constructor(props?: Partial<Post>) {
@@ -7,21 +8,27 @@ export class Post {
} }
@PrimaryGeneratedColumn('uuid') @PrimaryGeneratedColumn('uuid')
uuid: string; public uuid!: string;
@Column({ default: false }) @Column({ default: false })
posted: boolean; public posted!: boolean;
@Column()
public text: string;
@Column({ nullable: true })
public media_group_id: string;
@Column({ type: 'timestamptz' })
public timestamp!: Date;
@Column({ nullable: false }) @Column({ nullable: false })
from_user_id: string; public from_user_id!: string;
@Column()
text: string;
@Column()
media_group_id: string;
@Column({ type: 'timestamptz' })
timestamps: Date;
@OneToOne(() => Admin) @OneToOne(() => Admin, (admin) => admin.user.id)
@JoinColumn({ name: 'from_user_id' }) @JoinColumn({ name: 'from_user_id' })
user: Admin; public from_user!: Admin;
@OneToMany(() => Image, (image) => image.post)
public images: Image[];
} }