Merge pull request #80 from GD-YD/hotfix/university-name-tag-validation

Author: Woojun-Yoon

gd-yd-api/src/main/java/com/gdyd/gdydapi/request/mentoring/CreateHighSchoolStudentQuestionRequest.java

@@ -36,6 +36,9 @@ public static HighSchoolStudentQuestion toHighSchoolStudentQuestion(
             CreateHighSchoolStudentQuestionRequest request,
             HighSchoolStudent highSchoolStudent
     ) {
+        String universityNameTag = request.universityNameTag() == null || request.universityNameTag().isBlank()
+                ? "DEFAULT"
+                : request.universityNameTag();
         UniversityMajorCategory universityMajorTag = request.universityMajorTag() == null
                 ? UniversityMajorCategory.DEFAULT
                 : request.universityMajorTag();
@@ -47,7 +50,7 @@ public static HighSchoolStudentQuestion toHighSchoolStudentQuestion(
                 .title(request.title())
                 .question(request.question())
                 .highSchoolStudent(highSchoolStudent)
-                .universityNameTag(request.universityNameTag())
+                .universityNameTag(universityNameTag)
                 .universityGradeTag(universityGradeTag)
                 .universityMajorTag(universityMajorTag)
                 .build();

gd-yd-api/src/main/java/com/gdyd/gdydapi/response/mentoring/CreateHighSchoolStudentQuestionResponse.java

@@ -14,13 +14,25 @@ public record CreateHighSchoolStudentQuestionResponse(
         String title,
 
         @Schema(description = "고등학생 질문 내용", example = "12344로 해당 대학에 입학할 수 있을까요?")
-        String question
+        String question,
+
+        @Schema(description = "질문글에서 답변을 원하는 대학생의 학교명")
+        String universityNameTag,
+
+        @Schema(description = "질문글에서 답변을 원하는 대학생의 학과")
+        String universityMajorTag,
+
+        @Schema(description = "질문글에서 답변을 원하는 대학생의 학년")
+        String universityGradeTag
 ) {
     public static CreateHighSchoolStudentQuestionResponse from(HighSchoolStudentQuestion highSchoolStudentQuestion) {
         return CreateHighSchoolStudentQuestionResponse.builder()
                 .highSchoolStudentQuestionId(highSchoolStudentQuestion.getId())
                 .title(highSchoolStudentQuestion.getTitle())
                 .question(highSchoolStudentQuestion.getQuestion())
+                .universityNameTag(highSchoolStudentQuestion.getUniversityNameTag())
+                .universityMajorTag(highSchoolStudentQuestion.getUniversityMajorTag().getValue())
+                .universityGradeTag(highSchoolStudentQuestion.getUniversityGradeTag().getValue())
                 .build();
     }
 }

gd-yd-api/src/main/java/com/gdyd/gdydapi/response/mentoring/DetailHighSchoolStudentQuestionResponse.java

@@ -23,6 +23,15 @@ public record DetailHighSchoolStudentQuestionResponse(
         @Schema(description = "고등학생 질문 내용", example = "이번에 모의고사 성적이 나왔는데, 이 성적으로 어떤 대학을 갈수 있을까요?")
         String question,
 
+        @Schema(description = "고등학생 질문에서 답변을 원하는 대학생의 학교명", example = "단국대학교")
+        String universityNameTag,
+
+        @Schema(description = "고등학생 질문에서 답변을 원하는 대학생의 학과", example = "컴퓨터/SW")
+        String universityMajorTag,
+
+        @Schema(description = "고등학생 질문에서 답변을 원하는 대학생의 학년", example = "1학년")
+        String universityGradeTag,
+
         @Schema(description = "고등학생 질문에 대한 좋아요 수", example = "3")
         Long likeCount,
 
@@ -51,6 +60,9 @@ public static DetailHighSchoolStudentQuestionResponse of(
                 .highSchoolStudentNickname(highSchoolStudentQuestion.getHighSchoolStudent().getNickname())
                 .title(highSchoolStudentQuestion.getTitle())
                 .question(highSchoolStudentQuestion.getQuestion())
+                .universityNameTag(highSchoolStudentQuestion.getUniversityNameTag())
+                .universityMajorTag(highSchoolStudentQuestion.getUniversityMajorTag().getValue())
+                .universityGradeTag(highSchoolStudentQuestion.getUniversityGradeTag().getValue())
                 .likeCount(highSchoolStudentQuestion.getLikeCount())
                 .awnserCount(highSchoolStudentQuestion.getAnswerCount())
                 .highSchoolStudentQuestionMediaUrls(highSchoolStudentQuestionMediaUrls)

gd-yd-api/src/main/java/com/gdyd/gdydapi/response/mentoring/RecommendationHighSchoolStudentQuestionResponse.java

@@ -14,13 +14,25 @@ public record RecommendationHighSchoolStudentQuestionResponse(
         String title,
 
         @Schema(description = "매칭된 고등학생 질문글 내용", example = "현재 수능 23225 입니다.")
-        String question
+        String question,
+
+        @Schema(description = "매칭된 고등학생 질문글에서 답변을 원하는 대학생의 학교명", example = "단국대학교")
+        String universityNameTag,
+
+        @Schema(description = "매칭된 고등학생 질문글에서 답변을 원하는 대학생의 학과", example = "컴퓨터/SW")
+        String universityMajorTag,
+
+        @Schema(description = "매칭된 고등학생 질문글에서 답변을 원하는 대학생의 학년", example = "1학년")
+        String universityGradeTag
 ) {
     public static RecommendationHighSchoolStudentQuestionResponse from(HighSchoolStudentQuestion highSchoolStudentQuestion) {
         return RecommendationHighSchoolStudentQuestionResponse.builder()
                 .id(highSchoolStudentQuestion.getId())
                 .title(highSchoolStudentQuestion.getTitle())
                 .question(highSchoolStudentQuestion.getQuestion())
+                .universityNameTag(highSchoolStudentQuestion.getUniversityNameTag())
+                .universityMajorTag(highSchoolStudentQuestion.getUniversityMajorTag().getValue())
+                .universityGradeTag(highSchoolStudentQuestion.getUniversityGradeTag().getValue())
                 .build();
     }
 }