diff --git a/src/main/java/com/pledge/torgi/controller/DownloadHeadlessController.java b/src/main/java/com/pledge/torgi/controller/DownloadHeadlessController.java index 11ea631..0c18abf 100644 --- a/src/main/java/com/pledge/torgi/controller/DownloadHeadlessController.java +++ b/src/main/java/com/pledge/torgi/controller/DownloadHeadlessController.java @@ -1,9 +1,7 @@ package com.pledge.torgi.controller; -import com.pledge.torgi.model.Configs; import com.pledge.torgi.model.MissedData; import com.pledge.torgi.model.TorgiEvent; -import com.pledge.torgi.repositories.ConfigsRepository; import com.pledge.torgi.repositories.MissedDataRepository; import com.pledge.torgi.repositories.TorgiEventRepository; import com.pledge.torgi.service.DownloadHeadlessService; @@ -21,13 +19,10 @@ import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; import java.time.LocalDate; -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; import java.util.*; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; -import static com.pledge.torgi.model.Configs.LAST_RUN_TIME; import static com.pledge.torgi.utils.AppUtils.CUSTOM_EXCEL_LINK; import static com.pledge.torgi.utils.AppUtils.EXCEL_LINK; @@ -37,12 +32,10 @@ public class DownloadHeadlessController { private final Logger logger = LoggerFactory.getLogger(DownloadHeadlessController.class); private final Set content = new HashSet<>(); private final TorgiEventRepository eventRepository; - private final ConfigsRepository configsRepository; private final MissedDataRepository missedDataRepository; - public DownloadHeadlessController(TorgiEventRepository eventRepository, ConfigsRepository configsRepository, MissedDataRepository missedDataRepository) { + public DownloadHeadlessController(TorgiEventRepository eventRepository, MissedDataRepository missedDataRepository) { this.eventRepository = eventRepository; - this.configsRepository = configsRepository; this.missedDataRepository = missedDataRepository; eventRepository.findAllByOrderByCreatedAtDesc(PageRequest.of(0, 10000)).forEach(event -> content.add(event.getKey())); } @@ -78,53 +71,6 @@ public class DownloadHeadlessController { logger.error("sended archive"); } - public void sendNewContent(StartParams params) { - if (alreadyRunnedToday()) { - return; - } - DownloadHeadlessService downloadHeadlessService = new DownloadHeadlessService(); - LocalDate now = LocalDate.now(); - downloadHeadlessService.createNewDocument(eventRepository, now); -// int i = 0; -// while (true) { -// List partition = eventRepository.findAllByOrderByCreatedAtDesc(PageRequest.of(i, 30000)).stream().map(Lot::new).toList(); -// if (partition.isEmpty()) { -// break; -// } -// downloadHeadlessService.createNewDocument(eventRepository, now, i); -// i++; -// } - createArchive(now); - sendArchive(params, now); - removeArchiveAndSource(now); - logger.error("sended archive"); - saveTime(); - } - - private void saveTime() { - List configs = configsRepository.findAll().stream().filter(cfg -> cfg.getKey().equals(LAST_RUN_TIME)).toList(); - if (configs.isEmpty()) { - Configs newValue = new Configs(); - newValue.setId(1L); - newValue.setKey(LAST_RUN_TIME); - newValue.setValue(LocalDateTime.now().toString()); - configsRepository.save(newValue); - } else { - Configs oldValue = configs.get(0); - oldValue.setValue(LocalDateTime.now().toString()); - configsRepository.save(oldValue); - } - } - - private boolean alreadyRunnedToday() { - List configs = configsRepository.findAll().stream().filter(cfg -> cfg.getKey().equals(LAST_RUN_TIME)).toList(); - if (configs.isEmpty()) { - return false; - } - LocalDateTime fromDB = LocalDateTime.parse(configs.get(0).getValue()); - return fromDB.format(DateTimeFormatter.ISO_LOCAL_DATE).equals(LocalDateTime.now().format(DateTimeFormatter.ISO_LOCAL_DATE)); - } - private void removeArchiveAndSource(LocalDate now) { new File(now + ".zip").delete(); deleteDirectory(new File(now.toString())); @@ -140,19 +86,6 @@ public class DownloadHeadlessController { return directoryToBeDeleted.delete(); } - private void sendArchive(StartParams params, LocalDate now) { - try { - new SendEmailService("smtp.gmail.com", 587, params.getFrom(), params.getToken()) - .sendMail(params.getFrom(), - params.getTo(),//"m.ryabyh@gmail.com,MEvRyabykh@sberbank.ru", - "Новая Выгрузка по торгам от " + now, - "Новая Выгрузка по торгам от " + now, - new File(now + ".zip")); - } catch (Exception e) { - logger.error(e.getMessage()); - } - } - private void sendArchive(StartParams params, LocalDate now, String to) { try { new SendEmailService("smtp.gmail.com", 587, params.getFrom(), params.getToken())