diff --git a/BudgetMasterDatabaseMigrator/src/main/java/de/deadlocker8/budgetmaster/databasemigrator/destination/settings/DestinationSettings.java b/BudgetMasterDatabaseMigrator/src/main/java/de/deadlocker8/budgetmaster/databasemigrator/destination/settings/DestinationSettings.java index 5409feb014a48d57f59f991afbd316e43c87612f..c0850b41a92c89416942e100648b6869c33b8584 100644 --- a/BudgetMasterDatabaseMigrator/src/main/java/de/deadlocker8/budgetmaster/databasemigrator/destination/settings/DestinationSettings.java +++ b/BudgetMasterDatabaseMigrator/src/main/java/de/deadlocker8/budgetmaster/databasemigrator/destination/settings/DestinationSettings.java @@ -8,6 +8,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; +import java.time.LocalDate; @Entity @Table(name = TableNames.SETTINGS) @@ -42,7 +43,7 @@ public class DestinationSettings private boolean backupReminderActivated; @Column(name = "last_backup_reminder_date") - private String lastBackupReminderDate; + private LocalDate lastBackupReminderDate; @Column(name = "search_items_per_page") private Integer searchItemsPerPage; diff --git a/BudgetMasterDatabaseMigrator/src/main/java/de/deadlocker8/budgetmaster/databasemigrator/steps/reader/SettingsReader.java b/BudgetMasterDatabaseMigrator/src/main/java/de/deadlocker8/budgetmaster/databasemigrator/steps/reader/SettingsReader.java index 79d4468afa49ba724b48d3bf3d70b542577921a6..485b30ba9d87b9b925001e99bb27e289914aea71 100644 --- a/BudgetMasterDatabaseMigrator/src/main/java/de/deadlocker8/budgetmaster/databasemigrator/steps/reader/SettingsReader.java +++ b/BudgetMasterDatabaseMigrator/src/main/java/de/deadlocker8/budgetmaster/databasemigrator/steps/reader/SettingsReader.java @@ -60,7 +60,7 @@ public class SettingsReader extends BaseReader<DestinationSettings> settings.setShowCategoriesAsCircles(rs.getBoolean(DatabaseColumns.SHOW_CATEGORIES_AS_CIRCLES)); settings.setAutoUpdateCheckEnabled(rs.getBoolean(DatabaseColumns.AUTO_UPDATE_CHECK_ENABLED)); settings.setBackupReminderActivated(rs.getBoolean(DatabaseColumns.BACKUP_REMINDER_ACTIVATED)); - settings.setLastBackupReminderDate(rs.getString(DatabaseColumns.LAST_BACKUP_REMINDER_DATE)); + settings.setLastBackupReminderDate(rs.getDate(DatabaseColumns.LAST_BACKUP_REMINDER_DATE).toLocalDate()); settings.setSearchItemsPerPage(rs.getInt(DatabaseColumns.SEARCH_ITEMS_PER_PAGE)); settings.setAutoBackupStrategy(rs.getInt(DatabaseColumns.AUTO_BACKUP_STRATEGY)); diff --git a/BudgetMasterDatabaseMigrator/src/test/java/de/deadlocker8/budgetmaster/databasemigrator/MigrateSettingsTest.java b/BudgetMasterDatabaseMigrator/src/test/java/de/deadlocker8/budgetmaster/databasemigrator/MigrateSettingsTest.java index ed58feb0ec510de8f228dcada2a749d633b86bec..d058463649750ca9e1932e7d8d18374199b191bf 100644 --- a/BudgetMasterDatabaseMigrator/src/test/java/de/deadlocker8/budgetmaster/databasemigrator/MigrateSettingsTest.java +++ b/BudgetMasterDatabaseMigrator/src/test/java/de/deadlocker8/budgetmaster/databasemigrator/MigrateSettingsTest.java @@ -19,6 +19,7 @@ import org.springframework.core.io.Resource; import javax.sql.DataSource; import java.io.IOException; +import java.time.LocalDate; import java.util.ArrayList; import java.util.List; @@ -62,7 +63,7 @@ class MigrateSettingsTest extends MigratorTestBase assertThat(stepExecution.getReadCount()).isEqualTo(1); assertThat(stepExecution.getCommitCount()).isEqualTo(2); - final DestinationSettings settings = new DestinationSettings(1, "€", false, 1, false, true, true, true, "2022-03-15", 10, 0, 1, 0, 3, "", "", "", "", 35, false); + final DestinationSettings settings = new DestinationSettings(1, "€", false, 1, false, true, true, true, LocalDate.of(2022, 3, 15), 10, 0, 1, 0, 3, "", "", "", "", 35, false); final List<DestinationSettings> settingsItems = settingsRepository.findAll(); assertThat(settingsItems)