Kelebro/TelegaBot
1
0
Fork 0
forked from Sanders/TelegaBot
Code Pull Requests Activity

Small fixes

Browse Source
This commit is contained in:
Sanders
2025-02-16 19:26:43 +03:00
parent 505307883a
commit ed09bcc549
2 changed files with 27 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/ru/cathub/telegabot/service/impl/BookCreationServiceImpl.java
+26 -20
View File
@@ -2,7 +2,9 @@ package ru.cathub.telegabot.service.impl;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.hibernate.Hibernate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import ru.cathub.telegabot.model.Book;
import ru.cathub.telegabot.model.BookCreationCache;
import ru.cathub.telegabot.model.TextRole;
@@ -42,6 +44,7 @@ public class BookCreationServiceImpl implements BookCreationService {
}
}
@Transactional
@Override
public void handleExistingAddCache(BotUser user, String text) {
BookCreationCache cache = bookCacheService.getCache(user.getId());
@@ -91,9 +94,28 @@ public class BookCreationServiceImpl implements BookCreationService {
bookCacheService.clearCache(user.getId());
// Отправляем подтверждение
String message = String.format("✅ Книга успешно добавлена!\n\n%s",
String message = String.format("✅ Книга успешно добавлена\\!\n\n%s",
bookCommonService.formatBookDetails(book));
telegramClientService.sendMessageWithMarkdown(user, message);
// Формируем статистику
LocalDate today = LocalDate.now();
LocalDate endOfYear = LocalDate.of(today.getYear(), 12, 31);
long weeksLeft = ChronoUnit.WEEKS.between(today, endOfYear);
int target = user.getBooksToRead() != null ? user.getBooksToRead() : 0;
int read = user.getBooks() != null ? user.getBooks().size() : 0;
int left = target - read;
String stats = String.format(
"\n\n📊 *Статистика:*\n" +
"⏳ До конца года: %d недель\n" +
"🎯 Цель: %d книг\n" +
"✅ Прочитано: %d\n" +
"📖 Осталось: %d",
weeksLeft, target, read, left > 0 ? left : 0
);
telegramClientService.sendMessageWithMarkdown(user, message + stats);
// Генерируем и отправляем поздравление
try {
@@ -106,25 +128,9 @@ public class BookCreationServiceImpl implements BookCreationService {
TextRole.DEFAULT
);
// Формируем статистику
LocalDate today = LocalDate.now();
LocalDate endOfYear = LocalDate.of(today.getYear(), 12, 31);
long weeksLeft = ChronoUnit.WEEKS.between(today, endOfYear);
int target = user.getBooksToRead() != null ? user.getBooksToRead() : 0;
int read = user.getBooks() != null ? user.getBooks().size() : 0;
int left = target - read;
String stats = String.format(
"\n\n📊 *Статистика:*\n" +
"⏳ До конца года: %d недель\n" +
"🎯 Цель: %d книг\n" +
"✅ Прочитано: %d\n" +
"📖 Осталось: %d",
weeksLeft, target, read, left > 0 ? left : 0
);
telegramClientService.sendMessageWithMarkdown(user, "🎉 *Поздравляю с прочтением!*\n\n" + congrat + stats);
telegramClientService.sendMessageWithMarkdown(user, "🎉 *Поздравляю с прочтением!*\n\n" + congrat);
} catch (Exception e) {
log.error("Error generating congratulation for user {}", user.getId(), e);
telegramClientService.sendMessage(user, "📚 Спасибо за добавление книги!");
src/main/java/ru/cathub/telegabot/service/impl/TelegramClientServiceImps.java
+1 -1
View File
@@ -77,7 +77,7 @@ public class TelegramClientServiceImps implements TelegramClientService {
return telegramClient.execute(message);
} catch (TelegramApiException e) {
//logger.error("Ошибка отправки сообщения", e);
throw new RuntimeException(e);
throw new RuntimeException(e);
}
}