Deploy

src/main/java/com/yedu/backend/admin/application/usecase/AdminInfoUseCase.java

@@ -68,8 +68,9 @@ public ClassDetailsResponse getClassDetails(String applicationFormId) {
         return mapToClassDetailsResponse(applicationForm, classGoals);
     }
 
-    public AllFilteringTeacher searchAllTeacher(TeacherSearchRequest request) {
-        List<Teacher> teachers = adminGetService.allTeacherBySearch(request);
+    public AllFilteringTeacher searchAllTeacher(String applicationFormId, TeacherSearchRequest request) {
+        ApplicationForm applicationForm = adminGetService.applicationFormById(applicationFormId);
+        List<Teacher> teachers = adminGetService.allTeacherBySearch(applicationForm, request);
         return  new AllFilteringTeacher(teachers.stream()
                 .map(teacher -> {
                     List<TeacherDistrict> teacherDistricts = adminGetService.allDistrictByTeacher(teacher);

src/main/java/com/yedu/backend/admin/domain/service/AdminGetService.java

@@ -54,8 +54,8 @@ public List<Goal> allGoalByApplicationForm(ApplicationForm applicationForm) {
         return goalRepository.findAllByApplicationForm(applicationForm);
     }
 
-    public List<Teacher> allTeacherBySearch(TeacherSearchRequest teacherSearchRequest) {
-        return teacherRepository.findAllSearchTeacher(teacherSearchRequest);
+    public List<Teacher> allTeacherBySearch(ApplicationForm applicationForm, TeacherSearchRequest teacherSearchRequest) {
+        return teacherRepository.findAllSearchTeacher(applicationForm, teacherSearchRequest);
     }
 
     public Teacher teacherById(long teacherId) {

src/main/java/com/yedu/backend/admin/presentation/AdminController.java

@@ -85,16 +85,16 @@ public ResponseEntity<ClassDetailsResponse> classDetails(@PathVariable String ap
         return ResponseEntity.ok(classDetails);
     }
 
-    @GetMapping("/details/matching/search")
+    @GetMapping("/details/matching/search/{applicationFormId}")
     @Operation(summary = "선생님 검색", description = "선생님 검색 API")
     public ResponseEntity<AllFilteringTeacher> searchTeachers(
             @RequestParam(required = false) List<String> districts,
             @RequestParam(required = false) List<ClassType> subjects,
             @RequestParam(required = false) List<String> universities,
             @RequestParam(required = false) List<TeacherGender> genders,
-            @RequestParam(required = false) String search) {
+            @RequestParam(required = false) String search, @PathVariable String applicationFormId) {
         TeacherSearchRequest request = new TeacherSearchRequest(districts, subjects, universities, genders, search);
-        AllFilteringTeacher allFilteringTeacher = adminInfoUseCase.searchAllTeacher(request);
+        AllFilteringTeacher allFilteringTeacher = adminInfoUseCase.searchAllTeacher(applicationFormId, request);
         return ResponseEntity.ok(allFilteringTeacher);
     }
 

src/main/java/com/yedu/backend/admin/presentation/AdminTestController.java

@@ -67,21 +67,15 @@ public void signUpTeacher(@PathVariable String phoneNumber) {
                 .build();
         TeacherEnglish teacherEnglish = TeacherEnglish.builder()
                 .teacher(teacher)
-                .appealPoint("이러이러한 부분")
                 .foreignExperience("# abc")
-                .managementStyle("abc")
                 .teachingExperience("# abc")
                 .teachingHistory(3)
-                .managementStyle("이러이러")
                 .teachingStyle("이러이러")
                 .build();
         TeacherMath teacherMath = TeacherMath.builder()
                 .teacher(teacher)
-                .appealPoint("이러이러한 부분")
-                .managementStyle("abc")
                 .teachingExperience("# abc")
                 .teachingHistory(3)
-                .managementStyle("이러이러")
                 .teachingStyle("이러이러")
                 .build();
         teacherSaveService.saveTeacher(teacher, List.of(TeacherAvailable.builder()

src/main/java/com/yedu/backend/domain/teacher/application/dto/req/TeacherInfoFormRequest.java

@@ -11,18 +11,16 @@ public record TeacherInfoFormRequest(
         String phoneNumber,
         String birth,
         TeacherGender gender,
-        String univercity,
+        String university,
         String major,
         String highSchool,
-        String highSchoolType,
         String introduce,
         String teachingStyle1,
         String teachingStyleInfo1,
         String teachingStyle2,
         String teachingStyleInfo2,
         boolean englishPossible,
         boolean mathPossible,
-        String recommenedStudent,
         String comment,
         List<List<String>> available,
         List<String> region,
@@ -32,19 +30,15 @@ public record TeacherInfoFormRequest(
         Math math
 ) {
     public record English(
-            String appealPoint,
             String teachingExperience,
             String foreignExperience,
             String teachingHistory,
-            String teachingStyle,
-            String managementStyle
+            String teachingStyle
     ) {}
 
     public record Math(
-            String appealPoint,
             String teachingExperience,
             String teachingHistory,
-            String teachingStyle,
-            String managementStyle
+            String teachingStyle
     ) {}
 }

src/main/java/com/yedu/backend/domain/teacher/application/dto/res/EnglishCurriculumResponse.java

@@ -2,7 +2,6 @@
 
 public record EnglishCurriculumResponse(
         String teachingStyle,
-        String managementStyle,
         String video
 ) {
 }

src/main/java/com/yedu/backend/domain/teacher/application/dto/res/MathCurriculumResponse.java

@@ -1,7 +1,6 @@
 package com.yedu.backend.domain.teacher.application.dto.res;
 
 public record MathCurriculumResponse(
-        String teachingStyle,
-        String managementStyle
+        String teachingStyle
 ) {
 }

src/main/java/com/yedu/backend/domain/teacher/application/dto/res/TeacherEnglishResponse.java

@@ -3,7 +3,6 @@
 import java.util.List;
 
 public record TeacherEnglishResponse(
-        List<String> appealPoints, // 수학 전문성 english
         String comment, // 소제목 역할 classInfo
         String introduce, // 자신을 어필하는 자기소개 classInfo
         int teachingHistory, // 경력 몇년
@@ -15,7 +14,6 @@ public record TeacherEnglishResponse(
         String teachingStyle1,
         String teachingStyleInfo1,
         String teachingStyle2,
-        String teachingStyleInfo2,
-        List<String> recommendStudents
+        String teachingStyleInfo2
 ) {
 }

src/main/java/com/yedu/backend/domain/teacher/application/dto/res/TeacherMathResponse.java

@@ -3,7 +3,6 @@
 import java.util.List;
 
 public record TeacherMathResponse(
-        List<String> appealPoints, // 수학 전문성 math
         String comment, // 소제목 역할 classInfo
         String introduce, // 자신을 어필하는 자기소개 classInfo
         int teachingHistory, // 경력 몇년
@@ -14,7 +13,6 @@ public record TeacherMathResponse(
         String teachingStyle1,
         String teachingStyleInfo1,
         String teachingStyle2,
-        String teachingStyleInfo2,
-        List<String> recommendStudents
+        String teachingStyleInfo2
 ) {
 }

src/main/java/com/yedu/backend/domain/teacher/application/mapper/TeacherMapper.java

@@ -27,13 +27,12 @@ public static TeacherInfo mapToTeacherInfo(TeacherInfoFormRequest request) {
     }
 
     public static TeacherSchoolInfo mapToTeacherSchoolInfo(TeacherInfoFormRequest request) {
-        boolean etc = University.checkEtc(request.univercity());
+        boolean etc = University.checkEtc(request.university());
         return TeacherSchoolInfo.builder()
-                .university(request.univercity())
+                .university(request.university())
                 .etc(etc)
                 .major(request.major())
                 .highSchool(request.highSchool())
-                .highSchoolType(request.highSchoolType())
                 .build();
     }
 
@@ -45,7 +44,6 @@ public static TeacherClassInfo mapToTeacherClassInfo(TeacherInfoFormRequest requ
                 .teachingStyle2(TeachingStyle.fromString(request.teachingStyle2()))
                 .teachingStyleInfo1(request.teachingStyleInfo1())
                 .teachingStyleInfo2(request.teachingStyleInfo1())
-                .recommendStudent(request.recommenedStudent())
                 .comment(request.comment())
                 .englishPossible(request.englishPossible())
                 .mathPossible(request.mathPossible());
@@ -80,23 +78,19 @@ public static TeacherAvailable mapToTeacherAvailable(Teacher teacher, int day, S
     public static TeacherEnglish mapToTeacherEnglish(Teacher teacher, TeacherInfoFormRequest request) {
         return TeacherEnglish.builder()
                 .teacher(teacher)
-                .appealPoint(request.english().appealPoint())
                 .teachingExperience(request.english().teachingExperience())
                 .teachingHistory(Integer.parseInt(request.english().teachingHistory()))
                 .teachingStyle(request.english().teachingStyle())
-                .managementStyle(request.english().managementStyle())
                 .foreignExperience(request.english().foreignExperience())
                 .build();
     }
 
     public static TeacherMath mapToTeacherMath(Teacher teacher, TeacherInfoFormRequest request) {
         return TeacherMath.builder()
                 .teacher(teacher)
-                .appealPoint(request.math().appealPoint())
                 .teachingExperience(request.math().teachingExperience())
                 .teachingHistory(Integer.parseInt(request.math().teachingHistory()))
                 .teachingStyle(request.math().teachingStyle())
-                .managementStyle(request.math().managementStyle())
                 .build();
     }
 
@@ -111,12 +105,9 @@ public static TeacherCommonsInfoResponse mapToTeacherCommonsInfo(Teacher teacher
     public static TeacherMathResponse mapToTeacherMathResponse(Teacher teacher, TeacherMath math) {
         TeacherClassInfo classInfo = teacher.getTeacherClassInfo();
         TeacherSchoolInfo schoolInfo = teacher.getTeacherSchoolInfo();
-        List<String> appealPoints = getOrganizeContexts(math.getAppealPoint());
         List<String> experiences = getOrganizeContexts(math.getTeachingExperience());
-        List<String> recommends = getOrganizeContexts(classInfo.getRecommendStudent());
 
         return new TeacherMathResponse(
-                appealPoints,
                 classInfo.getComment(),
                 classInfo.getIntroduce(),
                 math.getTeachingHistory(),
@@ -127,20 +118,16 @@ public static TeacherMathResponse mapToTeacherMathResponse(Teacher teacher, Teac
                 classInfo.getTeachingStyle1().getDescription(),
                 classInfo.getTeachingStyleInfo1(),
                 classInfo.getTeachingStyle2().getDescription(),
-                classInfo.getTeachingStyleInfo2(),
-                recommends
+                classInfo.getTeachingStyleInfo2()
         );
     }
 
     public static TeacherEnglishResponse mapToTeacherEnglish(Teacher teacher, TeacherEnglish english) {
         TeacherClassInfo classInfo = teacher.getTeacherClassInfo();
         TeacherSchoolInfo schoolInfo = teacher.getTeacherSchoolInfo();
-        List<String> appealPoints = getOrganizeContexts(english.getAppealPoint());
         List<String> foreignExperiences = getForeignExperiences(english);
         List<String> experiences = getOrganizeContexts(english.getTeachingExperience());
-        List<String> recommends = getOrganizeContexts(classInfo.getRecommendStudent());
         return new TeacherEnglishResponse(
-                appealPoints,
                 classInfo.getComment(),
                 classInfo.getIntroduce(),
                 english.getTeachingHistory(),
@@ -152,8 +139,7 @@ public static TeacherEnglishResponse mapToTeacherEnglish(Teacher teacher, Teache
                 classInfo.getTeachingStyle1().getDescription(),
                 classInfo.getTeachingStyleInfo1(),
                 classInfo.getTeachingStyle2().getDescription(),
-                classInfo.getTeachingStyleInfo2(),
-                recommends
+                classInfo.getTeachingStyleInfo2()
         );
     }
 
@@ -178,11 +164,11 @@ private static List<String> getForeignExperiences(TeacherEnglish english) {
     }
 
     public static MathCurriculumResponse mapToMathCurriculumResponse(TeacherMath math) {
-        return new MathCurriculumResponse(math.getTeachingStyle(), math.getManagementStyle());
+        return new MathCurriculumResponse(math.getTeachingStyle());
     }
 
     public static EnglishCurriculumResponse mapToEnglishCurriculumResponse(TeacherInfo teacherInfo, TeacherEnglish english) {
-        return new EnglishCurriculumResponse(english.getTeachingStyle(), english.getManagementStyle(), teacherInfo.getVideo());
+        return new EnglishCurriculumResponse(english.getTeachingStyle(), teacherInfo.getVideo());
     }
 
     public static DistrictAndTimeResponse mapToDistrictAndTimeResponse(List<String> districts, Map<Day, List<LocalTime>> availableTimes) {

src/main/java/com/yedu/backend/domain/teacher/domain/entity/TeacherClassInfo.java

@@ -28,7 +28,7 @@ public class TeacherClassInfo {
     private String teachingStyleInfo1;
     @Column(columnDefinition = "TEXT", nullable = false)
     private String teachingStyleInfo2;
-    @Column(columnDefinition = "TEXT", nullable = false)
+    @Column(columnDefinition = "TEXT")
     private String recommendStudent;
     @Column(columnDefinition = "TEXT", nullable = false)
     private String comment; //하고싶은 말

src/main/java/com/yedu/backend/domain/teacher/domain/entity/TeacherEnglish.java

@@ -17,15 +17,15 @@ public class TeacherEnglish {
     private long englishId;
     @ManyToOne(fetch = FetchType.LAZY)
     private Teacher teacher;
-    @Column(columnDefinition = "TEXT", nullable = false)
+    @Column(columnDefinition = "TEXT")
     private String appealPoint;
     @Column(columnDefinition = "TEXT", nullable = false)
     private String teachingExperience;
     @Column(nullable = false)
     private int teachingHistory;
     @Column(columnDefinition = "TEXT", nullable = false)
     private String teachingStyle;
-    @Column(columnDefinition = "TEXT", nullable = false)
+    @Column(columnDefinition = "TEXT")
     private String managementStyle;
     @Column(columnDefinition = "TEXT")
     private String foreignExperience;

src/main/java/com/yedu/backend/domain/teacher/domain/entity/TeacherMath.java

@@ -17,14 +17,14 @@ public class TeacherMath {
     private long mathId;
     @ManyToOne(fetch = FetchType.LAZY)
     private Teacher teacher;
-    @Column(columnDefinition = "TEXT", nullable = false)
+    @Column(columnDefinition = "TEXT")
     private String appealPoint;
     @Column(columnDefinition = "TEXT", nullable = false)
     private String teachingExperience;
     @Column(nullable = false)
     private int teachingHistory;
     @Column(columnDefinition = "TEXT", nullable = false)
     private String teachingStyle;
-    @Column(columnDefinition = "TEXT", nullable = false)
+    @Column(columnDefinition = "TEXT")
     private String managementStyle;
 }

src/main/java/com/yedu/backend/domain/teacher/domain/entity/TeacherSchoolInfo.java

@@ -24,6 +24,5 @@ public class TeacherSchoolInfo {
     //고등학교 정보
     @Column(nullable = false)
     private String highSchool;
-    @Column(nullable = false)
     private String highSchoolType;
 }

src/main/java/com/yedu/backend/domain/teacher/domain/repository/TeacherDslRepository.java

@@ -8,6 +8,5 @@
 
 public interface TeacherDslRepository {
     List<Teacher> findAllMatchingApplicationForm(ApplicationForm applicationForm);
-
-    List<Teacher> findAllSearchTeacher(TeacherSearchRequest request);
+    List<Teacher> findAllSearchTeacher(ApplicationForm applicationForm, TeacherSearchRequest request);
 }

src/main/java/com/yedu/backend/domain/teacher/domain/repository/TeacherDslRepositoryImpl.java

@@ -31,6 +31,10 @@ public class TeacherDslRepositoryImpl implements TeacherDslRepository {
     @Override
     public List<Teacher> findAllMatchingApplicationForm(ApplicationForm applicationForm) {
         // 지역, 성별, 과목
+        return getTeachers(applicationForm);
+    }
+
+    private List<Teacher> getTeachers(ApplicationForm applicationForm) {
         District district = applicationForm.getDistrict();
         Gender favoriteGender = applicationForm.getFavoriteGender();
         ClassType subject = applicationForm.getWantedSubject();
@@ -64,7 +68,11 @@ private BooleanExpression subjectSpecifier(ClassType classType) {
     }
 
     @Override
-    public List<Teacher> findAllSearchTeacher(TeacherSearchRequest request) {
+    public List<Teacher> findAllSearchTeacher(ApplicationForm applicationForm, TeacherSearchRequest request) {
+        List<Long> teacherIds = getTeachers(applicationForm)
+                .stream().map(Teacher::getTeacherId)
+                .toList();
+
         BooleanBuilder builder = searchLikeSpecifier(request);
         builder.and(districtSpecifier(request.districts()))
                 .and(subjectSpecifier(request.subjects()))
@@ -77,7 +85,7 @@ public List<Teacher> findAllSearchTeacher(TeacherSearchRequest request) {
                 .leftJoin(teacherDistrict)
                 .fetchJoin()
                 .on(teacher.eq(teacherDistrict.teacher))
-                .where(builder) // 동적 조건 적용
+                .where(builder, teacher.teacherId.notIn(teacherIds)) // 동적 조건 적용
                 .orderBy(
                         statusOrderSpecifier(),
                         universityOrderSpecifier()

src/main/java/com/yedu/backend/global/bizppurio/application/usecase/BizppurioCheckStep.java

@@ -16,16 +16,17 @@ public class BizppurioCheckStep {
     private static final String COUNSEL = "COUNSEL";
 
     public void checkNextStep(MessageStatusRequest request) {
-        getCacheValue(request.REFKEY()).ifPresent(stepValue -> processNextStep(stepValue, request.PHONE()));
+        getCacheValue(request.REFKEY()).ifPresent(stepValue -> processNextStep(stepValue, request));
     }
 
     private Optional<String> getCacheValue(String refKey) {
         return redisRepository.getValues(refKey);
     }
 
-    private void processNextStep(String stepValue, String phone) {
+    private void processNextStep(String stepValue, MessageStatusRequest request) {
         if (COUNSEL.equals(stepValue)) {
-            teacherMessage.photoSubmit(phone);
+            teacherMessage.photoSubmit(request.PHONE());
+            redisRepository.deleteValues(request.REFKEY());
         }
     }
-}
+}

src/main/resources/db/migration/V1_202502211732__alter_nullable.sql

@@ -0,0 +1,9 @@
+ALTER TABLE goal MODIFY COLUMN class_goal text not null;
+ALTER TABLE application_form MODIFY COLUMN want_time text not null;
+ALTER TABLE application_form MODIFY COLUMN source text not null;
+ALTER TABLE teacher MODIFY COLUMN recommend_student text;
+ALTER TABLE teacher MODIFY COLUMN high_school_type varchar(255);
+ALTER TABLE teacher_english MODIFY COLUMN appeal_point text;
+ALTER TABLE teacher_english MODIFY COLUMN management_style text;
+ALTER TABLE teacher_math MODIFY COLUMN appeal_point text;
+ALTER TABLE teacher_math MODIFY COLUMN management_style text;