Merge pull request #596 from spacious-team/hotfix-2024.1.1

Релиз 2024.1.1

Author: vananiev

pom.xml

@@ -28,7 +28,7 @@
     </parent>
     <groupId>ru.investbook</groupId>
     <artifactId>investbook</artifactId>
-    <version>2024.1</version>
+    <version>2024.1.1</version>
 
     <name>investbook</name>
     <description>Investor Accounting Book</description>
@@ -62,7 +62,7 @@
 
     <properties>
         <!-- Valid version is (0-255).(0-255).(0-65535) -->
-        <win.msi.version>24.1</win.msi.version>
+        <win.msi.version>24.1.1</win.msi.version>
         <java.version>21</java.version>
     </properties>
 
@@ -96,12 +96,12 @@
         <dependency>
             <groupId>com.github.spacious-team</groupId>
             <artifactId>broker-report-parser-api</artifactId>
-            <version>2023.1</version>
+            <version>2024.1</version>
         </dependency>
         <dependency>
             <groupId>com.github.spacious-team</groupId>
             <artifactId>table-wrapper-spring-boot-starter</artifactId>
-            <version>2023.1</version>
+            <version>2024.1</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

src/main/java/ru/investbook/upgrade/SqlDataExporter.java

@@ -34,16 +34,16 @@
 @Service
 @RequiredArgsConstructor
 public class SqlDataExporter {
-    private static final String EXPORT_FILE_NAME = "export-2022.9.sql";
-    private final String expectedInvestbookVersionsForExport = "2022.9";
+    private static final String INVESTBOOK_VERSION_PREFIX_FOR_EXPORT = "2024.1.";
+    private static final String EXPORT_FILE_NAME = "export-2024.1.x.sql";
     private final BuildProperties buildProperties;
     private final InvestbookProperties investbookProperties;
     private final JdbcTemplate jdbcTemplate;
 
     @PreDestroy
     public void preDestroy() {
         String version = buildProperties.getVersion();
-        if (version.startsWith(expectedInvestbookVersionsForExport)) {
+        if (version.startsWith(INVESTBOOK_VERSION_PREFIX_FOR_EXPORT)) {
             Path file = investbookProperties.getDataPath()
                     .resolve(EXPORT_FILE_NAME)
                     .toAbsolutePath();
@@ -54,6 +54,7 @@ public void preDestroy() {
     private void exportSqlData(Path file) {
         try {
             Instant t0 = Instant.now();
+            // DROP is required to delete tables created by Flyway
             jdbcTemplate.execute("SCRIPT DROP TO '" + file + "' CHARSET 'UTF-8'");
             Instant t1 = Instant.now();
             log.info("Экспорт БД в файл '{}' завершен за {}", file, Duration.between(t0, t1));