Merge branch 'typeorm' into typeorm

1 files changed, 3 insertions, 5 deletions

diff --git a/util/src/entities/AuditLog.ts b/util/src/entities/AuditLog.ts

index ea8aa641..ceeb21fd 100644
--- a/util/src/entities/AuditLog.ts
+++ b/util/src/entities/AuditLog.ts
@@ -43,18 +43,16 @@ export enum AuditLogEvents {
 
 @Entity("audit_logs")
 export class AuditLogEntry extends BaseClass {
-	@RelationId((auditlog: AuditLogEntry) => auditlog.target)
-	target_id: string;
-
 	@JoinColumn({ name: "target_id" })
-	@ManyToOne(() => User, (user: User) => user.id)
+	@ManyToOne(() => User)
 	target?: User;
 
+	@Column({ nullable: true })
 	@RelationId((auditlog: AuditLogEntry) => auditlog.user)
 	user_id: string;
 
 	@JoinColumn({ name: "user_id" })
-	@ManyToOne(() => User, (user: User) => user.id)
+	@ManyToOne(() => User)
 	user: User;
 
 	@Column({