From 08387cc528e6bb54a573410cb90612c68d626694 Mon Sep 17 00:00:00 2001
From: Ryan Ly <ryanly.rl1@gmail.com>
Date: Sat, 30 Jan 2021 12:15:31 -0500
Subject: [PATCH] Don't delete teams (#83)

* No deletey

* Add all member info
---
 src/controllers/dashboardController.ts | 17 ++++++++++++++++-
 src/controllers/teamController.ts      |  7 +------
 src/entity/Team.ts                     |  4 ++--
 src/entity/TeamInvite.ts               |  2 +-
 4 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/controllers/dashboardController.ts b/src/controllers/dashboardController.ts
index bf64979..6aed917 100644
--- a/src/controllers/dashboardController.ts
+++ b/src/controllers/dashboardController.ts
@@ -38,6 +38,7 @@ export const triggerUpdateTime = async (req: Request, res: Response): Promise<vo
 export const getDashboardInfo = async (req: Request, res: Response): Promise<void> => {
     // Grab currently logged in user
     const eventRepository = getManager().getRepository(Event);
+    const userRepo = getManager().getRepository(User);
     const currentTime = new Date();
 
     const token = req.header('Authorization')?.split(' ')[1];
@@ -52,6 +53,19 @@ export const getDashboardInfo = async (req: Request, res: Response): Promise<voi
         return;
     }
 
+    let teamMembers = [];
+    if(user.team) {
+        for(const member of user.team.members) {
+            const memberUser = await userRepo.findOne({id: member.id}, {relations: ['application']});
+            teamMembers.push({
+                ...member,
+                firstName: memberUser?.application?.firstName,
+                lastName: memberUser?.application?.lastName,
+                discordUsername: memberUser?.discordUsername
+            });
+        }
+    }
+
     if(!user.application) {
         res.status(403).send("User does not have an application");
         return;
@@ -78,7 +92,8 @@ export const getDashboardInfo = async (req: Request, res: Response): Promise<voi
         startTime: STARTTIME,
         endTime: ENDTIME,
         firstName: user.application.firstName,
-        lastName: user.application.lastName
+        lastName: user.application.lastName,
+        teamMembers: teamMembers
     });
 
 };
diff --git a/src/controllers/teamController.ts b/src/controllers/teamController.ts
index 1d25ade..b2c2c42 100644
--- a/src/controllers/teamController.ts
+++ b/src/controllers/teamController.ts
@@ -213,12 +213,7 @@ export const leaveTeam = async (req: Request, res: Response): Promise<void> => {
         if(item.uuid == user.uuid) team.members.splice(index, 1);
     });
 
-    // Team is empty, delete it
-    if(team.members.length == 0) {
-        await teamRepository.remove(team);
-    } else {
-        await teamRepository.save(team);
-    }
+    await teamRepository.save(team);
 
     res.sendStatus(200);
 }
diff --git a/src/entity/Team.ts b/src/entity/Team.ts
index 4cef18e..1f6127d 100644
--- a/src/entity/Team.ts
+++ b/src/entity/Team.ts
@@ -18,10 +18,10 @@ export class Team {
     @IsDefined()
     name?: string;
 
-    @OneToMany(() => User, user => user.team, {cascade: true, eager: true, onDelete: 'SET NULL'})
+    @OneToMany(() => User, user => user.team, {cascade: true, eager: true})
     members!: User[];
 
-    @OneToMany(() => TeamInvite, invite => invite.team, {cascade: true, onDelete: 'SET NULL'})
+    @OneToMany(() => TeamInvite, invite => invite.team, {cascade: true})
     invites!: TeamInvite[];
 
     @OneToOne(() => Submission, submission => submission.team)
diff --git a/src/entity/TeamInvite.ts b/src/entity/TeamInvite.ts
index bab8791..3518dbf 100644
--- a/src/entity/TeamInvite.ts
+++ b/src/entity/TeamInvite.ts
@@ -13,7 +13,7 @@ export class TeamInvite {
     @IsDefined()
     uuid!: string;
 
-    @ManyToOne(() => Team, team => team.invites, {onDelete: 'SET NULL'})
+    @ManyToOne(() => Team, team => team.invites)
     @IsDefined()
     team!: Team;