Skip to content

Commit 317c3f6

Browse files
authored
Merge pull request #194 from CEOS-Developers/refact/mail
메일링 서비스 리크루팅 기간 내 발송 가능하도록 수정
2 parents a4d12d7 + dcbbaab commit 317c3f6

6 files changed

Lines changed: 39 additions & 21 deletions

File tree

src/main/java/ceos/backend/domain/subscriber/exception/InvalidAction.java

Lines changed: 0 additions & 13 deletions
This file was deleted.
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package ceos.backend.domain.subscriber.exception;
2+
3+
4+
import ceos.backend.global.error.BaseErrorException;
5+
6+
public class InvalidActionAfter extends BaseErrorException {
7+
8+
public static final InvalidActionAfter EXCEPTION = new InvalidActionAfter();
9+
10+
private InvalidActionAfter() {
11+
super(SubscriberErrorCode.INVALID_ACTION_AFTER);
12+
}
13+
}
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package ceos.backend.domain.subscriber.exception;
2+
3+
4+
import ceos.backend.global.error.BaseErrorException;
5+
6+
public class InvalidActionBefore extends BaseErrorException {
7+
8+
public static final InvalidActionBefore EXCEPTION = new InvalidActionBefore();
9+
10+
private InvalidActionBefore() {
11+
super(SubscriberErrorCode.INVALID_ACTION_BEFORE);
12+
}
13+
}

src/main/java/ceos/backend/domain/subscriber/exception/SubscriberErrorCode.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
public enum SubscriberErrorCode implements BaseErrorCode {
1414

1515
/* Data */
16-
INVALID_ACTION(BAD_REQUEST, "SUBSCRIBER_400_1", "리쿠르팅 시작 전입니다."),
16+
INVALID_ACTION_BEFORE(BAD_REQUEST, "SUBSCRIBER_400_1", "리쿠르팅 시작 전입니다."),
17+
INVALID_ACTION_AFTER(BAD_REQUEST, "SUBSCRIBER_400_2", "리쿠르팅 마감 후입니다."),
1718
DUPLICATE_DATA(CONFLICT, "SUBSCRIBER_409_1", "이미 존재하는 데이터입니다");
1819

1920
private HttpStatus status;

src/main/java/ceos/backend/domain/subscriber/helper/SubscriberHelper.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
package ceos.backend.domain.subscriber.helper;
22

33
import ceos.backend.domain.subscriber.exception.DuplicateData;
4-
import ceos.backend.domain.subscriber.exception.InvalidAction;
4+
import ceos.backend.domain.subscriber.exception.InvalidActionAfter;
5+
import ceos.backend.domain.subscriber.exception.InvalidActionBefore;
56
import ceos.backend.domain.subscriber.repository.SubscriberRepository;
67
import ceos.backend.global.common.dto.AwsSESRecruitMail;
78
import ceos.backend.global.common.event.Event;
@@ -22,9 +23,11 @@ public void validateEmail(String email) {
2223
}
2324
}
2425

25-
public void validateDate(LocalDate date, LocalDate now) {
26-
if (!date.equals(now)) {
27-
throw InvalidAction.EXCEPTION;
26+
public void validateDate(LocalDate startDate, LocalDate endDate, LocalDate now) {
27+
if (now.isBefore(startDate)) {
28+
throw InvalidActionBefore.EXCEPTION;
29+
} else if (now.isAfter(endDate)) {
30+
throw InvalidActionAfter.EXCEPTION;
2831
}
2932
}
3033

src/main/java/ceos/backend/domain/subscriber/service/SubscriberService.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,13 @@ public void subscribeMail(SubscribeRequest subscribeRequest) {
3535

3636
@Transactional(readOnly = true)
3737
public void sendRecruitingMail() {
38-
LocalDate date = recruitmentRepository.findAll().get(0).getStartDateDoc().toLocalDate();
38+
LocalDate startDate = recruitmentRepository.findAll().get(0).getStartDateDoc().toLocalDate();
39+
LocalDate endDate = recruitmentRepository.findAll().get(0).getEndDateDoc().toLocalDate();
3940
LocalDate now = LocalDate.now();
4041
List<Subscriber> subscribers = subscriberRepository.findAll();
4142

42-
//리쿠르팅 시작 날짜 검증
43-
subscriberHelper.validateDate(date, now);
43+
//리쿠르팅 기간 검증
44+
subscriberHelper.validateDate(startDate, endDate, now);
4445

4546
// 메일 보내기
4647
for (Subscriber subscriber : subscribers) {

0 commit comments

Comments
 (0)