Skip to content

Commit 4bee27a

Browse files
committed
Prettier
1 parent 64743f9 commit 4bee27a

30 files changed

Lines changed: 656 additions & 407 deletions

backend/src/controllers/criterion-controller.ts

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,26 @@ import {
66
Param,
77
Put,
88
Post,
9-
Body
9+
Body,
1010
} from "routing-controllers";
1111
import { Inject } from "typedi";
1212
import { UserRole } from "../entities/user-role";
13-
import { CriterionServiceToken, ICriterionService } from "../services/criterion-service";
13+
import {
14+
CriterionServiceToken,
15+
ICriterionService,
16+
} from "../services/criterion-service";
1417
import {
1518
CriterionDTO,
1619
SuccessResponseDTO,
17-
convertBetweenEntityAndDTO
20+
convertBetweenEntityAndDTO,
1821
} from "./dto";
1922
import { Criterion } from "../entities/criterion";
2023

2124
@JsonController("/criteria")
2225
export class CriterionController {
2326
public constructor(
24-
@Inject(CriterionServiceToken) private readonly _criterion: ICriterionService,
27+
@Inject(CriterionServiceToken)
28+
private readonly _criterion: ICriterionService,
2529
) {}
2630

2731
/**
@@ -56,7 +60,10 @@ export class CriterionController {
5660
@Param("id") criterionId: number,
5761
@Body() { data: criterionDTO }: { data: CriterionDTO },
5862
): Promise<CriterionDTO> {
59-
const criterion = convertBetweenEntityAndDTO({ ...criterionDTO, id: criterionId }, Criterion);
63+
const criterion = convertBetweenEntityAndDTO(
64+
{ ...criterionDTO, id: criterionId },
65+
Criterion,
66+
);
6067
const updateCriterion = await this._criterion.updateCriterion(criterion);
6168
return convertBetweenEntityAndDTO(updateCriterion, CriterionDTO);
6269
}

backend/src/controllers/projects-controller.ts

Lines changed: 27 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,24 @@
1-
import { Authorized, Get, JsonController, NotFoundError, Put, Param, Body, CurrentUser } from "routing-controllers";
1+
import {
2+
Authorized,
3+
Get,
4+
JsonController,
5+
NotFoundError,
6+
Put,
7+
Param,
8+
Body,
9+
CurrentUser,
10+
} from "routing-controllers";
211
import { Inject } from "typedi";
312
import { UserRole } from "../entities/user-role";
4-
import { IProjectService, ProjectServiceToken } from "../services/project-service";
5-
import { ProjectDTO, ProjectUpdateDTO, convertBetweenEntityAndDTO } from "./dto";
13+
import {
14+
IProjectService,
15+
ProjectServiceToken,
16+
} from "../services/project-service";
17+
import {
18+
ProjectDTO,
19+
ProjectUpdateDTO,
20+
convertBetweenEntityAndDTO,
21+
} from "./dto";
622
import { Project } from "../entities/project";
723
import { User } from "../entities/user";
824

@@ -30,9 +46,7 @@ export class ProjectsController {
3046
*/
3147
@Get("/:id")
3248
@Authorized(UserRole.User)
33-
public async getProjectByID(
34-
@Param("id") id: number,
35-
): Promise<ProjectDTO> {
49+
public async getProjectByID(@Param("id") id: number): Promise<ProjectDTO> {
3650
const project = await this._projects.getProjectByID(id);
3751

3852
if (project == null) {
@@ -58,10 +72,13 @@ export class ProjectsController {
5872
throw new NotFoundError();
5973
}
6074

61-
const project = convertBetweenEntityAndDTO({
62-
...projectDTO,
63-
id: projectId,
64-
}, Project);
75+
const project = convertBetweenEntityAndDTO(
76+
{
77+
...projectDTO,
78+
id: projectId,
79+
},
80+
Project,
81+
);
6582

6683
const updatedProject = await this._projects.updateProject(project, user);
6784
return convertBetweenEntityAndDTO(updatedProject, ProjectDTO);

backend/src/controllers/rating-controller.ts

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,19 @@ import {
55
Get,
66
Post,
77
Body,
8-
Param
8+
Param,
99
} from "routing-controllers";
1010
import { Inject } from "typedi";
1111
import { UserRole } from "../entities/user-role";
12-
import { SettingsServiceToken, ISettingsService } from "../services/settings-service";
12+
import {
13+
SettingsServiceToken,
14+
ISettingsService,
15+
} from "../services/settings-service";
1316
import { RatingServiceToken, IRatingService } from "../services/rating-service";
1417
import {
1518
RatingDTO,
1619
ProjectRatingResultDTO,
17-
convertBetweenEntityAndDTO
20+
convertBetweenEntityAndDTO,
1821
} from "./dto";
1922
import { User } from "../entities/user";
2023
import { Rating } from "../entities/rating";
@@ -35,7 +38,10 @@ export class RatingController {
3538
@Param("id") projectId: number,
3639
@CurrentUser() user: User,
3740
): Promise<RatingDTO[]> {
38-
const results = await this._ratings.getUsersRatingsForProject(projectId, user);
41+
const results = await this._ratings.getUsersRatingsForProject(
42+
projectId,
43+
user,
44+
);
3945
return results.map((r) => convertBetweenEntityAndDTO(r, RatingDTO));
4046
}
4147

@@ -46,7 +52,9 @@ export class RatingController {
4652
@Authorized(UserRole.Root)
4753
public async getRatingResults(): Promise<ProjectRatingResultDTO[]> {
4854
const results = await this._ratings.getRatingResults();
49-
return results.map((r) => convertBetweenEntityAndDTO(r, ProjectRatingResultDTO));
55+
return results.map((r) =>
56+
convertBetweenEntityAndDTO(r, ProjectRatingResultDTO),
57+
);
5058
}
5159

5260
/**

backend/src/entities/project.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
1-
import { Column, Entity, ManyToOne, PrimaryGeneratedColumn, JoinColumn } from "typeorm";
1+
import {
2+
Column,
3+
Entity,
4+
ManyToOne,
5+
PrimaryGeneratedColumn,
6+
JoinColumn,
7+
} from "typeorm";
28
import { Longtext } from "./longtext";
39
import { Team } from "./team";
410

backend/src/entities/rating.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
1-
import { Column, Entity, ManyToOne, PrimaryGeneratedColumn, Unique } from "typeorm";
1+
import {
2+
Column,
3+
Entity,
4+
ManyToOne,
5+
PrimaryGeneratedColumn,
6+
Unique,
7+
} from "typeorm";
28
import { Criterion } from "./criterion";
39
import { Project } from "./project";
410
import { User } from "./user";

backend/src/services/criterion-service.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,9 @@ export class CriterionService implements ICriterionService {
8787
*/
8888
public async getCriterionByID(id: number): Promise<CriterionDTO | undefined> {
8989
const criteria = await this._criteria.findOneBy({ id });
90-
return criteria ? convertBetweenEntityAndDTO(criteria, CriterionDTO) : undefined;
90+
return criteria
91+
? convertBetweenEntityAndDTO(criteria, CriterionDTO)
92+
: undefined;
9193
}
9294

9395
/**

backend/src/services/project-service.ts

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -68,23 +68,23 @@ export class ProjectService implements IProjectService {
6868
* Gets all projects that the user may see.
6969
*/
7070
public async getAllProjects(user: User): Promise<readonly Project[]> {
71-
const teams = await this._teams.find()
71+
const teams = await this._teams.find();
7272
const teamIds = teams
73-
.filter(team => team.users.includes(user.id.toString()))
74-
.map(team => team.id);
73+
.filter((team) => team.users.includes(user.id.toString()))
74+
.map((team) => team.id);
7575

7676
const [settings] = await this._settings.find();
7777
const allowRatingProjects = settings.application.allowRatingProjects;
7878
const isAdmin = user.role == UserRole.Root;
7979

80-
const projects = await this._projects.find()
81-
return projects.filter(project => {
82-
return (
83-
isAdmin
84-
|| (project.allowRating && allowRatingProjects)
85-
|| teamIds.includes(project.team.id)
86-
);
87-
});
80+
const projects = await this._projects.find();
81+
return projects.filter((project) => {
82+
return (
83+
isAdmin ||
84+
(project.allowRating && allowRatingProjects) ||
85+
teamIds.includes(project.team.id)
86+
);
87+
});
8888
}
8989

9090
/**
@@ -133,7 +133,10 @@ export class ProjectService implements IProjectService {
133133
* Deletes a project by its id.
134134
* @param id The id of the project
135135
*/
136-
public async deleteProjectByID(id: number, currentUserId: User): Promise<void> {
136+
public async deleteProjectByID(
137+
id: number,
138+
currentUserId: User,
139+
): Promise<void> {
137140
const project = await this._projects.findOneBy({ id });
138141

139142
if (!project) {
@@ -152,7 +155,7 @@ export class ProjectService implements IProjectService {
152155
*/
153156
private async checkPermission(project: Project, user: User): Promise<void> {
154157
if (user.role === UserRole.Root) {
155-
return
158+
return;
156159
}
157160

158161
const team = project.team;

0 commit comments

Comments
 (0)