Skip to content

Commit

Permalink
refactor: 파라미터 형식 변경
Browse files Browse the repository at this point in the history
- 레포지토리의 getProjectToMember 메서드 파라미터를 project가 아닌 projectId만 받도록 변경
- 서비스의 isProjectMember, isProjectLeader 메서드 파라미터를 project가 아닌 projectId만 받도록 변경
- 서비스 메서드의 변경으로 인해 영향을 받는 컨트롤러 계층의 인수 수정
  • Loading branch information
choyoungwoo9 committed Sep 18, 2024
1 parent 99e98ba commit 1b62505
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 12 deletions.
6 changes: 4 additions & 2 deletions backend/src/project/project.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ export class ProjectController {
if (!project) throw new NotFoundException();

const isProjectMember = await this.projectService.isProjectMember(
project,
project.id,
request.member,
);
if (isProjectMember)
Expand All @@ -71,7 +71,9 @@ export class ProjectController {
await this.projectService.addMember(project, request.member);
} catch (err) {
if (err.message === 'Project reached its maximum member capacity')
throw new ConflictException('Project reached its maximum member capacity');
throw new ConflictException(
'Project reached its maximum member capacity',
);
throw err;
}
this.projectWebsocketGateway.notifyJoinToConnectedMembers(
Expand Down
4 changes: 2 additions & 2 deletions backend/src/project/project.repository.ts
Original file line number Diff line number Diff line change
Expand Up @@ -95,11 +95,11 @@ export class ProjectRepository {
}

getProjectToMember(
project: Project,
projectId: number,
member: Member,
): Promise<ProjectToMember | null> {
return this.projectToMemberRepository.findOne({
where: { project: { id: project.id }, member: { id: member.id } },
where: { project: { id: projectId }, member: { id: member.id } },
});
}

Expand Down
12 changes: 6 additions & 6 deletions backend/src/project/service/project.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export class ProjectService {
title: string,
subject: string,
): Promise<boolean> {
if (!(await this.isProjectLeader(project, member))) {
if (!(await this.isProjectLeader(project.id, member))) {
throw new Error('Member is not the project leader');
}
return this.projectRepository.updateProjectInfo(project, title, subject);
Expand All @@ -47,7 +47,7 @@ export class ProjectService {
}

async addMember(project: Project, member: Member): Promise<void> {
const isProjectMember = await this.isProjectMember(project, member);
const isProjectMember = await this.isProjectMember(project.id, member);
if (isProjectMember) throw new Error('already joined member');

if ((await this.getProjectMemberList(project)).length >= 10)
Expand All @@ -64,16 +64,16 @@ export class ProjectService {
return this.projectRepository.getProjectMemberList(project);
}

async isProjectMember(project: Project, member: Member): Promise<boolean> {
async isProjectMember(projectId: number, member: Member): Promise<boolean> {
const projectToMember: ProjectToMember | null =
await this.projectRepository.getProjectToMember(project, member);
await this.projectRepository.getProjectToMember(projectId, member);
if (!projectToMember) return false;
return true;
}

async isProjectLeader(project: Project, member: Member): Promise<boolean> {
async isProjectLeader(projectId: number, member: Member): Promise<boolean> {
const projectToMember = await this.projectRepository.getProjectToMember(
project,
projectId,
member,
);
return projectToMember?.role === MemberRole.LEADER;
Expand Down
2 changes: 1 addition & 1 deletion backend/src/project/websocket.gateway.ts
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ export class ProjectWebsocketGateway
const project = await this.projectService.getProject(client.projectId);
if (!project) throw new Error('Project not found');
const isProjectMember = await this.projectService.isProjectMember(
project,
project.id,
client.member,
);
if (!isProjectMember) throw new Error('Not project member');
Expand Down
2 changes: 1 addition & 1 deletion backend/src/project/ws-controller/ws-project.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ export class WsProjectController {
async joinSettingPage(client: ClientSocket) {
if (
!(await this.projectService.isProjectLeader(
client.project,
client.project.id,
client.member,
))
) {
Expand Down

0 comments on commit 1b62505

Please sign in to comment.