From 4d912b6bc99687852babf4e5f9e5fa7331187feb Mon Sep 17 00:00:00 2001
From: Sanders <Sanderrrs@gmail.com>
Date: Sun, 16 Feb 2025 17:53:09 +0300
Subject: [PATCH] Small fixes

---
 .run/TelegaBotApplication.run.xml               | 17 +++++++++++++++++
 Dockerfile                                      |  1 +
 .../service/impl/BookEditingServiceImpl.java    |  4 ++++
 .../service/impl/BookManageServiceImpl.java     |  5 +++++
 .../cathub/telegabot/utils/BookFormatUtils.java |  2 +-
 .../resources/application-secrets.properties    | 12 ------------
 src/main/resources/application.properties       | 13 +++++++++++++
 7 files changed, 41 insertions(+), 13 deletions(-)
 create mode 100644 .run/TelegaBotApplication.run.xml

diff --git a/.run/TelegaBotApplication.run.xml b/.run/TelegaBotApplication.run.xml
new file mode 100644
index 0000000..2d835d4
--- /dev/null
+++ b/.run/TelegaBotApplication.run.xml
@@ -0,0 +1,17 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="TelegaBotApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" nameIsGenerated="true">
+    <envs>
+      <env name="BOT_NAME" value="TelegaBot" />
+      <env name="BOT_TOKEN" value="6327661839:AAEb3TpttDK2ladUKD_FlhX9VAgVpGPdPE0" />
+      <env name="DB_PASSWORD" value="Vftrixpo05" />
+      <env name="DB_URL" value="jdbc:postgresql://192.168.0.10:5432/telegabot" />
+      <env name="DB_USER" value="postgres" />
+      <env name="OPENROUTER_API_KEY" value="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" />
+    </envs>
+    <module name="TelegaBot.main" />
+    <option name="SPRING_BOOT_MAIN_CLASS" value="ru.cathub.telegabot.TelegaBotApplication" />
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 5c3308e..7acb2ff 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,6 +19,7 @@ ENV SPRING_DATASOURCE_USERNAME=${DB_USER}
 ENV SPRING_DATASOURCE_PASSWORD=${DB_PASSWORD}
 ENV BOT_TOKEN=${BOT_TOKEN}
 ENV BOT_NAME=${BOT_NAME}
+ENV OPENROUTER_API_KEY=${OPENROUTER_API_KEY}
 
 EXPOSE 8080
 ENTRYPOINT ["java","-Dspring.config.location=classpath:/,file:./","-jar","app.jar"]
diff --git a/src/main/java/ru/cathub/telegabot/service/impl/BookEditingServiceImpl.java b/src/main/java/ru/cathub/telegabot/service/impl/BookEditingServiceImpl.java
index 7fc9b1a..093c986 100644
--- a/src/main/java/ru/cathub/telegabot/service/impl/BookEditingServiceImpl.java
+++ b/src/main/java/ru/cathub/telegabot/service/impl/BookEditingServiceImpl.java
@@ -8,6 +8,10 @@ import ru.cathub.telegabot.model.Book;
 import ru.cathub.telegabot.model.BookEditStateCache;
 import ru.cathub.telegabot.model.BotUser;
 import ru.cathub.telegabot.repository.BookRepository;
+
+import java.sql.Date;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.Optional;
 
 import ru.cathub.telegabot.repository.UserRepository;
diff --git a/src/main/java/ru/cathub/telegabot/service/impl/BookManageServiceImpl.java b/src/main/java/ru/cathub/telegabot/service/impl/BookManageServiceImpl.java
index 3002ed0..e965e63 100644
--- a/src/main/java/ru/cathub/telegabot/service/impl/BookManageServiceImpl.java
+++ b/src/main/java/ru/cathub/telegabot/service/impl/BookManageServiceImpl.java
@@ -74,6 +74,8 @@ public class BookManageServiceImpl implements BookManageService {
                             bookEditingService.updateBookAuthor(user, text);
                         case EDITING_RATING -> 
                             bookEditingService.updateBookRating(user, text);
+                        case EDITING_DATE ->
+                            bookEditingService.updateBookDate(user, text);
                         case CHOOSING_FIELD -> {} // No action needed
                     }
                 }
@@ -114,6 +116,9 @@ public class BookManageServiceImpl implements BookManageService {
                 case "BOOK_EDIT_RATING":
                     bookEditingService.handleEditRating(user);
                     break;
+                case "BOOK_EDIT_DATE":
+                    bookEditingService.handleEditDate(user);
+                    break;
                 case "BOOK_EDIT_CANCEL":
                     // cancelEditing(user);
                     break;
diff --git a/src/main/java/ru/cathub/telegabot/utils/BookFormatUtils.java b/src/main/java/ru/cathub/telegabot/utils/BookFormatUtils.java
index 1d94238..c52cd6c 100644
--- a/src/main/java/ru/cathub/telegabot/utils/BookFormatUtils.java
+++ b/src/main/java/ru/cathub/telegabot/utils/BookFormatUtils.java
@@ -18,7 +18,7 @@ public class BookFormatUtils {
             getBookIcon(index),
             escapeMarkdown(book.getTitle()),
             escapeMarkdown(book.getAuthor()),
-            formatDate(book.getReadDate()),
+            escapeMarkdown(formatDate(book.getReadDate())),
             escapeMarkdown(formatRating(book.getRating())));
     }
 
diff --git a/src/main/resources/application-secrets.properties b/src/main/resources/application-secrets.properties
index 6c7fa22..e69de29 100644
--- a/src/main/resources/application-secrets.properties
+++ b/src/main/resources/application-secrets.properties
@@ -1,12 +0,0 @@
-
-# Telegram configuration
-bot.token=${BOT_TOKEN}
-bot.name=${BOT_NAME}
-
-# Database configuration
-spring.datasource.url=${DB_URL}
-spring.datasource.username=${DB_USER}
-spring.datasource.password=${DB_PASSWORD}
-
-# OpenRouter AI
-openrouter.api.key=${OPENROUTER_API_KEY}
\ No newline at end of file
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 195e0e3..47627c6 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -35,3 +35,16 @@ logging.level.org.springframework.cache=INFO
 openrouter.api.url=https://openrouter.ai/api/v1
 openrouter.api.model=deepseek/deepseek-r1-distill-qwen-32b
 # Для безопасности лучше установить через переменную окружения:
+
+
+# Telegram configuration
+bot.token=${BOT_TOKEN}
+bot.name=${BOT_NAME}
+
+# Database configuration
+spring.datasource.url=${DB_URL}
+spring.datasource.username=${DB_USER}
+spring.datasource.password=${DB_PASSWORD}
+
+# OpenRouter AI
+openrouter.api.key=${OPENROUTER_API_KEY}
\ No newline at end of file