Skip to content
This repository has been archived by the owner on May 16, 2023. It is now read-only.

Commit

Permalink
Date field
Browse files Browse the repository at this point in the history
  • Loading branch information
dreske committed Dec 20, 2022
1 parent 1ec37ba commit 1afafe5
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeParseException;
import java.util.ArrayList;
import java.util.stream.Collectors;

Expand Down Expand Up @@ -163,7 +164,11 @@ public String uploadJob(@RequestParam("file") MultipartFile file,
entry.setPartnerId(tokens[0]);
entry.setReceiver(tokens[8]);
entry.setAttachmentFilename(tokens[0] + ".pdf");
entry.setFinalDeletionRequest(LocalDate.parse(tokens[11], DateTimeFormatter.ofPattern("dd.MM.yyyy")));
try {
entry.setFinalDeletionRequest(LocalDate.parse(tokens[11], DateTimeFormatter.ofPattern("dd.MM.yyyy")).atTime(23,59));
}catch (DateTimeParseException ignored) {
entry.setFinalDeletionRequest(LocalDateTime.parse(tokens[11], DateTimeFormatter.ofPattern("dd.MM.yyyy HH:mm")));
}
jobEntryRepository.save(entry);
}
} catch (Exception e) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public class MailService {
public void sendMail(String receiver, String bcc, String subject, String body, Map<String, File> attachments) throws MessagingException, IOException {
Properties properties = new Properties();
properties.put("mail.smtp.auth", true);
properties.put("mail.smtp.starttls.enable", Boolean.valueOf(emailStartTls));
properties.put("mail.smtp.starttls.enable", true);
properties.put("mail.smtp.host", emailSmtpHost);
properties.put("mail.smtp.port", emailSmtpPort);
properties.put("mail.smtp.ssl.trust", emailSmtpHost);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
Expand Down Expand Up @@ -103,7 +104,7 @@ public void processEntry(JobEntry jobEntry) throws IOException, MessagingExcepti
try {
jobEntry.setFinalDeletionResponse(quicktestPortalService.cancelAccount(
jobEntry.getPartnerId(),
jobEntry.getFinalDeletionRequest().atStartOfDay()
jobEntry.getFinalDeletionRequest()
));
} catch (Exception e) {
jobEntry.setMessage("Cancellation: " + e.getMessage());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public class JobEntry {
@CsvBindByName(column = "Errors")
private String message;

private LocalDate finalDeletionRequest;
private LocalDateTime finalDeletionRequest;

@CsvBindByPosition(position = 5)
@CsvBindByName(column = "Final Deletion")
Expand Down

0 comments on commit 1afafe5

Please sign in to comment.