AA-82: Assign Recruiters

apps/backend/src/applications/application.entity.ts

@@ -58,12 +58,23 @@ export class Application {
   @IsObject({ each: true })
   response: Response[];
 
+  @Column('jsonb', { nullable: true, default: [] })
+  @IsArray()
+  @IsObject({ each: true })
+  @OneToMany(() => User, (user) => user.firstName + user.lastName)
+  recruiters: User[];
+
   @Column('varchar', { array: true, default: {} })
   @IsArray()
   @IsObject({ each: true })
   @OneToMany(() => Review, (review) => review.application)
   reviews: Review[];
 
+  @Column({ nullable: false, default: 0 })
+  @IsPositive()
+  @Min(0)
+  numApps: number;
+
   toGetAllApplicationResponseDTO(
     meanRatingAllReviews,
     meanRatingResume,
@@ -80,6 +91,7 @@ export class Application {
       step: applicationStep,
       position: this.position,
       createdAt: this.createdAt,
+      recruiters: this.recruiters,
       meanRatingAllReviews,
       meanRatingResume,
       meanRatingChallenge,
@@ -101,6 +113,7 @@ export class Application {
       stage: this.stage,
       step: applicationStep,
       response: this.response,
+      recruiters: this.recruiters,
       reviews: this.reviews,
       numApps,
     };

apps/backend/src/applications/applications.controller.ts

@@ -7,6 +7,7 @@ import {
   UseInterceptors,
   UseGuards,
   Post,
+  Patch,
   Body,
   BadRequestException,
   NotFoundException,
@@ -17,11 +18,12 @@ import { ApplicationsService } from './applications.service';
 import { CurrentUserInterceptor } from '../interceptors/current-user.interceptor';
 import { AuthGuard } from '@nestjs/passport';
 import { GetApplicationResponseDTO } from './dto/get-application.response.dto';
-import { getAppForCurrentCycle } from './utils';
+import { getAppForCurrentCycle, toGetApplicationResponseDTO } from './utils';
 import { UserStatus } from '../users/types';
 import { Application } from './application.entity';
 import { GetAllApplicationResponseDTO } from './dto/get-all-application.response.dto';
 import { ApplicationStep } from './types';
+import { UpdateApplicationRequestDTO } from './dto/update-application.request.dto';
 
 @Controller('apps')
 @UseInterceptors(CurrentUserInterceptor)
@@ -115,4 +117,26 @@ export class ApplicationsController {
 
     return app.toGetApplicationResponseDTO(apps.length, applicationStep);
   }
+
+  // TODO: Update DTOs
+  @Patch('/:applicantId')
+  async updateApplication(
+    @Body() updateApplicationDTO: UpdateApplicationRequestDTO,
+    @Param('applicantId', ParseIntPipe) applicantId: number,
+    @Request() req,
+  ): Promise<GetApplicationResponseDTO> {
+    if (req.user.status !== UserStatus.ADMIN) {
+      throw new UnauthorizedException(
+        'Only admins can assign recruiters to applicants',
+      );
+    }
+
+    const newApplicant = await this.applicationsService.updateApplication(
+      req.application,
+      applicantId,
+      updateApplicationDTO,
+    );
+
+    return toGetApplicationResponseDTO(newApplicant);
+  }
 }

apps/backend/src/applications/applications.service.ts

@@ -2,6 +2,7 @@ import {
   BadRequestException,
   UnauthorizedException,
   Injectable,
+  NotFoundException,
 } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 import { Repository } from 'typeorm';
@@ -19,6 +20,7 @@ import { User } from '../users/user.entity';
 import { Position, ApplicationStage, ApplicationStep } from './types';
 import { GetAllApplicationResponseDTO } from './dto/get-all-application.response.dto';
 import { stagesMap } from './applications.constants';
+import { UpdateApplicationRequestDTO } from './dto/update-application.request.dto';
 
 @Injectable()
 export class ApplicationsService {
@@ -237,4 +239,40 @@ export class ApplicationsService {
 
     return currentApp;
   }
+
+  async findOne(
+    currentApplication: Application,
+    applicationId: number,
+  ): Promise<Application> {
+    const application = await this.applicationsRepository.findOne({
+      where: { id: applicationId },
+    });
+
+    if (!application) {
+      throw new NotFoundException(
+        `Application with ID ${applicationId} not found`,
+      );
+    }
+
+    return application;
+  }
+
+  async updateApplication(
+    currentApplication: Application,
+    applicationId: number,
+    updateApplicationDTO: UpdateApplicationRequestDTO,
+  ): Promise<Application> {
+    await this.findOne(currentApplication, applicationId);
+
+    try {
+      await this.applicationsRepository.update(
+        { id: applicationId },
+        updateApplicationDTO,
+      );
+    } catch (error) {
+      throw new BadRequestException('Cannot update application');
+    }
+
+    return await this.findOne(currentApplication, applicationId);
+  }
 }

apps/backend/src/applications/dto/get-all-application.response.dto.ts

@@ -1,5 +1,6 @@
-import { IsDate, IsEnum, IsPositive, IsString } from 'class-validator';
+import { IsArray, IsDate, IsEnum, IsPositive, IsString } from 'class-validator';
 import { ApplicationStage, ApplicationStep, Position } from '../types';
+import { User } from '../../users/user.entity';
 
 export class GetAllApplicationResponseDTO {
   @IsPositive()
@@ -23,6 +24,9 @@ export class GetAllApplicationResponseDTO {
   @IsDate()
   createdAt: Date;
 
+  @IsArray()
+  recruiters: User[];
+
   @IsPositive()
   meanRatingAllReviews: number;
 

apps/backend/src/applications/dto/get-application.response.dto.ts

@@ -1,4 +1,5 @@
 import { Review } from '../../reviews/review.entity';
+import { User } from '../../users/user.entity';
 import {
   ApplicationStage,
   ApplicationStep,
@@ -24,6 +25,8 @@ export class GetApplicationResponseDTO {
 
   response: Response[];
 
+  recruiters: User[];
+
   reviews: Review[];
 
   numApps: number;

apps/backend/src/applications/dto/update-application.request.dto.ts

@@ -0,0 +1,48 @@
+import { User } from '../../users/user.entity';
+import { Application } from '../application.entity';
+import {
+  Semester,
+  Position,
+  ApplicationStage,
+  ApplicationStep,
+} from '../types';
+import { Review } from '../../reviews/review.entity';
+import {
+  IsArray,
+  IsEnum,
+  IsObject,
+  IsOptional,
+  IsPositive,
+} from 'class-validator';
+
+export class UpdateApplicationRequestDTO {
+  @IsOptional()
+  @IsEnum(Semester)
+  semester?: Semester;
+
+  @IsOptional()
+  @IsEnum(Position)
+  position?: Position;
+
+  @IsOptional()
+  @IsEnum(ApplicationStage)
+  stage: ApplicationStage;
+
+  @IsOptional()
+  @IsEnum(ApplicationStep)
+  step: ApplicationStep;
+
+  @IsOptional()
+  @IsArray()
+  @IsObject({ each: true })
+  reviews: Review[];
+
+  @IsOptional()
+  @IsArray()
+  @IsObject({ each: true })
+  recruiters: User[];
+
+  @IsOptional()
+  @IsPositive()
+  numApps: number;
+}

apps/backend/src/applications/utils.ts

@@ -1,5 +1,6 @@
 import { Application } from './application.entity';
 import { Cycle } from './dto/cycle';
+import { GetApplicationResponseDTO } from './dto/get-application.response.dto';
 import { Semester } from './types';
 
 export const getCurrentSemester = (): Semester => {
@@ -34,3 +35,21 @@ export const getAppForCurrentCycle = (
 
   return null;
 };
+
+export const toGetApplicationResponseDTO = (
+  application: Application,
+): GetApplicationResponseDTO => {
+  return {
+    id: application.id,
+    createdAt: application.createdAt,
+    year: application.year,
+    semester: application.semester,
+    position: application.position,
+    stage: application.stage,
+    step: application.step,
+    response: application.response,
+    recruiters: application.recruiters,
+    reviews: application.reviews,
+    numApps: application.numApps,
+  };
+};

apps/backend/src/testing/factories/user.factory.ts

@@ -15,6 +15,7 @@ export const defaultUser: User = {
   team: null,
   role: null,
   applications: [],
+  recruiters: [],
 };
 
 export const userFactory = (user: Partial<User> = {}): User =>

apps/backend/src/users/dto/get-user.response.dto.ts

@@ -1,6 +1,7 @@
 import { Entity } from 'typeorm';
 import { Role, Team, UserStatus } from '../types';
 
+// TODO: Update this DTO and toGetUserResponseDto to include 'recruiters' field
 @Entity()
 export class GetUserResponseDto {
   id: number;

apps/backend/src/users/dto/update-user.request.dto.ts

@@ -1,3 +1,4 @@
+import { User } from '../../users/user.entity';
 import { Application } from '../../applications/application.entity';
 import { UserStatus, Role, Team } from '../types';
 import {
@@ -55,4 +56,9 @@ export class UpdateUserRequestDTO {
   @IsArray()
   @IsObject({ each: true })
   applications?: Application[];
+
+  @IsOptional()
+  @IsArray()
+  @IsObject({ each: true })
+  recruiters?: User[];
 }

apps/backend/src/users/user.entity.ts

@@ -71,4 +71,10 @@ export class User {
   @IsObject({ each: true })
   @OneToMany(() => Application, (application) => application.user)
   applications: Application[];
+
+  @Column('jsonb', { nullable: true, default: [] })
+  @IsArray()
+  @IsObject({ each: true })
+  @OneToMany(() => User, (user) => user.firstName + user.lastName)
+  recruiters: User[];
 }

apps/frontend/src/api/apiClient.ts

@@ -3,6 +3,7 @@ import type {
   Application,
   ApplicationRow,
   ApplicationStage,
+  User,
 } from '@components/types';
 
 const defaultBaseUrl =
@@ -47,6 +48,14 @@ export class ApiClient {
     })) as Promise<ApplicationRow[]>;
   }
 
+  public async getAllRecruiters(accessToken: string): Promise<User[]> {
+    return (await this.get('/api/users/recruiters', {
+      headers: {
+        Authorization: `Bearer ${accessToken}`,
+      },
+    })) as Promise<User[]>;
+  }
+
   public async getApplication(
     accessToken: string,
     userId: number,

apps/frontend/src/components/ApplicationTables/columns.ts

@@ -29,6 +29,11 @@ export const applicationColumns = [
     headerName: 'Date',
     width: 150,
   },
+  {
+    field: 'assignedRecruiters',
+    headerName: 'Assigned Recruiters',
+    width: 150,
+  },
   {
     field: 'meanRatingAllStages',
     headerName: 'Rating All Stages',