Merge 'webrtc' into 'dev/staging_webrtc'

1 files changed, 5 insertions, 3 deletions

diff --git a/src/util/entities/TeamMember.ts b/src/util/entities/TeamMember.ts
index d11ebf95..e2950c65 100644
--- a/src/util/entities/TeamMember.ts
+++ b/src/util/entities/TeamMember.ts
@@ -1,5 +1,7 @@
-import { Column, Entity, JoinColumn, ManyToOne, RelationId } from "typeorm";
+import "reflect-metadata";
+import { Column, Entity, JoinColumn, ManyToOne, Relation, RelationId } from "typeorm";
 import { BaseClass } from "./BaseClass";
+import { Team } from "./Team";
 import { User } from "./User";
 
 export enum TeamMemberState {
@@ -23,7 +25,7 @@ export class TeamMember extends BaseClass {
 	@ManyToOne(() => require("./Team").Team, (team: import("./Team").Team) => team.members, {
 		onDelete: "CASCADE"
 	})
-	team: import("./Team").Team;
+	team: Relation<Team>;
 
 	@Column({ nullable: true })
 	@RelationId((member: TeamMember) => member.user)
@@ -33,5 +35,5 @@ export class TeamMember extends BaseClass {
 	@ManyToOne(() => User, {
 		onDelete: "CASCADE"
 	})
-	user: User;
+	user: Relation<User>;
 }