Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

초대 코드 중복 트랜잭션 제거, create로 확인하기 #374

Merged
merged 3 commits into from
Dec 30, 2024
Merged

초대 코드 중복 트랜잭션 제거, create로 확인하기 #374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e49db6c
feat: 트랜잭션을 제거하고, create를 사용해서 중복 확인
Conut-1 Dec 24, 2024
cd22661
test: 테스트 수정
Conut-1 Dec 26, 2024
8a62275
refactor: swagger에 unauthorized 응답 정보 추가
Conut-1 Dec 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions nestjs-BE/server/src/invite-codes/invite-codes.controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@ export class InviteCodesController {
status: HttpStatus.BAD_REQUEST,
description: 'Space code input is missing.',
})
@ApiResponse({
status: HttpStatus.UNAUTHORIZED,
description: 'need access token',
})
@ApiResponse({
status: HttpStatus.NOT_FOUND,
description: 'Space not found.',
Expand All @@ -50,6 +54,10 @@ export class InviteCodesController {
status: HttpStatus.OK,
description: 'Returns a space associated with the invite code.',
})
@ApiResponse({
status: HttpStatus.UNAUTHORIZED,
description: 'need access token',
})
@ApiResponse({
status: HttpStatus.NOT_FOUND,
description: 'Invite code not found.',
Expand Down
6 changes: 1 addition & 5 deletions nestjs-BE/server/src/invite-codes/invite-codes.service.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,6 @@ describe('InviteCodesService', () => {
const testInviteCode = { inviteCode: 'test invite code' } as InviteCode;

beforeEach(() => {
(prisma.$transaction as jest.Mock) = jest.fn(async (callback) =>
callback(),
);
jest.spyOn(inviteCodesService, 'findInviteCode').mockResolvedValue(null);
(prisma.inviteCode.create as jest.Mock) = jest.fn(
async () => testInviteCode,
);
Expand All @@ -100,7 +96,7 @@ describe('InviteCodesService', () => {
const inviteCode = inviteCodesService.createInviteCode(testSpaceUuid);

await expect(inviteCode).resolves.toEqual(testInviteCode);
expect(inviteCodesService.findInviteCode).toHaveBeenCalledTimes(1);
expect(prisma.inviteCode.create).toHaveBeenCalledTimes(1);
});
});
});
31 changes: 17 additions & 14 deletions nestjs-BE/server/src/invite-codes/invite-codes.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,22 +35,25 @@ export class InviteCodesService {
}

async createInviteCode(spaceUuid: string): Promise<InviteCode> {
return this.prisma.$transaction(async () => {
let inviteCode: string;
let inviteCode: InviteCode;
const newUuid = uuid();

do {
inviteCode = generateRandomString(INVITE_CODE_LENGTH);
} while (await this.findInviteCode(inviteCode));
do {
try {
inviteCode = await this.prisma.inviteCode.create({
data: {
uuid: newUuid,
inviteCode: generateRandomString(INVITE_CODE_LENGTH),
spaceUuid,
expiryDate: getExpiryDate({ hour: INVITE_CODE_EXPIRY_HOURS }),
},
});
} catch (err) {
if (err.code !== 'P2002') throw err;
}
} while (!inviteCode);

return this.prisma.inviteCode.create({
data: {
uuid: uuid(),
inviteCode,
spaceUuid,
expiryDate: getExpiryDate({ hour: INVITE_CODE_EXPIRY_HOURS }),
},
});
});
return inviteCode;
}

@Cron(CronExpression.EVERY_HOUR)
Expand Down
Loading