● MERGEDtomorro/api #1460 · by @sebdec · 4 years ago

🐛 app-1899 replace memberInvitation.inviter by inviterUser to handle …

replace memberInvitation.inviter by inviterUser to handle member invited by user and not by member

Added
+55
Removed
−27
Files
9
Checks
Matched 1 engineer who reviewed this change
src/member-invitation/member-invitation.entity.ts+11 −2
9 Unique,
10 } from 'typeorm';
11 import { Member } from '../member/member.entity';
12+import { User } from './../user/user.entity';
Edaly AhmedApprove

yes. I was expecting that. Thanks for the clarification

Ask why
13
14 @Entity('memberInvitation')
15 @Unique(['memberId'])
27 @Column()
28 memberId: string;
29
30− @ManyToOne(() => Member, { eager: true, nullable: true })
30+ // @deprecated
31+ @ManyToOne(() => Member, { nullable: true })
32 inviter: Member;
33
34+ // @deprecated
35 @Column({ nullable: true })
36− inviterId: string;
36+ inviterId: string | null;
37+
38+ @ManyToOne(() => User, { eager: true, nullable: true })
39+ inviterUser: User | null;
Edaly AhmedComment

Technically. he can be a user from another organization 🤔

Ask why
40+
41+ @Column({ nullable: true })
42+ inviterUserId: string | null;
43
44 @Column({ nullable: false, length: 1000 })
45 token: string;