Clean up code

Code-4-Community · Dec 4, 2023 · a65d10f · a65d10f
1 parent 3b7951a
commit a65d10f
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 12 deletions.
diff --git a/apps/backend/src/applications/application.entity.ts b/apps/backend/src/applications/application.entity.ts
@@ -16,10 +16,6 @@ export class Application {
   @IsPositive()
   id: number;
 
-  // @Column()
-  // @IsPositive()
-  // applicantId: number;
-
   @ManyToOne(() => User, (user) => user.applications)
   @JoinColumn()
   user: User;

diff --git a/apps/backend/src/applications/applications.controller.ts b/apps/backend/src/applications/applications.controller.ts
@@ -8,10 +8,9 @@ import {
   UseGuards,
   BadRequestException,
 } from '@nestjs/common';
-import { ApplicationsService } from './applications.service';
 import { CurrentUserInterceptor } from '../interceptors/current-user.interceptor';
 import { AuthGuard } from '@nestjs/passport';
-import { ApplicationDTO } from './dto/application.dto';
+import { ApplicationDTO as GetApplicationDTO } from './dto/get-application.dto';
 import { instanceToPlain, plainToClass } from 'class-transformer';
 import { UsersService } from '../users/users.service';
 import { getAppForCurrentCycle } from './utils';
@@ -27,14 +26,14 @@ export class ApplicationsController {
     @Param('userId', ParseIntPipe) userId: number,
     //TODO: make req.user.applications unaccessible
     @Request() req,
-  ): Promise<ApplicationDTO> {
+  ): Promise<GetApplicationDTO> {
     const user = await this.usersService.findOne(req.user, userId);
     const app = getAppForCurrentCycle(user.applications);
     const appObject = instanceToPlain(app);
     if (appObject === null) {
       throw new BadRequestException('There are no applications');
     }
     appObject['numApps'] = user.applications.length;
-    return plainToClass(ApplicationDTO, appObject);
+    return plainToClass(GetApplicationDTO, appObject);
   }
 }
diff --git a/apps/backend/src/applications/applications.service.ts b/apps/backend/src/applications/applications.service.ts
@@ -34,8 +34,6 @@ export class ApplicationsService {
     }
 
     const applicant = await this.usersService.findOne(currentUser, userId);
-
-    console.log(applicant);
     const currentApp = getAppForCurrentCycle(applicant.applications ?? []);
     if (currentApp == null) {
       throw new BadRequestException('Application not found');

diff --git a/...d/src/applications/dto/application.dto.ts → ...c/applications/dto/get-application.dto.ts b/...d/src/applications/dto/application.dto.ts → ...c/applications/dto/get-application.dto.ts
diff --git a/apps/backend/src/users/user.entity.ts b/apps/backend/src/users/user.entity.ts
@@ -2,7 +2,6 @@ import {
   IsArray,
   IsEmail,
   IsEnum,
-  IsObject,
   IsPositive,
   IsString,
   IsUrl,

diff --git a/apps/backend/src/users/users.service.ts b/apps/backend/src/users/users.service.ts
@@ -45,7 +45,6 @@ export class UsersService {
   }
 
   async findOne(currentUser: User, userId: number): Promise<User> {
-    // const user = await this.usersRepository.findOneBy({ userId });
     const user = await this.usersRepository.findOne({
       where: { userId },
       relations: ['applications'],