Skip to content

Commit 1f8300b

Browse files
committed
remove reference field from email
1 parent 82d5ca7 commit 1f8300b

9 files changed

Lines changed: 1 addition & 37 deletions

File tree

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ public record EmailDto(
2121

2222
Set<EmailAttachmentDto> attachments,
2323

24-
String reference,
25-
2624
OffsetDateTime sendingScheduledAt,
2725
OffsetDateTime sentAt,
2826

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import lombok.Builder;
77
import lombok.NonNull;
88
import lombok.Singular;
9-
import org.springframework.lang.Nullable;
109

1110
import java.time.OffsetDateTime;
1211
import java.util.List;
@@ -16,9 +15,7 @@
1615
public record EmailParameter(
1716
@NonNull OffsetDateTime scheduleAt,
1817

19-
@NonNull Email email,
20-
21-
@Nullable String reference
18+
@NonNull Email email
2219
) {
2320

2421
@Builder

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ void init() {
2929
html_body text not null,
3030
attachments jsonb default '[]'::jsonb,
3131
sending_scheduled_at timestamp with time zone default now() not null,
32-
reference text,
3332
sent_at timestamp with time zone,
3433
error_at timestamp with time zone,
3534
error_message text,
@@ -39,9 +38,6 @@ updated_at timestamp with time zone default now() not null,
3938
check ((text_body <> ''::text) OR (html_body <> ''::text))
4039
);
4140
42-
create index if not exists email_service_emails_reference_index
43-
on email_service_emails (reference);
44-
4541
create index if not exists email_service_emails_state_index
4642
on email_service_emails (state);
4743

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ public EmailDto schedule(@NonNull @Valid EmailParameter parameter) {
5151
final var email = new Email();
5252
email.setState(EmailState.PENDING);
5353
email.setSendingScheduledAt(parameter.scheduleAt());
54-
email.setReference(parameter.reference());
5554
email.setSubject(emailData.subject());
5655
email.setTextBody(emailData.textBody());
5756
email.setHtmlBody(emailData.htmlBody());

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import org.springframework.data.domain.Page;
1111
import org.springframework.data.domain.PageRequest;
1212
import org.springframework.data.domain.Sort;
13-
import org.springframework.lang.Nullable;
1413

1514
import java.time.OffsetDateTime;
1615
import java.util.Collection;
@@ -53,8 +52,4 @@ List<Email> readyToSend() {
5352
public Optional<EmailDto> byId(long id) {
5453
return emailRepository.findById(id).map(emailMapper::toDto);
5554
}
56-
57-
public List<EmailDto> byReference(@Nullable String reference) {
58-
return emailMapper.toDto(emailRepository.findByReference(reference));
59-
}
6055
}

src/main/java/it/aboutbits/springboot/emailservice/lib/jpa/EmailRepository.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,5 @@
1313
public interface EmailRepository extends JpaRepository<Email, Long> {
1414
Page<Email> findByState(EmailState state, PageRequest pageRequest);
1515

16-
List<Email> findByReference(String reference);
17-
1816
List<Email> findByIdIn(Collection<Long> ids);
1917
}

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

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

65-
private String reference;
66-
6765
private OffsetDateTime sendingScheduledAt;
6866
private OffsetDateTime sentAt;
6967

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ void givenRequiredParameters_schedule_shouldCreateNewNotification() {
4747
assertThat(result.recipients()).containsAll(parameter.email().recipients());
4848
assertThat(result.textBody()).isEqualTo(parameter.email().textBody());
4949
assertThat(result.htmlBody()).isEqualTo(parameter.email().htmlBody());
50-
assertThat(result.reference()).isEqualTo(parameter.reference());
5150
assertThat(result.attachments()).isEmpty();
5251
assertThat(result.sendingScheduledAt()).isEqualTo(parameter.scheduleAt());
5352
}
@@ -84,7 +83,6 @@ void givenRequiredParameterWithAttachedFiles_schedule_shouldCreateNewNotificatio
8483
assertThat(result.recipients()).containsAll(parameter.email().recipients());
8584
assertThat(result.textBody()).isEqualTo(parameter.email().textBody());
8685
assertThat(result.htmlBody()).isEqualTo(parameter.email().htmlBody());
87-
assertThat(result.reference()).isEqualTo(parameter.reference());
8886
assertThat(result.attachments()).hasSize(1);
8987
assertThat(result.sendingScheduledAt()).isEqualTo(parameter.scheduleAt());
9088
}

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

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -63,21 +63,6 @@ void givenEmailNotificationWithPagination_byState_shouldSuccess() {
6363
assertThat(result.getContent()).hasSize(1);
6464
}
6565

66-
@Test
67-
void givenEmailNotificationWithPagination_byReference_shouldSuccess() {
68-
emailRepository.saveAll(Set.of(
69-
EmailFactory.once().reference("something").build(),
70-
EmailFactory.once().reference("something else").build(),
71-
EmailFactory.once().reference("something").build()
72-
));
73-
74-
var result = queryEmail.byReference(
75-
"something"
76-
);
77-
78-
assertThat(result).hasSize(2);
79-
}
80-
8166
@Test
8267
void givenEmailNotification_byIds_shouldSuccess() {
8368
var notificationA = emailRepository.save(EmailFactory.once().build());

0 commit comments

Comments
 (0)