Skip to content

[BE] refactor: serializable 제거 및 동시성 테스트 추가 #519

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

Open
dongho108 wants to merge 8 commits into
base: develop
Choose a base branch
from
Open

[BE] refactor: serializable 제거 및 동시성 테스트 추가 #519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2eaa775
refactor: serializable 제거 및 동시성 테스트 추가
dongho108 Nov 5, 2022
d18f5c4
Update backend-test-ci.yml
her0807 Nov 22, 2022
fa9d5a7
Update backend-test-ci.yml
her0807 Nov 22, 2022
433818c
Update backend-test-ci.yml
her0807 Nov 22, 2022
f15648c
Update backend-test-ci.yml
her0807 Nov 22, 2022
ab22d8a
Update backend-test
her0807 Nov 22, 2022
4a87b1b
Update backend-test-ci.yml
her0807 Nov 22, 2022
47c3e28
Merge branch 'develop' into refactor/interview-concurrent-#510
her0807 Nov 22, 2022
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
4 changes: 2 additions & 2 deletions .github/workflows/backend-test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- name: 리포지토리를 가져옵니다
uses: actions/checkout@v3
with:
token: ${{ secrets.SUBMODULE_TOKEN }}
repo-token: ${{ secrets.GITHUB_TOKEN }}
submodules: recursive

- name: JDK 11을 설치합니다
Expand All @@ -56,7 +56,7 @@ jobs:
if: always()
with:
report_paths: '**/build/test-results/test/TEST-*.xml'
token: ${{ github.token }}
repo-token: ${{ secrets.GITHUB_TOKEN }}

- name: build 실패 시 Slack으로 알립니다
uses: 8398a7/action-slack@v3
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/backend-test-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
- name: 리포지토리를 가져옵니다
uses: actions/checkout@v3
with:
token: ${{ secrets.SUBMODULE_TOKEN }}
repo-token: ${{ secrets.GITHUB_TOKEN }}
submodules: recursive

- name: JDK 11을 설치합니다
Expand All @@ -62,7 +62,7 @@ jobs:
if: always()
with:
report_paths: '**/build/test-results/test/TEST-*.xml'
token: ${{ github.token }}
repo-token: ${{ secrets.GITHUB_TOKEN }}

- name: build 실패 시 Slack으로 알립니다
uses: 8398a7/action-slack@v3
Expand All @@ -81,7 +81,8 @@ jobs:
- uses: actions/checkout@v2
with:
submodules: true
token: ${{ secrets.SUBMODULE_TOKEN }}
repo-token: ${{ secrets.GITHUB_TOKEN }}

- name: Set up JDK 11
uses: actions/setup-java@v3
with:
Expand All @@ -107,7 +108,7 @@ jobs:
if: always()
with:
report_paths: '**/build/reports/checkstyle-result.xml'
token: ${{ github.token }}
repo-token: ${{ secrets.GITHUB_TOKEN }}

- name: build 실패 시 Slack으로 알립니다
uses: 8398a7/action-slack@v3
Expand Down
34 changes: 14 additions & 20 deletions backend/src/main/java/com/woowacourse/ternoko/core/application/InterviewService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
package com.woowacourse.ternoko.core.application;

import static com.woowacourse.ternoko.common.exception.ExceptionType.AVAILABLE_DATE_TIME_NOT_FOUND;
import static com.woowacourse.ternoko.common.exception.ExceptionType.COACH_NOT_FOUND;
import static com.woowacourse.ternoko.common.exception.ExceptionType.CREW_NOT_FOUND;
import static com.woowacourse.ternoko.common.exception.ExceptionType.INTERVIEW_NOT_FOUND;
import static com.woowacourse.ternoko.common.exception.ExceptionType.INVALID_INTERVIEW_BY_MEMBER;
import static com.woowacourse.ternoko.common.exception.ExceptionType.INVALID_INTERVIEW_CREW_ID;
import static com.woowacourse.ternoko.common.exception.ExceptionType.INVALID_INTERVIEW_DUPLICATE_DATE_TIME;
import static com.woowacourse.ternoko.common.exception.ExceptionType.USED_BY_OTHER;
import static com.woowacourse.ternoko.core.domain.availabledatetime.AvailableDateTimeStatus.OPEN;
import static com.woowacourse.ternoko.core.domain.availabledatetime.AvailableDateTimeStatus.USED;
import static com.woowacourse.ternoko.core.domain.interview.InterviewStatusType.isCanceled;
import static com.woowacourse.ternoko.common.exception.ExceptionType.*;
import static com.woowacourse.ternoko.core.domain.availabledatetime.AvailableDateTimeStatus.*;
import static com.woowacourse.ternoko.core.domain.interview.InterviewStatusType.*;
import static java.lang.Long.valueOf;
import static org.springframework.transaction.annotation.Isolation.SERIALIZABLE;

import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.Comparator;
import java.util.List;
import java.util.stream.Collectors;

import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import com.woowacourse.ternoko.common.exception.AvailableDateTimeInvalidException;
import com.woowacourse.ternoko.common.exception.CoachInvalidException;
Expand All @@ -34,14 +34,8 @@
import com.woowacourse.ternoko.support.alarm.AlarmResponse;
import com.woowacourse.ternoko.support.alarm.AlarmResponseCache;
import com.woowacourse.ternoko.support.alarm.SlackMessageType;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.Comparator;
import java.util.List;
import java.util.stream.Collectors;

import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

@Service
@Transactional
Expand All @@ -60,7 +54,7 @@ public class InterviewService {
private final AvailableDateTimeRepository availableDateTimeRepository;
private final AlarmResponseCache cache;

@Transactional(isolation = SERIALIZABLE)
@Transactional
public Long create(final Long crewId, final InterviewRequest interviewRequest) {
final Interview interview = convertInterview(crewId, interviewRequest);
validateDuplicateStartTimeByCrew(interviewRequest.getInterviewDatetime(), crewId);
Expand Down
94 changes: 42 additions & 52 deletions backend/src/test/java/com/woowacourse/ternoko/service/InterviewServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,36 +1,31 @@
package com.woowacourse.ternoko.service;

import static com.woowacourse.ternoko.common.exception.ExceptionType.INVALID_INTERVIEW_DATE;
import static com.woowacourse.ternoko.core.domain.availabledatetime.AvailableDateTimeStatus.DELETED;
import static com.woowacourse.ternoko.core.domain.availabledatetime.AvailableDateTimeStatus.OPEN;
import static com.woowacourse.ternoko.support.fixture.MemberFixture.COACH1;
import static com.woowacourse.ternoko.support.fixture.refactor.AvailableDateTimeFixture._2022_07_01_10_00;
import static com.woowacourse.ternoko.support.fixture.refactor.AvailableDateTimeFixture.면담가능시간_브리_2022_07_01_10_00;
import static com.woowacourse.ternoko.support.fixture.refactor.AvailableDateTimeFixture.면담가능시간_준_2022_07_01_10_00;
import static com.woowacourse.ternoko.support.fixture.refactor.AvailableDateTimeFixture.면담가능시간_준_2022_07_01_11_00;
import static com.woowacourse.ternoko.support.fixture.refactor.AvailableDateTimeFixture.면담가능시간_준_2022_07_01_12_00;
import static com.woowacourse.ternoko.support.fixture.refactor.AvailableDateTimeFixture.면담가능시간_토미_2022_07_01_10_00;
import static com.woowacourse.ternoko.support.fixture.refactor.AvailableDateTimeFixture.면담가능시간_토미_2022_07_01_11_00;
import static com.woowacourse.ternoko.support.fixture.refactor.AvailableDateTimeFixture.면담가능시간_토미_2022_07_01_12_00;
import static com.woowacourse.ternoko.support.fixture.refactor.AvailableDateTimeFixture.면담가능시간생성요청정보_2022_07_01_10_TO_12;
import static com.woowacourse.ternoko.support.fixture.refactor.AvailableDateTimeFixture.면담가능시간생성요청정보_2022_07_02_10_TO_12;
import static com.woowacourse.ternoko.support.fixture.refactor.InterviewFixture.면담사전질문요청정보들;
import static com.woowacourse.ternoko.support.fixture.refactor.InterviewFixture.면담생성요청정보_준_2022_07_01_10_00;
import static com.woowacourse.ternoko.support.fixture.refactor.InterviewFixture.면담생성요청정보_토미_2022_07_01_10_00;
import static com.woowacourse.ternoko.support.fixture.refactor.MemberFixture.김록바;
import static com.woowacourse.ternoko.support.fixture.refactor.MemberFixture.김애쉬;
import static com.woowacourse.ternoko.support.fixture.refactor.MemberFixture.네오;
import static com.woowacourse.ternoko.support.fixture.refactor.MemberFixture.브리;
import static com.woowacourse.ternoko.support.fixture.refactor.MemberFixture.손앤지;
import static com.woowacourse.ternoko.support.fixture.refactor.MemberFixture.준;
import static com.woowacourse.ternoko.support.fixture.refactor.MemberFixture.토미;
import static com.woowacourse.ternoko.support.fixture.refactor.MemberFixture.허수달;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.junit.jupiter.api.Assertions.assertAll;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doNothing;
import static com.woowacourse.ternoko.common.exception.ExceptionType.*;
import static com.woowacourse.ternoko.core.domain.availabledatetime.AvailableDateTimeStatus.*;
import static com.woowacourse.ternoko.support.fixture.MemberFixture.*;
import static com.woowacourse.ternoko.support.fixture.refactor.AvailableDateTimeFixture.*;
import static com.woowacourse.ternoko.support.fixture.refactor.InterviewFixture.*;
import static com.woowacourse.ternoko.support.fixture.refactor.MemberFixture.*;
import static org.assertj.core.api.Assertions.*;
import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.ArgumentMatchers.*;
import static org.mockito.Mockito.*;

import java.time.LocalDateTime;
import java.util.List;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.stream.Collectors;

import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
import org.springframework.boot.test.mock.mockito.MockBean;

import com.woowacourse.ternoko.common.exception.AvailableDateTimeInvalidException;
import com.woowacourse.ternoko.common.exception.InterviewInvalidException;
Expand All @@ -48,20 +43,6 @@
import com.woowacourse.ternoko.support.alarm.SlackAlarm;
import com.woowacourse.ternoko.support.time.TimeMachine;
import com.woowacourse.ternoko.support.utils.DatabaseSupporter;
import java.time.LocalDateTime;
import java.util.List;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.stream.Collectors;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
import org.springframework.boot.test.mock.mockito.MockBean;

@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
class InterviewServiceTest extends DatabaseSupporter {
Expand Down Expand Up @@ -530,22 +511,31 @@ void cancelOnlyInterview() {
}

@Test
@Disabled
@DisplayName("같은 가능 시간에 여러개의 면담을 생성할 수 없다. (동시성테스트)")
void test_concurrent() {
@DisplayName("한 코치의 하나의 면담 가능 시간으로 동시에 여러개의 면담을 생성할 수 없다. - 동시성테스트")
void concurrentCreate() throws InterruptedException {
final int numberOfThreads = 2;
final ExecutorService service = Executors.newFixedThreadPool(numberOfThreads);
final CountDownLatch start = new CountDownLatch(numberOfThreads);
final CountDownLatch end = new CountDownLatch(numberOfThreads);
coachService.putAvailableDateTimesByCoachId(준.getId(), 면담가능시간생성요청정보_2022_07_01_10_TO_12);
ExecutorService service = Executors.newCachedThreadPool();

for (Long i = 5L; i <= 6L; i++) {
final Long finalI = i;
for (long i = 5L; i < 5 + numberOfThreads; i++) {
final long finalI = i;
service.execute(() -> {
try {
start.countDown();
start.await();
interviewService.create(finalI, 면담생성요청정보_준_2022_07_01_10_00);
} catch (Exception e) {
} catch (InterruptedException e) {
e.printStackTrace();
} finally {
end.countDown();
}
});
}
end.await();
final ScheduleResponse response = interviewService.findAllByCoach(준.getId(), 2022, 7);
assertThat(response.getCalendar()).hasSize(1);
}

private void 현재시간_설정(final int year, final int month, final int day, final int hour, final int minute) {
Expand Down