Skip to content

Commit

Permalink
fix: Template 패키지 컴파일 오류 해결
Browse files Browse the repository at this point in the history
  • Loading branch information
@donghoony
donghoony committed Jan 5, 2025
1 parent a32b9cf commit fd009a7
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 76 deletions.
48 changes: 19 additions & 29 deletions backend/src/test/java/reviewme/template/domain/SectionTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,54 +5,44 @@
import static reviewme.fixture.SectionFixture.항상_보이는_섹션;

import java.util.List;
import org.aspectj.util.Reflection;
import org.junit.jupiter.api.Test;
import org.junit.platform.commons.support.ReflectionSupport;
import org.springframework.test.util.ReflectionTestUtils;

class SectionTest {

@Test
void 조건_옵션을_선택하면_섹션이_보인다() {
// given
List<Long> questionIds = List.of(1L);
long optionId1 = 1L;
long optionId2 = 2L;
long optionId3 = 3L;
OptionItem optionItem = new OptionItem("content", 1, OptionType.CATEGORY);
ReflectionTestUtils.setField(optionItem, "id", 1L);
Question question = new Question(true, QuestionType.CHECKBOX, "question", null, 1);
Section section = new Section(VisibleType.CONDITIONAL, List.of(question), optionItem, "sectionName", "header", 1);

Section section = 조건부로_보이는_섹션(questionIds, optionId2);

// when
boolean actual = section.isVisibleBySelectedOptionIds(List.of(optionId1, optionId2, optionId3));

// then
assertThat(actual).isTrue();
// when, then
assertThat(section.isVisibleBySelectedOptionIds(List.of(1L, 2L, 3L))).isTrue();
}

@Test
void 조건_옵션을_선택하지_않으면_섹션이_보이지_않는다() {
// given
List<Long> questionIds = List.of(1L);
long optionId1 = 1L;
long optionId2 = 2L;
long optionId3 = 3L;

Section section = 조건부로_보이는_섹션(questionIds, optionId2);
OptionItem optionItem = new OptionItem("content", 1, OptionType.CATEGORY);
ReflectionTestUtils.setField(optionItem, "id", 1L);
Question question = new Question(true, QuestionType.CHECKBOX, "question", null, 1);
Section section = new Section(VisibleType.CONDITIONAL, List.of(question), optionItem, "sectionName", "header", 1);

// when
boolean actual = section.isVisibleBySelectedOptionIds(List.of(optionId1, optionId3));

// then
assertThat(actual).isFalse();
// when, then
assertThat(section.isVisibleBySelectedOptionIds(List.of(2L))).isFalse();
}

@Test
void 타입이_ALWAYS라면_조건과_상관없이_모두_보인다() {
// given
List<Long> questionIds = List.of(1L);
Section section = 항상_보이는_섹션(questionIds);

// when
boolean actual = section.isVisibleBySelectedOptionIds(List.of());
Question question = new Question(true, QuestionType.CHECKBOX, "question", null, 1);
Section section = 항상_보이는_섹션(List.of(question));

// then
assertThat(actual).isTrue();
// when, then
assertThat(section.isVisibleBySelectedOptionIds(List.of())).isTrue();
}
}
55 changes: 8 additions & 47 deletions backend/src/test/java/reviewme/template/service/mapper/TemplateMapperTest.java
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
package reviewme.template.service.mapper;

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 reviewme.fixture.OptionGroupFixture.선택지_그룹;
import static reviewme.fixture.QuestionFixture.서술형_필수_질문;
import static reviewme.fixture.QuestionFixture.선택형_필수_질문;
import static reviewme.fixture.ReviewGroupFixture.리뷰_그룹;
import static reviewme.fixture.SectionFixture.항상_보이는_섹션;

Expand All @@ -15,15 +12,12 @@
import reviewme.reviewgroup.domain.ReviewGroup;
import reviewme.reviewgroup.repository.ReviewGroupRepository;
import reviewme.support.ServiceTest;
import reviewme.template.domain.OptionGroup;
import reviewme.template.domain.Question;
import reviewme.template.domain.Section;
import reviewme.template.domain.Template;
import reviewme.template.repository.TemplateRepository;
import reviewme.template.service.dto.response.QuestionResponse;
import reviewme.template.service.dto.response.SectionResponse;
import reviewme.template.service.exception.MissingOptionItemsInOptionGroupException;
import reviewme.template.service.exception.SectionInTemplateNotFoundException;

@ServiceTest
class TemplateMapperTest {
Expand All @@ -40,17 +34,11 @@ class TemplateMapperTest {
@Test
void 리뷰_그룹과_템플릿으로_템플릿_응답을_매핑한다() {
// given
Question question1 = questionRepository.save(서술형_필수_질문());
Question question2 = questionRepository.save(서술형_필수_질문());

OptionGroup optionGroup = optionGroupRepository.save(선택지_그룹(question1.getId()));
optionItemRepository.save(선택지(optionGroup.getId()));

Section section1 = sectionRepository.save(항상_보이는_섹션(List.of(question1.getId())));
Section section2 = sectionRepository.save(항상_보이는_섹션(List.of(question2.getId())));

Template template = templateRepository.save(템플릿(List.of(section1.getId(), section2.getId())));

Question question1 = 서술형_필수_질문();
Question question2 = 서술형_필수_질문();
Section section1 = 항상_보이는_섹션(List.of(question1));
Section section2 = 항상_보이는_섹션(List.of(question2));
Template template = templateRepository.save(new Template(List.of(section1, section2)));
ReviewGroup reviewGroup = reviewGroupRepository.save(리뷰_그룹());

// when
Expand Down Expand Up @@ -109,9 +97,9 @@ class TemplateMapperTest {
@Test
void 옵션_그룹이_없는_질문의_경우_옵션_그룹을_제공하지_않는다() {
// given
Question question = questionRepository.save(서술형_필수_질문());
Section section = sectionRepository.save(항상_보이는_섹션(List.of(question.getId())));
Template template = templateRepository.save(템플릿(List.of(section.getId())));
Question question = 서술형_필수_질문();
Section section = 항상_보이는_섹션(List.of(question));
Template template = templateRepository.save(new Template(List.of(section)));

ReviewGroup reviewGroup = reviewGroupRepository.save(리뷰_그룹());

Expand All @@ -124,31 +112,4 @@ class TemplateMapperTest {
QuestionResponse questionResponse = sectionResponses.get(0).questions().get(0);
assertThat(questionResponse.optionGroup()).isNull();
}

@Test
void 템플릿_매핑_시_템플릿에_제공할_섹션이_없을_경우_예외가_발생한다() {
// given
Template template = templateRepository.save(템플릿(List.of(1L)));
ReviewGroup reviewGroup = reviewGroupRepository.save(리뷰_그룹());

// when, then
assertThatThrownBy(() -> templateMapper.mapSectionResponses(template.getId(), reviewGroup.getId()))
.isInstanceOf(SectionInTemplateNotFoundException.class);
}

@Test
void 템플릿_매핑_시_옵션_그룹에_해당하는_옵션_아이템이_없을_경우_예외가_발생한다() {
// given
Question question = questionRepository.save(선택형_필수_질문());
optionGroupRepository.save(선택지_그룹(question.getId()));

Section section = sectionRepository.save(항상_보이는_섹션(List.of(question.getId())));
Template template = templateRepository.save(템플릿(List.of(section.getId())));

ReviewGroup reviewGroup = reviewGroupRepository.save(리뷰_그룹());

// when, then
assertThatThrownBy(() -> templateMapper.mapSectionResponses(template.getId(), reviewGroup.getId()))
.isInstanceOf(MissingOptionItemsInOptionGroupException.class);
}
}

0 comments on commit fd009a7

Please sign in to comment.