diff --git a/src/main/java/depromeet/onepiece/feedback/domain/EvaluationDetail.java b/src/main/java/depromeet/onepiece/feedback/domain/EvaluationDetail.java new file mode 100644 index 0000000..e8deef1 --- /dev/null +++ b/src/main/java/depromeet/onepiece/feedback/domain/EvaluationDetail.java @@ -0,0 +1,17 @@ +package depromeet.onepiece.feedback.domain; + +import lombok.AccessLevel; +import lombok.Getter; +import lombok.NoArgsConstructor; +import org.springframework.data.mongodb.core.mapping.Field; + +@Getter +@NoArgsConstructor(access = AccessLevel.PROTECTED) +class EvaluationDetail { + + @Field("score") + private int score; + + @Field("review") + private String review; +} diff --git a/src/main/java/depromeet/onepiece/feedback/domain/EvaluationType.java b/src/main/java/depromeet/onepiece/feedback/domain/EvaluationType.java deleted file mode 100644 index 4092ded..0000000 --- a/src/main/java/depromeet/onepiece/feedback/domain/EvaluationType.java +++ /dev/null @@ -1,5 +0,0 @@ -package depromeet.onepiece.feedback.domain; - -public enum EvaluationType { - LOGICAL, -} diff --git a/src/main/java/depromeet/onepiece/feedback/domain/EvaluationItem.java b/src/main/java/depromeet/onepiece/feedback/domain/FeedbackContent.java similarity index 52% rename from src/main/java/depromeet/onepiece/feedback/domain/EvaluationItem.java rename to src/main/java/depromeet/onepiece/feedback/domain/FeedbackContent.java index 092ba83..d3d8669 100644 --- a/src/main/java/depromeet/onepiece/feedback/domain/EvaluationItem.java +++ b/src/main/java/depromeet/onepiece/feedback/domain/FeedbackContent.java @@ -7,14 +7,14 @@ @Getter @NoArgsConstructor(access = AccessLevel.PROTECTED) -public class EvaluationItem { +class FeedbackContent { - @Field("evaluation_type") - private EvaluationType evaluationType; + @Field("type") + private FeedbackType type; - @Field("evaluation_content") - private String evaluationContent; + @Field("before_edit") + private String beforeEdit; - @Field("evaluation_score") - private int evaluationScore; + @Field("after_edit") + private String afterEdit; } diff --git a/src/main/java/depromeet/onepiece/feedback/domain/FeedbackPerPage.java b/src/main/java/depromeet/onepiece/feedback/domain/FeedbackPerPage.java index e04ae2c..ba77762 100644 --- a/src/main/java/depromeet/onepiece/feedback/domain/FeedbackPerPage.java +++ b/src/main/java/depromeet/onepiece/feedback/domain/FeedbackPerPage.java @@ -1,5 +1,6 @@ package depromeet.onepiece.feedback.domain; +import java.util.List; import lombok.AccessLevel; import lombok.Getter; import lombok.NoArgsConstructor; @@ -10,7 +11,9 @@ @NoArgsConstructor(access = AccessLevel.PROTECTED) public class FeedbackPerPage { - // 페이지 별 피드백인데 이거 필드를 여러개 지정해서 하는것보다 하나의 큰 텍스트로 요구하는게 더 쉬울듯 - @Field("content") - private String content; + @Field("page_number") + private String pageNumber; + + @Field("contents") + private List contents; } diff --git a/src/main/java/depromeet/onepiece/feedback/domain/FeedbackPerProject.java b/src/main/java/depromeet/onepiece/feedback/domain/FeedbackPerProject.java deleted file mode 100644 index 26322fa..0000000 --- a/src/main/java/depromeet/onepiece/feedback/domain/FeedbackPerProject.java +++ /dev/null @@ -1,23 +0,0 @@ -package depromeet.onepiece.feedback.domain; - -import lombok.AccessLevel; -import lombok.Getter; -import lombok.NoArgsConstructor; -import org.springframework.data.mongodb.core.mapping.Field; - -@Getter -@NoArgsConstructor(access = AccessLevel.PROTECTED) -public class FeedbackPerProject { - - // 전체 프로젝트 평가 - @Field("project_evaluation") - private String projectEvaluation; - - // 이런 점이 아쉬워요 - @Field("project_cons") - private String projectCons; - - // 이런 점이 좋아요 - @Field("project_pros") - private String projectPros; -} diff --git a/src/main/java/depromeet/onepiece/feedback/domain/FeedbackType.java b/src/main/java/depromeet/onepiece/feedback/domain/FeedbackType.java new file mode 100644 index 0000000..f969ecf --- /dev/null +++ b/src/main/java/depromeet/onepiece/feedback/domain/FeedbackType.java @@ -0,0 +1,16 @@ +package depromeet.onepiece.feedback.domain; + +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +@Getter +@RequiredArgsConstructor +public enum FeedbackType { + TRANSLATION_OR_AWKWARD("번역체/어색한 표현"), + LENGTH_OR_READABILITY("문장이 길거나 가독성이 떨어지는 표현 수정"), + READABILITY_IMPROVEMENT("가독성 개선"), + LOGICAL_LEAP("논리적 비약"), + REDUNDANCY_OR_CLARITY("불필요한 반복 및 의미 명확화"); + + private final String description; +} diff --git a/src/main/java/depromeet/onepiece/feedback/domain/OverallEvaluation.java b/src/main/java/depromeet/onepiece/feedback/domain/OverallEvaluation.java index 1d47bd6..9e54cc5 100644 --- a/src/main/java/depromeet/onepiece/feedback/domain/OverallEvaluation.java +++ b/src/main/java/depromeet/onepiece/feedback/domain/OverallEvaluation.java @@ -1,6 +1,5 @@ package depromeet.onepiece.feedback.domain; -import java.util.List; import lombok.AccessLevel; import lombok.Getter; import lombok.NoArgsConstructor; @@ -10,18 +9,18 @@ @NoArgsConstructor(access = AccessLevel.PROTECTED) public class OverallEvaluation { - @Field("pros") - private List pros; + @Field("summary") + private String summary; - @Field("cons") - private List cons; + @Field("job_fit") + private EvaluationDetail jobFit; - @Field("one_line_comment") - private String oneLineComment; + @Field("logical_thinking") + private EvaluationDetail logicalThinking; - @Field("grade") - private String grade; + @Field("writing_clarity") + private EvaluationDetail writingClarity; - @Field("evaluation_list") - private List evaluationItemList; + @Field("layout_readability") + private EvaluationDetail layoutReadability; } diff --git a/src/main/java/depromeet/onepiece/feedback/domain/ProjectEvaluation.java b/src/main/java/depromeet/onepiece/feedback/domain/ProjectEvaluation.java new file mode 100644 index 0000000..64e58d3 --- /dev/null +++ b/src/main/java/depromeet/onepiece/feedback/domain/ProjectEvaluation.java @@ -0,0 +1,33 @@ +package depromeet.onepiece.feedback.domain; + +import java.util.List; +import lombok.AccessLevel; +import lombok.Getter; +import lombok.NoArgsConstructor; +import org.springframework.data.mongodb.core.mapping.Field; + +@Getter +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class ProjectEvaluation { + + @Field("project_name") + private String projectName; + + @Field("process") + private List process; + + @Field("process_review") + private String processReview; + + @Field("strengths") + private String strengths; + + @Field("areas_for_improvement") + private String areasForImprovement; + + @Field("feedback_per_page") + private List feedbackPerPage; + + @Field("project_summary") + private String projectSummary; +}