diff --git a/src/main/java/com/jobnote/domain/applicationform/domain/ApplicationForm.java b/src/main/java/com/jobnote/domain/applicationform/domain/ApplicationForm.java index 9f683c5..75c995c 100644 --- a/src/main/java/com/jobnote/domain/applicationform/domain/ApplicationForm.java +++ b/src/main/java/com/jobnote/domain/applicationform/domain/ApplicationForm.java @@ -27,21 +27,14 @@ public class ApplicationForm extends BaseTimeEntity { @Column(nullable = false) private String companyName; - private String companyTel; - private String companyAddress; private String companyUrl; - private String companyEmail; - private String companyScale; private String position; - @Lob - private String memo; - @Enumerated(EnumType.STRING) private ApplicationFormStatus status; @@ -49,24 +42,18 @@ public class ApplicationForm extends BaseTimeEntity { public ApplicationForm( final User user, final String companyName, - final String companyTel, final String companyAddress, final String companyUrl, - final String companyEmail, final String companyScale, final String position, - final String memo, final ApplicationFormStatus status ) { this.user = user; this.companyName = companyName; - this.companyTel = companyTel; this.companyAddress = companyAddress; this.companyUrl = companyUrl; - this.companyEmail = companyEmail; this.companyScale = companyScale; this.position = position; - this.memo = memo; this.status = status; } @@ -78,13 +65,10 @@ public void validateOwner(final Long userId) { public void update(final ApplicationFormRequest request) { this.companyName = request.companyName(); - this.companyTel = request.companyTel(); this.companyAddress = request.companyAddress(); this.companyUrl = request.companyUrl(); - this.companyEmail = request.companyEmail(); this.companyScale = request.companyScale(); this.position = request.position(); - this.memo = request.memo(); this.status = request.status(); } } diff --git a/src/main/java/com/jobnote/domain/applicationform/dto/ApplicationFormRequest.java b/src/main/java/com/jobnote/domain/applicationform/dto/ApplicationFormRequest.java index 6984709..bdee3ea 100644 --- a/src/main/java/com/jobnote/domain/applicationform/dto/ApplicationFormRequest.java +++ b/src/main/java/com/jobnote/domain/applicationform/dto/ApplicationFormRequest.java @@ -6,7 +6,6 @@ import com.jobnote.domain.schedule.dto.ScheduleRequest; import com.jobnote.domain.user.domain.User; import jakarta.validation.Valid; -import jakarta.validation.constraints.Email; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; @@ -16,21 +15,14 @@ public record ApplicationFormRequest( @NotBlank(message = "회사명은 비어있을 수 없습니다.") String companyName, - String companyTel, - String companyAddress, String companyUrl, - @Email(message = "형식에 맞는 이메일을 입력해주세요.") - String companyEmail, - String companyScale, String position, - String memo, - @NotNull(message = "지원 상태는 비어있을 수 없습니다.") ApplicationFormStatus status, @@ -44,13 +36,10 @@ public ApplicationForm toEntity(final User user) { return ApplicationForm.builder() .user(user) .companyName(companyName) - .companyTel(companyTel) .companyAddress(companyAddress) .companyUrl(companyUrl) - .companyEmail(companyEmail) .companyScale(companyScale) .position(position) - .memo(memo) .status(status) .build(); } diff --git a/src/main/java/com/jobnote/domain/applicationform/dto/ApplicationFormResponse.java b/src/main/java/com/jobnote/domain/applicationform/dto/ApplicationFormResponse.java index 82f61de..5a38fd8 100644 --- a/src/main/java/com/jobnote/domain/applicationform/dto/ApplicationFormResponse.java +++ b/src/main/java/com/jobnote/domain/applicationform/dto/ApplicationFormResponse.java @@ -13,13 +13,10 @@ public record ApplicationFormResponse( Long id, String companyName, - String companyTel, String companyAddress, String companyUrl, - String companyEmail, String companyScale, String position, - String memo, ApplicationFormStatus status, List schedules, List documents @@ -28,13 +25,10 @@ public static ApplicationFormResponse from(final ApplicationForm form, final Lis return ApplicationFormResponse.builder() .id(form.getId()) .companyName(form.getCompanyName()) - .companyTel(form.getCompanyTel()) .companyAddress(form.getCompanyAddress()) .companyUrl(form.getCompanyUrl()) - .companyEmail(form.getCompanyEmail()) .companyScale(form.getCompanyScale()) .position(form.getPosition()) - .memo(form.getMemo()) .status(form.getStatus()) .schedules(schedules) .documents(documents) diff --git a/src/test/java/com/jobnote/domain/applicationform/service/ApplicationFormServiceTest.java b/src/test/java/com/jobnote/domain/applicationform/service/ApplicationFormServiceTest.java index 7bc88eb..d8ce519 100644 --- a/src/test/java/com/jobnote/domain/applicationform/service/ApplicationFormServiceTest.java +++ b/src/test/java/com/jobnote/domain/applicationform/service/ApplicationFormServiceTest.java @@ -234,7 +234,7 @@ void fail_forbidden() { @Test void saveApplicationForm() { // given - ApplicationFormRequest request = new ApplicationFormRequest("네이버", "02-1234-7812", "경기도 성남시", null, null, null, null, null, APPLIED, null, null); + ApplicationFormRequest request = new ApplicationFormRequest("네이버", "경기도 성남시", null, null, null, APPLIED, null, null); given(userService.getUserById(userId)).willReturn(user); given(applicationFormRepository.save(any(ApplicationForm.class))).willReturn(applicationForm); @@ -248,7 +248,7 @@ void saveApplicationForm() { @Nested @DisplayName("지원서 수정") class Update { - ApplicationFormRequest request = new ApplicationFormRequest("카카오", "02-1111-2222", "경기도 성남시", null, null, null, null, null, APPLIED, null, null); + ApplicationFormRequest request = new ApplicationFormRequest("카카오", "경기도 성남시", null, null, null, APPLIED, null, null); @DisplayName("성공") @Test