From 0bdc93053f4db2dfef3916f11a420c84f6130b15 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 17 Dec 2024 11:16:40 +0000 Subject: [PATCH 1/2] Create draft PR for #957 From ea2380e6234251c3faeec894bd80ee7b8258061c Mon Sep 17 00:00:00 2001 From: HyungHoKim00 Date: Tue, 17 Dec 2024 20:58:14 +0900 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=ED=8F=89=EA=B0=80=EC=97=90=20?= =?UTF-8?q?=ED=8F=89=EA=B0=80=EC=9E=90=20=ED=95=84=EB=93=9C=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=20=EB=B0=8F=20=EC=83=9D=EC=84=B1,=20=EC=88=98?= =?UTF-8?q?=EC=A0=95,=20=EC=A1=B0=ED=9A=8C=20API=EC=97=90=20=ED=8F=89?= =?UTF-8?q?=EA=B0=80=EC=9E=90=20=ED=95=84=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/cruru/DataLoader.java | 36 +++++++++---------- .../request/EvaluationCreateRequest.java | 3 ++ .../request/EvaluationUpdateRequest.java | 3 ++ .../response/EvaluationResponse.java | 2 ++ .../cruru/applicant/domain/Evaluation.java | 5 ++- .../applicant/facade/EvaluationFacade.java | 1 + .../applicant/service/EvaluationService.java | 15 ++++++-- .../V2_2__add_evaluation_evaluator.sql | 2 ++ .../controller/EvaluationControllerTest.java | 29 +++++++++++---- .../applicant/domain/EvaluationTest.java | 3 +- .../repository/EvaluationRepositoryTest.java | 2 +- .../facade/EvaluationFacadeTest.java | 6 +++- .../service/EvaluationServiceTest.java | 13 +++++-- .../cruru/util/fixture/EvaluationFixture.java | 8 ++--- 14 files changed, 90 insertions(+), 38 deletions(-) create mode 100644 backend/src/main/resources/db/migration/V2_2__add_evaluation_evaluator.sql diff --git a/backend/src/main/java/com/cruru/DataLoader.java b/backend/src/main/java/com/cruru/DataLoader.java index 8afc36496..b772b2309 100644 --- a/backend/src/main/java/com/cruru/DataLoader.java +++ b/backend/src/main/java/com/cruru/DataLoader.java @@ -81,8 +81,8 @@ private void runDataLoader() { LocalDateTime endDate = LocalDateTime.of(2054, 10, 16, 10, 0, 0); dashboardRepository.save(dashboard); String description = """ -

2025 신입생 (7기) 선발 일정


  1. 서류접수: 2024년 10월 6일(금) 오후 3시 ~ 10월 16일(월) 오전 10시
  2. 프리코스: 2024년 10월 19일(목) ~ 11월 15일(수)
  3. 1차 합격자 발표: 2024년 12월 11일(월) 오후 3시, 개별 E-mail 통보
  4. 최종 코딩 테스트: 2024년 12월 16일(토)
  5. 최종 합격자 발표: 2024년 12월 27일(수) 오후 3시, 개별 E-mail 통보


2025 신입생 (7기) 교육 기간


  1. 2025년 2월 ~ 11월 (약 10개월)
- """; +

2025 신입생 (7기) 선발 일정


  1. 서류접수: 2024년 10월 6일(금) 오후 3시 ~ 10월 16일(월) 오전 10시
  2. 프리코스: 2024년 10월 19일(목) ~ 11월 15일(수)
  3. 1차 합격자 발표: 2024년 12월 11일(월) 오후 3시, 개별 E-mail 통보
  4. 최종 코딩 테스트: 2024년 12월 16일(토)
  5. 최종 합격자 발표: 2024년 12월 27일(수) 오후 3시, 개별 E-mail 통보


2025 신입생 (7기) 교육 기간


  1. 2025년 2월 ~ 11월 (약 10개월)
+ """; ApplyForm applyForm = new ApplyForm( "우아한테크코스 2025 백엔드 신입생 모집 ", description, @@ -335,22 +335,22 @@ private void runDataLoader() { answerRepository.saveAll(answers); List evaluations = List.of( - new Evaluation(5, "우수한 실력", firstProcess, lurgi), - new Evaluation(4, "좋은 잠재력", codingTest, lurgi), - new Evaluation(3, "노력 필요", firstProcess, dobby), - new Evaluation(5, "매우 긍정적", codingTest, dobby), - new Evaluation(3, "성장 가능성", firstProcess, arrr), - new Evaluation(4, "기본기 탄탄", codingTest, arrr), - new Evaluation(4, "뛰어난 이해력", firstProcess, chocochip), - new Evaluation(5, "매우 뛰어남", codingTest, chocochip), - new Evaluation(2, "열정적", firstProcess, myungoh), - new Evaluation(1, "개선 필요", codingTest, myungoh), - new Evaluation(5, "빠른 학습 능력", firstProcess, rush), - new Evaluation(1, "-> 불합격", codingTest, rush), - new Evaluation(4, "꼼꼼함", firstProcess, nyangin), - new Evaluation(4, "전과 동일", codingTest, nyangin), - new Evaluation(3, "예술적 감각", firstProcess, redpanda), - new Evaluation(4, "좋은 평가", codingTest, redpanda) + new Evaluation("김도엽", 5, "우수한 실력", firstProcess, lurgi), + new Evaluation("권기호", 4, "좋은 잠재력", codingTest, lurgi), + new Evaluation("최가희", 3, "노력 필요", firstProcess, dobby), + new Evaluation("박정우", 5, "매우 긍정적", codingTest, dobby), + new Evaluation("김형호", 3, "성장 가능성", firstProcess, arrr), + new Evaluation("홍성진", 4, "기본기 탄탄", codingTest, arrr), + new Evaluation("김다은", 4, "뛰어난 이해력", firstProcess, chocochip), + new Evaluation("이태훈", 5, "매우 뛰어남", codingTest, chocochip), + new Evaluation("김도엽", 2, "열정적", firstProcess, myungoh), + new Evaluation("권기호", 1, "개선 필요", codingTest, myungoh), + new Evaluation("최가희", 5, "빠른 학습 능력", firstProcess, rush), + new Evaluation("박정우", 1, "-> 불합격", codingTest, rush), + new Evaluation("김형호", 4, "꼼꼼함", firstProcess, nyangin), + new Evaluation("홍성진", 4, "전과 동일", codingTest, nyangin), + new Evaluation("김다은", 3, "예술적 감각", firstProcess, redpanda), + new Evaluation("이태훈", 4, "좋은 평가", codingTest, redpanda) ); evaluationRepository.saveAll(evaluations); } diff --git a/backend/src/main/java/com/cruru/applicant/controller/request/EvaluationCreateRequest.java b/backend/src/main/java/com/cruru/applicant/controller/request/EvaluationCreateRequest.java index eae389fb8..b8321da9c 100644 --- a/backend/src/main/java/com/cruru/applicant/controller/request/EvaluationCreateRequest.java +++ b/backend/src/main/java/com/cruru/applicant/controller/request/EvaluationCreateRequest.java @@ -4,6 +4,9 @@ import jakarta.validation.constraints.Positive; public record EvaluationCreateRequest( + @NotNull(message = "평가자 이름은 필수 값입니다.") + String evaluator, + @NotNull(message = "평가 점수는 필수 값입니다.") @Positive(message = "평가 점수는 1 이상 5 이하의 정수입니다.") Integer score, diff --git a/backend/src/main/java/com/cruru/applicant/controller/request/EvaluationUpdateRequest.java b/backend/src/main/java/com/cruru/applicant/controller/request/EvaluationUpdateRequest.java index bdc7d9531..40c758c04 100644 --- a/backend/src/main/java/com/cruru/applicant/controller/request/EvaluationUpdateRequest.java +++ b/backend/src/main/java/com/cruru/applicant/controller/request/EvaluationUpdateRequest.java @@ -4,6 +4,9 @@ import jakarta.validation.constraints.Positive; public record EvaluationUpdateRequest( + @NotNull(message = "평가자 이름은 필수 값입니다.") + String evaluator, + @NotNull(message = "평가 점수는 필수 값입니다.") @Positive(message = "평가 점수는 1 이상 5 이하의 정수입니다.") Integer score, diff --git a/backend/src/main/java/com/cruru/applicant/controller/response/EvaluationResponse.java b/backend/src/main/java/com/cruru/applicant/controller/response/EvaluationResponse.java index 296aac660..96005e0c7 100644 --- a/backend/src/main/java/com/cruru/applicant/controller/response/EvaluationResponse.java +++ b/backend/src/main/java/com/cruru/applicant/controller/response/EvaluationResponse.java @@ -7,6 +7,8 @@ public record EvaluationResponse( long evaluationId, + String evaluator, + int score, String content, diff --git a/backend/src/main/java/com/cruru/applicant/domain/Evaluation.java b/backend/src/main/java/com/cruru/applicant/domain/Evaluation.java index bad2c0867..a8860b7ca 100644 --- a/backend/src/main/java/com/cruru/applicant/domain/Evaluation.java +++ b/backend/src/main/java/com/cruru/applicant/domain/Evaluation.java @@ -33,6 +33,8 @@ public class Evaluation extends BaseEntity implements SecureResource { @Column(name = "evaluation_id") private Long id; + private String evaluator; + private Integer score; private String content; @@ -45,8 +47,9 @@ public class Evaluation extends BaseEntity implements SecureResource { @JoinColumn(name = "applicant_id") private Applicant applicant; - public Evaluation(int score, String content, Process process, Applicant applicant) { + public Evaluation(String evaluator, int score, String content, Process process, Applicant applicant) { validateScore(score); + this.evaluator = evaluator; this.score = score; this.content = content; this.process = process; diff --git a/backend/src/main/java/com/cruru/applicant/facade/EvaluationFacade.java b/backend/src/main/java/com/cruru/applicant/facade/EvaluationFacade.java index 0a48bc2bb..bfe812c49 100644 --- a/backend/src/main/java/com/cruru/applicant/facade/EvaluationFacade.java +++ b/backend/src/main/java/com/cruru/applicant/facade/EvaluationFacade.java @@ -50,6 +50,7 @@ private EvaluationResponses toEvaluationResponses(List evaluations) private EvaluationResponse toEvaluationResponse(Evaluation evaluation) { return new EvaluationResponse( evaluation.getId(), + evaluation.getEvaluator(), evaluation.getScore(), evaluation.getContent(), evaluation.getCreatedDate() diff --git a/backend/src/main/java/com/cruru/applicant/service/EvaluationService.java b/backend/src/main/java/com/cruru/applicant/service/EvaluationService.java index 42079a8fa..b135ebc64 100644 --- a/backend/src/main/java/com/cruru/applicant/service/EvaluationService.java +++ b/backend/src/main/java/com/cruru/applicant/service/EvaluationService.java @@ -26,7 +26,13 @@ public Evaluation findById(Long evaluationId) { @Transactional public void create(EvaluationCreateRequest request, Process process, Applicant applicant) { - evaluationRepository.save(new Evaluation(request.score(), request.content(), process, applicant)); + evaluationRepository.save(new Evaluation( + request.evaluator(), + request.score(), + request.content(), + process, + applicant + )); } public List findAllByProcessAndApplicant(Process process, Applicant applicant) { @@ -39,6 +45,7 @@ public void update(EvaluationUpdateRequest request, Evaluation evaluation) { evaluationRepository.save( new Evaluation( evaluation.getId(), + request.evaluator(), request.score(), request.content(), evaluation.getProcess(), @@ -49,7 +56,11 @@ public void update(EvaluationUpdateRequest request, Evaluation evaluation) { } private boolean changeExists(EvaluationUpdateRequest request, Evaluation evaluation) { - return !(evaluation.getContent().equals(request.content()) && evaluation.getScore().equals(request.score())); + return !( + evaluation.getContent().equals(request.content()) + && evaluation.getScore().equals(request.score()) + && evaluation.getEvaluator().equals(request.evaluator()) + ); } @Transactional diff --git a/backend/src/main/resources/db/migration/V2_2__add_evaluation_evaluator.sql b/backend/src/main/resources/db/migration/V2_2__add_evaluation_evaluator.sql new file mode 100644 index 000000000..f0a0d0a15 --- /dev/null +++ b/backend/src/main/resources/db/migration/V2_2__add_evaluation_evaluator.sql @@ -0,0 +1,2 @@ +ALTER TABLE evaluation + ADD evaluator VARCHAR(255); diff --git a/backend/src/test/java/com/cruru/applicant/controller/EvaluationControllerTest.java b/backend/src/test/java/com/cruru/applicant/controller/EvaluationControllerTest.java index c85aeef40..8ebcddef4 100644 --- a/backend/src/test/java/com/cruru/applicant/controller/EvaluationControllerTest.java +++ b/backend/src/test/java/com/cruru/applicant/controller/EvaluationControllerTest.java @@ -38,6 +38,7 @@ class EvaluationControllerTest extends ControllerTest { private static final FieldDescriptor[] EVALUATION_FIELD_DESCRIPTORS = { fieldWithPath("evaluationId").description("평가의 id"), + fieldWithPath("evaluator").description("평가자 이름"), fieldWithPath("score").description("평가 점수"), fieldWithPath("content").description("평가 내용"), fieldWithPath("createdDate").description("평가 생성 날짜") @@ -70,10 +71,11 @@ void setUp() { @Test void create() { // given + String evaluator = "김도엽"; int score = 4; String content = "서류가 인상적입니다."; String url = String.format("/v1/evaluations?processId=%d&applicantId=%d", process.getId(), applicant.getId()); - EvaluationCreateRequest request = new EvaluationCreateRequest(score, content); + EvaluationCreateRequest request = new EvaluationCreateRequest(evaluator, score, content); // when&then RestAssured.given(spec).log().all() @@ -88,6 +90,7 @@ void create() { parameterWithName("applicantId").description("지원자의 id") ), requestFields( + fieldWithPath("evaluator").description("평가자 이름"), fieldWithPath("score").description("평가 점수"), fieldWithPath("content").description("평가 주관식 내용") ) @@ -100,6 +103,7 @@ void create() { @Test void create_applicantNotFound() { // given + String evaluator = "김도엽"; int score = 4; String content = "서류가 인상적입니다."; long invalidApplicantId = -1; @@ -108,7 +112,7 @@ void create_applicantNotFound() { process.getId(), invalidApplicantId ); - EvaluationCreateRequest request = new EvaluationCreateRequest(score, content); + EvaluationCreateRequest request = new EvaluationCreateRequest(evaluator, score, content); // when&then RestAssured.given(spec).log().all() @@ -123,6 +127,7 @@ void create_applicantNotFound() { parameterWithName("applicantId").description("존재하지 않는 지원자의 id") ), requestFields( + fieldWithPath("evaluator").description("평가자 이름"), fieldWithPath("score").description("평가 점수"), fieldWithPath("content").description("평가 주관식 내용") ) @@ -135,6 +140,7 @@ void create_applicantNotFound() { @Test void create_processNotFound() { // given + String evaluator = "김도엽"; int score = 4; String content = "서류가 인상적입니다."; Long invalidProcessId = -1L; @@ -143,7 +149,7 @@ void create_processNotFound() { invalidProcessId, applicant.getId() ); - EvaluationCreateRequest request = new EvaluationCreateRequest(score, content); + EvaluationCreateRequest request = new EvaluationCreateRequest(evaluator, score, content); // when&then RestAssured.given(spec).log().all() @@ -158,6 +164,7 @@ void create_processNotFound() { parameterWithName("applicantId").description("지원자의 id") ), requestFields( + fieldWithPath("evaluator").description("평가자 이름"), fieldWithPath("score").description("평가 점수"), fieldWithPath("content").description("평가 주관식 내용") ) @@ -170,6 +177,7 @@ void create_processNotFound() { @Test void create_invalidScore() { // given + String evaluator = "김도엽"; int invalidScore = -4; String content = "서류가 인상적입니다."; String url = String.format( @@ -177,7 +185,7 @@ void create_invalidScore() { process.getId(), applicant.getId() ); - EvaluationCreateRequest request = new EvaluationCreateRequest(invalidScore, content); + EvaluationCreateRequest request = new EvaluationCreateRequest(evaluator, invalidScore, content); // when&then RestAssured.given(spec).log().all() @@ -192,6 +200,7 @@ void create_invalidScore() { parameterWithName("applicantId").description("지원자의 id") ), requestFields( + fieldWithPath("evaluator").description("평가자 이름"), fieldWithPath("score").description("적절하지 않은 평가 점수"), fieldWithPath("content").description("평가 주관식 내용") ) @@ -284,10 +293,11 @@ void read_processNotFound() { @Test void update() { // given + String evaluator = "김형호"; Evaluation evaluation = evaluationRepository.save(EvaluationFixture.fivePoints(process, applicant)); int score = 2; String content = "맞춤법이 틀렸습니다."; - EvaluationUpdateRequest request = new EvaluationUpdateRequest(score, content); + EvaluationUpdateRequest request = new EvaluationUpdateRequest(evaluator, score, content); // when&then RestAssured.given(spec).log().all() @@ -299,6 +309,7 @@ void update() { requestCookies(cookieWithName("accessToken").description("사용자 토큰")), pathParameters(parameterWithName("evaluationId").description("평가의 id")), requestFields( + fieldWithPath("evaluator").description("평가자 이름"), fieldWithPath("score").description("평가 점수"), fieldWithPath("content").description("평가 주관식 내용") ) @@ -311,9 +322,10 @@ void update() { @Test void update_evaluationNotFound() { // given + String evaluator = "김형호"; int score = 2; String content = "맞춤법이 틀렸습니다."; - EvaluationUpdateRequest request = new EvaluationUpdateRequest(score, content); + EvaluationUpdateRequest request = new EvaluationUpdateRequest(evaluator, score, content); // when&then RestAssured.given(spec).log().all() @@ -325,6 +337,7 @@ void update_evaluationNotFound() { requestCookies(cookieWithName("accessToken").description("사용자 토큰")), pathParameters(parameterWithName("evaluationId").description("존재하지 않는 평가의 id")), requestFields( + fieldWithPath("evaluator").description("평가자 이름"), fieldWithPath("score").description("평가 점수"), fieldWithPath("content").description("평가 주관식 내용") ) @@ -337,10 +350,11 @@ void update_evaluationNotFound() { @Test void update_invalidScore() { // given + String evaluator = "김형호"; Evaluation evaluation = evaluationRepository.save(EvaluationFixture.fivePoints()); int score = -1; String content = "맞춤법이 틀렸습니다."; - EvaluationUpdateRequest request = new EvaluationUpdateRequest(score, content); + EvaluationUpdateRequest request = new EvaluationUpdateRequest(evaluator, score, content); // when&then RestAssured.given(spec).log().all() @@ -352,6 +366,7 @@ void update_invalidScore() { requestCookies(cookieWithName("accessToken").description("사용자 토큰")), pathParameters(parameterWithName("evaluationId").description("평가의 id")), requestFields( + fieldWithPath("evaluator").description("평가자 이름"), fieldWithPath("score").description("적절하지 않은 평가 점수"), fieldWithPath("content").description("평가 주관식 내용") ) diff --git a/backend/src/test/java/com/cruru/applicant/domain/EvaluationTest.java b/backend/src/test/java/com/cruru/applicant/domain/EvaluationTest.java index 18f6f3f25..62be6273a 100644 --- a/backend/src/test/java/com/cruru/applicant/domain/EvaluationTest.java +++ b/backend/src/test/java/com/cruru/applicant/domain/EvaluationTest.java @@ -15,10 +15,11 @@ class EvaluationTest { @ParameterizedTest void invalidEvaluationScore(int invalidScore) { // given + String evaluator = "김도엽"; String content = "포트폴리오가 인상적입니다."; // when&then - assertThatThrownBy(() -> new Evaluation(invalidScore, content, null, null)) + assertThatThrownBy(() -> new Evaluation(evaluator, invalidScore, content, null, null)) .isInstanceOf(EvaluationScoreException.class); } } diff --git a/backend/src/test/java/com/cruru/applicant/domain/repository/EvaluationRepositoryTest.java b/backend/src/test/java/com/cruru/applicant/domain/repository/EvaluationRepositoryTest.java index 6c72879ba..73c8ed741 100644 --- a/backend/src/test/java/com/cruru/applicant/domain/repository/EvaluationRepositoryTest.java +++ b/backend/src/test/java/com/cruru/applicant/domain/repository/EvaluationRepositoryTest.java @@ -36,7 +36,7 @@ void sameIdUpdate() { Evaluation saved = evaluationRepository.save(evaluation); //when - Evaluation updatedEvaluation = new Evaluation(evaluation.getId(), 5, "포트폴리오가 인상 깊었습니다.", null, null); + Evaluation updatedEvaluation = new Evaluation(evaluation.getId(), "김도엽", 5, "포트폴리오가 인상 깊었습니다.", null, null); evaluationRepository.save(updatedEvaluation); //then diff --git a/backend/src/test/java/com/cruru/applicant/facade/EvaluationFacadeTest.java b/backend/src/test/java/com/cruru/applicant/facade/EvaluationFacadeTest.java index b9352210e..9679eb461 100644 --- a/backend/src/test/java/com/cruru/applicant/facade/EvaluationFacadeTest.java +++ b/backend/src/test/java/com/cruru/applicant/facade/EvaluationFacadeTest.java @@ -51,9 +51,10 @@ void setUp() { void create() { // given Evaluation evaluation = EvaluationFixture.fivePoints(); + String evaluator = evaluation.getEvaluator(); Integer score = evaluation.getScore(); String content = evaluation.getContent(); - EvaluationCreateRequest request = new EvaluationCreateRequest(score, content); + EvaluationCreateRequest request = new EvaluationCreateRequest(evaluator, score, content); // when evaluationFacade.create(request, process.getId(), applicant.getId()); @@ -63,6 +64,7 @@ void create() { Evaluation actualEvaluation = evaluations.get(0); assertAll( () -> assertThat(evaluations).hasSize(1), + () -> assertThat(actualEvaluation.getEvaluator()).isEqualTo(evaluator), () -> assertThat(actualEvaluation.getScore()).isEqualTo(score), () -> assertThat(actualEvaluation.getContent()).isEqualTo(content) ); @@ -92,11 +94,13 @@ void readEvaluationsOfApplicantInProcess() { () -> assertThat(evaluationResponses).hasSize(2), () -> assertThat(actualEvaluation1.evaluationId()).isEqualTo(savedEvaluation1.getId()), + () -> assertThat(actualEvaluation1.evaluator()).isEqualTo(savedEvaluation1.getEvaluator()), () -> assertThat(actualEvaluation1.content()).isEqualTo(savedEvaluation1.getContent()), () -> assertThat(actualEvaluation1.score()).isEqualTo(savedEvaluation1.getScore()), () -> assertThat(actualEvaluation1.createdDate()).isEqualTo(savedEvaluation1.getCreatedDate()), () -> assertThat(actualEvaluation2.evaluationId()).isEqualTo(savedEvaluation2.getId()), + () -> assertThat(actualEvaluation2.evaluator()).isEqualTo(savedEvaluation2.getEvaluator()), () -> assertThat(actualEvaluation2.content()).isEqualTo(savedEvaluation2.getContent()), () -> assertThat(actualEvaluation2.score()).isEqualTo(savedEvaluation2.getScore()), () -> assertThat(actualEvaluation2.createdDate()).isEqualTo(savedEvaluation2.getCreatedDate()) diff --git a/backend/src/test/java/com/cruru/applicant/service/EvaluationServiceTest.java b/backend/src/test/java/com/cruru/applicant/service/EvaluationServiceTest.java index 8258894ce..e93a17a4d 100644 --- a/backend/src/test/java/com/cruru/applicant/service/EvaluationServiceTest.java +++ b/backend/src/test/java/com/cruru/applicant/service/EvaluationServiceTest.java @@ -52,11 +52,12 @@ void setUp() { @Test void create() { // given + String evaluator = "김도엽"; int score = 4; String content = "서류가 인상적입니다."; // when - EvaluationCreateRequest request = new EvaluationCreateRequest(score, content); + EvaluationCreateRequest request = new EvaluationCreateRequest(evaluator, score, content); evaluationService.create(request, process, applicant); // then @@ -64,6 +65,7 @@ void create() { Evaluation evaluation = evaluations.get(0); assertAll( () -> assertThat(evaluations).hasSize(1), + () -> assertThat(evaluation.getEvaluator()).isEqualTo(evaluator), () -> assertThat(evaluation.getScore()).isEqualTo(score), () -> assertThat(evaluation.getContent()).isEqualTo(content) ); @@ -73,9 +75,11 @@ void create() { @Test void findAllByProcessAndApplicant() { // given + String evaluator = "김도엽"; int score = 1; String content = "인재상과 맞지 않습니다."; - Evaluation evaluation = evaluationRepository.save(new Evaluation(score, content, process, applicant)); + Evaluation evaluation = evaluationRepository.save( + new Evaluation(evaluator, score, content, process, applicant)); // when List savedEvaluations = evaluationService.findAllByProcessAndApplicant(process, applicant); @@ -85,6 +89,7 @@ void findAllByProcessAndApplicant() { assertAll( () -> assertThat(savedEvaluations).hasSize(1), () -> assertThat(actualEvaluation.getId()).isEqualTo(evaluation.getId()), + () -> assertThat(actualEvaluation.getEvaluator()).isEqualTo(evaluator), () -> assertThat(actualEvaluation.getScore()).isEqualTo(score), () -> assertThat(actualEvaluation.getContent()).isEqualTo(content) ); @@ -95,9 +100,10 @@ void findAllByProcessAndApplicant() { void update() { // given Evaluation evaluation = evaluationRepository.save(EvaluationFixture.fivePoints()); + String evaluator = "김형호"; int score = 1; String content = "수정된 평가입니다."; - EvaluationUpdateRequest request = new EvaluationUpdateRequest(score, content); + EvaluationUpdateRequest request = new EvaluationUpdateRequest(evaluator, score, content); // when evaluationService.update(request, evaluation); @@ -107,6 +113,7 @@ void update() { assertAll( () -> assertThat(updatedEvaluation).isPresent(), + () -> assertThat(updatedEvaluation.get().getEvaluator()).isEqualTo(evaluator), () -> assertThat(updatedEvaluation.get().getScore()).isEqualTo(score), () -> assertThat(updatedEvaluation.get().getContent()).isEqualTo(content) ); diff --git a/backend/src/test/java/com/cruru/util/fixture/EvaluationFixture.java b/backend/src/test/java/com/cruru/util/fixture/EvaluationFixture.java index d642d6ae3..93548d9b8 100644 --- a/backend/src/test/java/com/cruru/util/fixture/EvaluationFixture.java +++ b/backend/src/test/java/com/cruru/util/fixture/EvaluationFixture.java @@ -7,18 +7,18 @@ public class EvaluationFixture { public static Evaluation fivePoints() { - return new Evaluation(5, "서류가 인상 깊었습니다.", null, null); + return new Evaluation("김도엽", 5, "서류가 인상 깊었습니다.", null, null); } public static Evaluation fivePoints(Process process, Applicant applicant) { - return new Evaluation(5, "서류가 인상 깊었습니다.", process, applicant); + return new Evaluation("김도엽", 5, "서류가 인상 깊었습니다.", process, applicant); } public static Evaluation fourPoints() { - return new Evaluation(4, "포트폴리오가 인상 깊었습니다.", null, null); + return new Evaluation("김도엽", 4, "포트폴리오가 인상 깊었습니다.", null, null); } public static Evaluation fourPoints(Process process, Applicant applicant) { - return new Evaluation(4, "포트폴리오가 인상 깊었습니다.", process, applicant); + return new Evaluation("김도엽", 4, "포트폴리오가 인상 깊었습니다.", process, applicant); } }