feat: implement remove user from course mutation

src/teams/services/teams.service.ts

@@ -17,10 +17,7 @@ export class TeamsService {
     private connection: Connection,
   ) {}
 
-  public async findAll(data: {
-    pagination: IPagination;
-    courseId: string;
-  }): Promise<IEntityList<TeamEntity>> {
+  public async findAll(data: { pagination: IPagination; courseId: string }): Promise<IEntityList<TeamEntity>> {
     const [teams, count] = await this.teamsRepository.findAndCount({
       where: {
         courseId: data.courseId,
@@ -85,7 +82,7 @@ export class TeamsService {
   public async checkIfTeamMembersExist(id: string): Promise<boolean> {
     const team: TeamEntity = await this.teamsRepository.findOne(id, { loadRelationIds: true });
 
-    return Boolean(team.memberIds.length);
+    return Boolean(team?.memberIds.length);
   }
 
   public async deleteTeam(id: string): Promise<void> {

src/users/models/user-to-team.input-type.ts

@@ -1,6 +1,6 @@
 import { Field, InputType } from '@nestjs/graphql';
 
-import { IAddUserToTeamDTO, IRemoveUserFromTeamDTO } from './user.interface';
+import { IAddUserToTeamDTO, IRemoveUserFromCourseDTO, IRemoveUserFromTeamDTO } from './user.interface';
 
 @InputType()
 export class AddUserToTeamInput implements IAddUserToTeamDTO {
@@ -22,3 +22,15 @@ export class RemoveUserFromTeamInput implements IRemoveUserFromTeamDTO {
   @Field()
   public teamId: string;
 }
+
+@InputType()
+export class RemoveUserFromCourseInput implements IRemoveUserFromCourseDTO {
+  @Field()
+  public userId: string;
+
+  @Field({ nullable: true })
+  public teamId: string;
+
+  @Field()
+  public courseId: string;
+}

src/users/models/user.interface.ts

@@ -27,3 +27,8 @@ export interface IRemoveUserFromTeamDTO {
   userId: string;
   teamId: string;
 }
+export interface IRemoveUserFromCourseDTO {
+  userId: string;
+  teamId?: string;
+  courseId: string;
+}

src/users/resolvers/users.resolver.ts

@@ -15,10 +15,15 @@ import { Args, Mutation, Parent, Query, ResolveField, Resolver } from '@nestjs/g
 
 import { UserFilterInput } from '../models/user-filter.input-type';
 import { IUserFilter } from '../models/user-filter.interface';
-import { AddUserToTeamInput, RemoveUserFromTeamInput } from '../models/user-to-team.input-type';
+import {
+  AddUserToTeamInput,
+  RemoveUserFromCourseInput,
+  RemoveUserFromTeamInput,
+} from '../models/user-to-team.input-type';
 import { UpdateUserInput } from '../models/user.input-type';
 import {
   IAddUserToTeamDTO,
+  IRemoveUserFromCourseDTO,
   IRemoveUserFromTeamDTO,
   IUpdateUserDTO,
 } from '../models/user.interface';
@@ -89,9 +94,7 @@ export class UsersResolver {
 
   @Mutation(() => User, { name: 'updateUser' })
   @UseGuards(GqlAuthGuard)
-  public async updateUser(
-    @Args({ name: 'user', type: () => UpdateUserInput }) user: IUpdateUserDTO,
-  ): Promise<User> {
+  public async updateUser(@Args({ name: 'user', type: () => UpdateUserInput }) user: IUpdateUserDTO): Promise<User> {
     return this.usersService.updateUser(user);
   }
 
@@ -110,4 +113,12 @@ export class UsersResolver {
   ): Promise<User> {
     return this.usersService.removeUserFromTeam(data);
   }
+
+  @Mutation(() => User, { name: 'removeUserFromCourse' })
+  @UseGuards(GqlAuthGuard)
+  public async removeUserFromCourse(
+    @Args({ name: 'data', type: () => RemoveUserFromCourseInput }) data: IRemoveUserFromCourseDTO,
+  ): Promise<User> {
+    return this.usersService.removeUserFromCourse(data);
+  }
 }

src/users/services/users.service.ts

@@ -12,7 +12,7 @@ import { InjectRepository } from '@nestjs/typeorm';
 
 import { IUserFilter } from '../models/user-filter.interface';
 import { UserEntity } from '../models/user.entity';
-import { IAddUserToTeamDTO, IRemoveUserFromTeamDTO, IUser } from '../models/user.interface';
+import { IAddUserToTeamDTO, IRemoveUserFromCourseDTO, IRemoveUserFromTeamDTO, IUser } from '../models/user.interface';
 
 @Injectable()
 export class UsersService {
@@ -91,10 +91,7 @@ export class UsersService {
   }
 
   public async addUserToTeam(data: IAddUserToTeamDTO): Promise<UserEntity> {
-    const team: ITeam = await this.teamsService.findTeamByPassword(
-      data.courseId,
-      data.teamPassword,
-    );
+    const team: ITeam = await this.teamsService.findTeamByPassword(data.courseId, data.teamPassword);
 
     if (team) {
       await this.associateUserWithTeam(team, data.userId);
@@ -110,11 +107,7 @@ export class UsersService {
       loadRelationIds: true,
     });
 
-    await this.connection
-      .createQueryBuilder()
-      .relation(UserEntity, 'teamIds')
-      .of(userEntity)
-      .remove(data.teamId);
+    await this.connection.createQueryBuilder().relation(UserEntity, 'teamIds').of(userEntity).remove(data.teamId);
 
     const hasTeamMembers: Boolean = await this.teamsService.checkIfTeamMembersExist(data.teamId);
 
@@ -127,6 +120,25 @@ export class UsersService {
     });
   }
 
+  public async removeUserFromCourse(data: IRemoveUserFromCourseDTO): Promise<UserEntity> {
+    const userEntity: UserEntity = await this.usersRepository.findOne(data.userId, {
+      loadRelationIds: true,
+    });
+
+    await this.connection.createQueryBuilder().relation(UserEntity, 'courseIds').of(userEntity).remove(data.courseId);
+
+    if (data.teamId) {
+      return this.removeUserFromTeam({
+        teamId: data.teamId,
+        userId: data.userId,
+      });
+    }
+
+    return this.usersRepository.findOne(data.userId, {
+      loadRelationIds: true,
+    });
+  }
+
   public async updateUser(data: Partial<IUser>): Promise<UserEntity> {
     const { id, courseIds, ...user } = data;
     await this.usersRepository.update(id, { ...user });
@@ -136,11 +148,7 @@ export class UsersService {
     });
 
     courseIds?.forEach(async item => {
-      await this.connection
-        .createQueryBuilder()
-        .relation(UserEntity, 'courseIds')
-        .of(userEntity)
-        .add(item);
+      await this.connection.createQueryBuilder().relation(UserEntity, 'courseIds').of(userEntity).add(item);
     });
 
     return this.usersRepository.findOne(data.id, {
@@ -153,11 +161,7 @@ export class UsersService {
       loadRelationIds: true,
     });
 
-    return this.connection
-      .createQueryBuilder()
-      .relation(UserEntity, 'teamIds')
-      .of(userEntity)
-      .add(team.id);
+    return this.connection.createQueryBuilder().relation(UserEntity, 'teamIds').of(userEntity).add(team.id);
   }
 
   private getWhereString(data: IUserFilter, teamIds: string[] = []): string {
@@ -166,10 +170,8 @@ export class UsersService {
     const githubCondition: string = 'user.github ILIKE :github';
     const locationCondition: string = '(user.city ILIKE :city OR user.country ILIKE :country)';
     const teamCondition: string =
-      teamIds.reduce(
-        (acc, item, index) => `${acc}${index ? ',' : ''}'${item}'`,
-        'team.id NOT IN (',
-      ) + ') OR team.id ISNULL';
+      teamIds.reduce((acc, item, index) => `${acc}${index ? ',' : ''}'${item}'`, 'team.id NOT IN (') +
+      ') OR team.id ISNULL';
 
     const conditionMap: Map<string, string> = new Map([
       ['courseName', courseNameCondition],