diff --git a/backend/.ebextensions/02-set-filebeat.config b/backend/.ebextensions/02-set-filebeat.config deleted file mode 100644 index 5a0648d88..000000000 --- a/backend/.ebextensions/02-set-filebeat.config +++ /dev/null @@ -1,48 +0,0 @@ -files: - "/tmp/make_filebeat_yml.sh": - mode: "000755" - content: | - #!/bin/bash - PASSWORD=$(sudo /opt/elasticbeanstalk/bin/get-config environment -k ELASTICSEARCH_PASSWORD) - HOST=$(sudo /opt/elasticbeanstalk/bin/get-config environment -k ELASTICSEARCH_HOST) - PORT=$(sudo /opt/elasticbeanstalk/bin/get-config environment -k ELASTICSEARCH_PORT) - USER=$(sudo /opt/elasticbeanstalk/bin/get-config environment -k ELASTICSEARCH_USER) - cat > /home/ec2-user/filebeat-7.14.1-linux-x86_64/filebeat.yml < groupMembers = groupMemberRepository.findAll(); Map> memberGroupsBygroupType = memberGroupRepository.findAll() .stream() - .collect(Collectors.groupingBy(MemberGroup::getGroupType)); + .collect(Collectors.groupingBy(MemberGroup::groupType)); final List recentStudylogs = findRecentStudylogs(LocalDateTime.now(), pageable.getPageSize()); @@ -111,7 +111,7 @@ public PopularStudylogsResponse findPopularStudylogs(Pageable pageable, Long mem List allPopularStudylogs = getSortedPopularStudyLogs(pageable); List groupedMembers = groupMemberRepository.findAll(); Map> memberGroupsBygroupType = memberGroupRepository.findAll() - .stream().collect(Collectors.groupingBy(MemberGroup::getGroupType)); + .stream().collect(Collectors.groupingBy(MemberGroup::groupType)); return PopularStudylogsResponse.of( studylogsResponse(allPopularStudylogs, pageable, memberId), diff --git a/backend/src/test/java/wooteco/prolog/member/domain/MemberGroupTest.java b/backend/src/test/java/wooteco/prolog/member/domain/MemberGroupTest.java index c9d0f5b6c..702640ade 100644 --- a/backend/src/test/java/wooteco/prolog/member/domain/MemberGroupTest.java +++ b/backend/src/test/java/wooteco/prolog/member/domain/MemberGroupTest.java @@ -4,6 +4,8 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; import org.junit.jupiter.api.Test; +import wooteco.prolog.common.exception.BadRequestCode; +import wooteco.prolog.common.exception.BadRequestException; class MemberGroupTest { @@ -13,18 +15,18 @@ class MemberGroupTest { @Test void getGroupType_이름이_그룹명을_포함하면_그룹을_반환한다() { - assertThat(ANDROID_GROUP.getGroupType()).isEqualTo(MemberGroupType.ANDROID); - assertThat(BACKEND_GROUP.getGroupType()).isEqualTo(MemberGroupType.BACKEND); - assertThat(FRONTEND_GROUP.getGroupType()).isEqualTo(MemberGroupType.FRONTEND); + assertThat(ANDROID_GROUP.groupType()).isEqualTo(MemberGroupType.ANDROID); + assertThat(BACKEND_GROUP.groupType()).isEqualTo(MemberGroupType.BACKEND); + assertThat(FRONTEND_GROUP.groupType()).isEqualTo(MemberGroupType.FRONTEND); } @Test void getGroupType_이름이_포함하는_그룹명이_없으면_예외가_발생한다() { MemberGroup memberGroup = new MemberGroup(null, "테스트", "test"); - assertThatThrownBy(memberGroup::getGroupType) - .isInstanceOf(IllegalArgumentException.class) - .hasMessage("그룹이 포함되는 타입이 없습니다. id=null"); + assertThatThrownBy(memberGroup::groupType) + .isInstanceOf(BadRequestException.class) + .hasMessage("해당 그룹의 타입을 결정할 수 없습니다."); } } diff --git a/backend/src/test/java/wooteco/prolog/roadmap/application/EssayAnswerServiceTest.java b/backend/src/test/java/wooteco/prolog/roadmap/application/EssayAnswerServiceTest.java index fbae450bf..1f4a12766 100644 --- a/backend/src/test/java/wooteco/prolog/roadmap/application/EssayAnswerServiceTest.java +++ b/backend/src/test/java/wooteco/prolog/roadmap/application/EssayAnswerServiceTest.java @@ -18,6 +18,7 @@ import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; +import wooteco.prolog.common.exception.BadRequestCode; import wooteco.prolog.common.exception.BadRequestException; import wooteco.prolog.member.application.MemberService; import wooteco.prolog.member.domain.Member; @@ -109,7 +110,7 @@ void deleteEssayAnswer_fail() { //when,then assertThatThrownBy(() -> essayAnswerService.deleteEssayAnswer(1L, 1L)) - .isInstanceOf(IllegalArgumentException.class); + .isInstanceOf(BadRequestException.class); } @DisplayName("deleteEssayAnswer 에서 answerId memberId 에 매핑되는 EssayAnswer 가 있다면 삭제한다") @@ -135,7 +136,7 @@ void getById_fail() { //when,then assertThatThrownBy(() -> essayAnswerService.getById(1L)) - .isInstanceOf(IllegalArgumentException.class); + .isInstanceOf(BadRequestException.class); } @DisplayName("getById 에서 answerId 에 해당하는 EssayAnswer 가있다면 반환해준다") diff --git a/backend/src/test/java/wooteco/prolog/roadmap/domain/EssayAnswerTest.java b/backend/src/test/java/wooteco/prolog/roadmap/domain/EssayAnswerTest.java index 04ffeeac2..00ff19f2d 100644 --- a/backend/src/test/java/wooteco/prolog/roadmap/domain/EssayAnswerTest.java +++ b/backend/src/test/java/wooteco/prolog/roadmap/domain/EssayAnswerTest.java @@ -6,9 +6,11 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; +import wooteco.prolog.common.exception.BadRequestCode; +import wooteco.prolog.common.exception.BadRequestException; import wooteco.prolog.member.domain.Member; -public class EssayAnswerTest { +class EssayAnswerTest { @ValueSource(strings = {"", " "}) @ParameterizedTest @@ -19,8 +21,8 @@ public class EssayAnswerTest { //expect assertThatThrownBy(() -> essayAnswer.update(answer, member)) - .isInstanceOf(IllegalArgumentException.class) - .hasMessage("답변 내용은 공백일 수 없습니다."); + .isInstanceOf(BadRequestException.class) + .hasMessage("답변은 공백일 수 없습니다."); } @Test @@ -32,7 +34,7 @@ public class EssayAnswerTest { //expect assertThatThrownBy(() -> essayAnswer.update("answer", another)) - .isInstanceOf(IllegalArgumentException.class) + .isInstanceOf(BadRequestException.class) .hasMessage("본인이 작성한 답변만 수정할 수 있습니다."); }