Teams 2

backend/src/controllers/application-controller.ts

@@ -260,9 +260,10 @@ export class ApplicationController {
   @Authorized(UserRole.User)
   public async createTeam(
     @Body() { data: teamDTO }: { data: TeamRequestDTO },
+    @CurrentUser() user: User,
   ): Promise<TeamDTO> {
     const team = convertBetweenEntityAndDTO(teamDTO, Team);
-    const createdTeam = await this._teams.createTeam(team);
+    const createdTeam = await this._teams.createTeam(team, user);
     return convertBetweenEntityAndDTO(createdTeam, TeamDTO);
   }
 
@@ -314,6 +315,42 @@ export class ApplicationController {
     return response;
   }
 
+  /**
+   * Remove a user from a team.
+   * @param teamId The id of the team
+   * @param userId The id of the user
+   */
+  @Delete("/team/:teamId/members/:userId")
+  @Authorized(UserRole.User)
+  public async removeUserFromTeam(
+    @Param("teamId") teamId: number,
+    @Param("userId") userId: number,
+    @CurrentUser() user: User,
+  ): Promise<SuccessResponseDTO> {
+    await this._teams.removeUserFromTeam(teamId, userId, user);
+    const response = new SuccessResponseDTO();
+    response.success = true;
+    return response;
+  }
+
+  /**
+   * Set the owner of a team
+   * @param teamId The id of the team
+   * @param userId The id of the new owner
+   */
+  @Put("/team/:teamId/owner/:userId")
+  @Authorized(UserRole.User)
+  public async setOwner(
+    @Param("teamId") teamId: number,
+    @Param("userId") userId: number,
+    @CurrentUser() user: User,
+  ): Promise<SuccessResponseDTO> {
+    await this._teams.setOwner(teamId, userId, user);
+    const response = new SuccessResponseDTO();
+    response.success = true;
+    return response;
+  }
+
   /**
    * Get team by id.
    * @param id The id of the team

backend/src/controllers/dto.ts

@@ -407,6 +407,10 @@ export class UserDetailsRepsonseDTO {
   public email!: string;
   @Expose()
   public role!: UserRole;
+  @Expose()
+  public teamRequest!: TeamDTO | null;
+  @Expose()
+  public team!: TeamDTO | null;
 }
 
 export class UserDTO {
@@ -445,12 +449,22 @@ export class UserDTO {
   public checkedIn!: boolean;
   @Expose()
   public profileSubmitted!: boolean;
+  @Expose()
+  @Type(() => TeamDTO)
+  @ValidateNested()
+  public teamRequest!: TeamDTO | null;
+  @Expose()
+  @Type(() => TeamDTO)
+  @ValidateNested()
+  public team!: TeamDTO | null;
 }
 
 export class UserTokenResponseDTO {
   @Expose()
   public token!: string;
   @Expose()
+  @Type(() => UserDTO)
+  @ValidateNested()
   public user!: UserDTO;
 }
 
@@ -498,16 +512,25 @@ export class UserListDto {
   @Expose()
   public id!: number;
   @Expose()
-  public name!: string;
+  public firstName!: string;
+  @Expose()
+  public lastName!: string;
+}
+
+export class UserResponseDto {
+  @Expose()
+  public id!: number;
+  @Expose()
+  public firstName!: string;
+  @Expose()
+  public lastName!: string;
 }
 
 export class ApplicationDTO {
   @Expose()
   @Type(() => UserDTO)
   public user!: UserDTO;
   @Expose()
-  public teams!: string[];
-  @Expose()
   @Type(() => AnswerDTO)
   public answers!: AnswerDTO[];
 }
@@ -522,20 +545,22 @@ export class IDRequestDTO implements IApiRequest<number> {
   public data!: number;
 }
 
-export class UserResponseDto {
-  @Expose()
-  public id!: number;
-  @Expose()
-  public name!: string;
-}
-
 export class TeamDTO {
   @Expose()
   public id!: number;
   @Expose()
   public title!: string;
   @Expose()
-  public users?: string[];
+  @Type(() => UserResponseDto)
+  public owner!: UserResponseDto;
+  @Expose()
+  @Type(() => UserResponseDto)
+  @ValidateNested()
+  public users!: UserResponseDto[];
+  @Expose()
+  @Type(() => UserResponseDto)
+  @ValidateNested()
+  public requests!: UserResponseDto[];
   @Expose()
   public teamImg!: string;
   @Expose()
@@ -548,23 +573,24 @@ export class TeamResponseDTO {
   @Expose()
   public title!: string;
   @Expose()
-  @Type(() => UserResponseDto)
-  public users?: UserResponseDto[];
-  @Expose()
   public teamImg!: string;
   @Expose()
   public description!: string;
   @Expose()
   @Type(() => UserResponseDto)
-  public requests?: UserResponseDto[];
+  public owner!: UserResponseDto;
+  @Expose()
+  @Type(() => UserResponseDto)
+  public users!: UserResponseDto[];
+  @Expose()
+  @Type(() => UserResponseDto)
+  public requests!: UserResponseDto[];
 }
 
 export class TeamRequestDTO {
   @Expose()
   public title!: string;
   @Expose()
-  public users?: number[];
-  @Expose()
   public teamImg!: string;
   @Expose()
   public description!: string;
@@ -576,8 +602,6 @@ export class TeamUpdateDTO {
   @Expose()
   public title!: string;
   @Expose()
-  public users?: number[];
-  @Expose()
   public teamImg!: string;
   @Expose()
   public description!: string;
@@ -626,9 +650,9 @@ export class RatingDTO {
   @Expose()
   public readonly id!: number;
   @Expose()
-  @Type(() => UserDTO)
+  @Type(() => UserResponseDto)
   @ValidateNested()
-  public user!: UserDTO;
+  public user!: UserResponseDto;
   @Expose()
   @Type(() => ProjectDTO)
   @ValidateNested()

backend/src/controllers/users-controller.ts

@@ -148,9 +148,6 @@ export class UsersController {
     const response = new UserTokenResponseDTO();
     response.token = this._users.generateLoginToken(user);
     response.user = convertBetweenEntityAndDTO(user, UserDTO);
-    const userDetails = await this._users.getUser(user.email);
-    response.user.firstName = userDetails.firstName;
-    response.user.lastName = userDetails.lastName;
     return response;
   }
 
@@ -166,9 +163,6 @@ export class UsersController {
     const response = new UserTokenResponseDTO();
     response.token = this._users.generateLoginToken(user);
     response.user = convertBetweenEntityAndDTO(user, UserDTO);
-    const userDetails = await this._users.getUser(user.email);
-    response.user.firstName = userDetails.firstName;
-    response.user.lastName = userDetails.lastName;
     return response;
   }
 

backend/src/entities/project.ts

@@ -12,7 +12,7 @@ import { Team } from "./team";
 export class Project {
   @PrimaryGeneratedColumn()
   public readonly id!: number;
-  @ManyToOne(() => Team, { eager: true })
+  @ManyToOne(() => Team, { eager: true, onDelete: "CASCADE" })
   @JoinColumn()
   public team!: Team;
   @Column({ length: 1024 })

backend/src/entities/team.ts

@@ -1,21 +1,56 @@
-import { Column, Entity, PrimaryGeneratedColumn } from "typeorm";
+import {
+  Column,
+  Entity,
+  PrimaryGeneratedColumn,
+  OneToMany,
+  OneToOne,
+  JoinColumn,
+} from "typeorm";
 import { Longtext } from "./longtext";
+import { User } from "./user";
 
 @Entity()
 export class Team {
   @PrimaryGeneratedColumn()
   public readonly id!: number;
   @Column({ length: 1024 })
   public title!: string;
-  // TODO many-to-many instead of simple-array (array of userId strings)
-  @Column("simple-array")
-  public users!: string[];
   // TODO rename teamImg to image
   @Column()
   public teamImg!: string;
   @Longtext()
   public description!: string;
-  // TODO many-to-many instead of simple-array (array of userId strings)
-  @Column("simple-array")
-  public requests!: string[];
+  // The owner also has to have their user.team property set to this team.
+  // Beware that this is not eagerly loaded, because it will throw recursion depth
+  // errors due to user.team being eagerly loaded already. Add it to "relations"
+  // when doing database queries instead.
+  @OneToOne(() => User)
+  @JoinColumn()
+  public owner!: User;
+  @OneToMany(() => User, (user) => user.teamRequest)
+  public requests!: User[];
+  @OneToMany(() => User, (user) => user.team)
+  public users!: User[];
+
+  /**
+   * List of user ids that are part of the team.
+   */
+  public userIds(): number[] {
+    if (!this.users) {
+      return [];
+    }
+
+    return this.users.map(({ id }) => id);
+  }
+
+  /**
+   * List of user ids that requested to join the team.
+   */
+  public requestUserIds(): number[] {
+    if (!this.requests) {
+      return [];
+    }
+
+    return this.requests.map(({ id }) => id);
+  }
 }

backend/src/entities/user.ts

@@ -4,8 +4,10 @@ import {
   Entity,
   PrimaryGeneratedColumn,
   UpdateDateColumn,
+  ManyToOne,
 } from "typeorm";
 import { UserRole } from "./user-role";
+import { Team } from "./team";
 
 @Entity()
 export class User {
@@ -45,4 +47,16 @@ export class User {
   public declined!: boolean;
   @Column({ default: false })
   public checkedIn!: boolean;
+  @ManyToOne(() => Team, (team) => team.requests, {
+    nullable: true,
+    eager: true,
+    onDelete: "SET NULL",
+  })
+  public teamRequest: Team | null = null;
+  @ManyToOne(() => Team, (team) => team.users, {
+    nullable: true,
+    eager: true,
+    onDelete: "SET NULL",
+  })
+  public team: Team | null = null;
 }

backend/src/services/application-service.ts

@@ -18,7 +18,6 @@ import {
 } from "./question-service";
 import { ISettingsService, SettingsServiceToken } from "./settings-service";
 import { IUserService, UserServiceToken } from "./user-service";
-import { Team } from "../entities/team";
 
 /**
  * A form containing questions and given answers.
@@ -41,7 +40,6 @@ export interface IRawAnswer {
  */
 export interface IApplication {
   user: User;
-  teams: string[];
   answers: readonly Answer[];
 }
 
@@ -121,7 +119,6 @@ export const ApplicationServiceToken = new Token<IApplicationService>();
 @Service(ApplicationServiceToken)
 export class ApplicationService implements IApplicationService {
   private _answers!: Repository<Answer>;
-  private _teams!: Repository<Team>;
 
   constructor(
     @Inject(QuestionGraphServiceToken)
@@ -138,7 +135,6 @@ export class ApplicationService implements IApplicationService {
    */
   public async bootstrap(): Promise<void> {
     this._answers = this._database.getRepository(Answer);
-    this._teams = this._database.getRepository(Team);
   }
 
   /**
@@ -545,13 +541,8 @@ export class ApplicationService implements IApplicationService {
       }
     }
 
-    const allTeams = await this._teams.find();
-
     const applications = allUsers.map<IApplication>((user) => ({
       answers: answersByUserID.get(user.id) ?? [],
-      teams: allTeams
-        .filter((team) => team.users.toString().includes(user.id.toString()))
-        .map((team) => team.title),
       user,
     }));