Skip to content

Commit 583e546

Browse files
committed
rename field
1 parent 1f8300b commit 583e546

7 files changed

Lines changed: 11 additions & 11 deletions

File tree

src/main/java/it/aboutbits/springboot/emailservice/lib/EmailDto.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public record EmailDto(
2121

2222
Set<EmailAttachmentDto> attachments,
2323

24-
OffsetDateTime sendingScheduledAt,
24+
OffsetDateTime scheduledAt,
2525
OffsetDateTime sentAt,
2626

2727
OffsetDateTime errorAt,

src/main/java/it/aboutbits/springboot/emailservice/lib/application/EmailParameter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
@Builder
1515
public record EmailParameter(
16-
@NonNull OffsetDateTime scheduleAt,
16+
@NonNull OffsetDateTime scheduledAt,
1717

1818
@NonNull Email email
1919
) {

src/main/java/it/aboutbits/springboot/emailservice/lib/application/EmailServiceMigrator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ void init() {
2828
text_body text not null,
2929
html_body text not null,
3030
attachments jsonb default '[]'::jsonb,
31-
sending_scheduled_at timestamp with time zone default now() not null,
31+
scheduled_at timestamp with time zone default now() not null,
3232
sent_at timestamp with time zone,
3333
error_at timestamp with time zone,
3434
error_message text,
@@ -42,7 +42,7 @@ updated_at timestamp with time zone default now() not null,
4242
on email_service_emails (state);
4343
4444
create index if not exists email_service_emails_sending_scheduled_at_index
45-
on email_service_emails (sending_scheduled_at);
45+
on email_service_emails (scheduled_at);
4646
4747
create table if not exists email_service_email_attachments
4848
(

src/main/java/it/aboutbits/springboot/emailservice/lib/application/ManageEmail.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public EmailDto schedule(@NonNull @Valid EmailParameter parameter) {
5050

5151
final var email = new Email();
5252
email.setState(EmailState.PENDING);
53-
email.setSendingScheduledAt(parameter.scheduleAt());
53+
email.setScheduledAt(parameter.scheduledAt());
5454
email.setSubject(emailData.subject());
5555
email.setTextBody(emailData.textBody());
5656
email.setHtmlBody(emailData.htmlBody());

src/main/java/it/aboutbits/springboot/emailservice/lib/model/Email.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public class Email {
6262
@OneToMany(cascade = CascadeType.PERSIST, mappedBy = "email", orphanRemoval = true, fetch = FetchType.EAGER)
6363
private Set<EmailAttachment> attachments;
6464

65-
private OffsetDateTime sendingScheduledAt;
65+
private OffsetDateTime scheduledAt;
6666
private OffsetDateTime sentAt;
6767

6868
private OffsetDateTime errorAt;

src/test/java/it/aboutbits/springboot/emailservice/lib/application/ManageEmailTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class ManageEmailTest {
2525
@Test
2626
void givenRequiredParameters_schedule_shouldCreateNewNotification() {
2727
var parameter = EmailParameter.builder()
28-
.scheduleAt(OffsetDateTime.now())
28+
.scheduledAt(OffsetDateTime.now())
2929
.email(EmailParameter.Email.builder()
3030
.subject("Example email subject")
3131
.textBody("Email body")
@@ -48,13 +48,13 @@ void givenRequiredParameters_schedule_shouldCreateNewNotification() {
4848
assertThat(result.textBody()).isEqualTo(parameter.email().textBody());
4949
assertThat(result.htmlBody()).isEqualTo(parameter.email().htmlBody());
5050
assertThat(result.attachments()).isEmpty();
51-
assertThat(result.sendingScheduledAt()).isEqualTo(parameter.scheduleAt());
51+
assertThat(result.scheduledAt()).isEqualTo(parameter.scheduledAt());
5252
}
5353

5454
@Test
5555
void givenRequiredParameterWithAttachedFiles_schedule_shouldCreateNewNotification() {
5656
var parameter = EmailParameter.builder()
57-
.scheduleAt(OffsetDateTime.now())
57+
.scheduledAt(OffsetDateTime.now())
5858
.email(EmailParameter.Email.builder()
5959
.subject("Example email subject")
6060
.textBody("Email body")
@@ -84,6 +84,6 @@ void givenRequiredParameterWithAttachedFiles_schedule_shouldCreateNewNotificatio
8484
assertThat(result.textBody()).isEqualTo(parameter.email().textBody());
8585
assertThat(result.htmlBody()).isEqualTo(parameter.email().htmlBody());
8686
assertThat(result.attachments()).hasSize(1);
87-
assertThat(result.sendingScheduledAt()).isEqualTo(parameter.scheduleAt());
87+
assertThat(result.scheduledAt()).isEqualTo(parameter.scheduledAt());
8888
}
8989
}

src/test/java/it/aboutbits/springboot/emailservice/support/database/factory/EmailFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public static Email.EmailBuilder once() {
2121
.subject("Email subject")
2222
.textBody(body)
2323
.htmlBody("<h1>" + body + "</h1>")
24-
.sendingScheduledAt(OffsetDateTime.now())
24+
.scheduledAt(OffsetDateTime.now())
2525
.fromAddress(FAKER.internet().emailAddress())
2626
.fromName(FAKER.name().fullName())
2727
.recipients(List.of(FAKER.internet().emailAddress(), FAKER.internet().emailAddress()));

0 commit comments

Comments
 (0)