Skip to content
Snippets Groups Projects
Commit f2ecb0c7 authored by Robert Goldmann's avatar Robert Goldmann
Browse files

#663 - migrator: use LocalDate instead of String for dates for settings too

parent e75417a4
Branches
Tags
No related merge requests found
...@@ -8,6 +8,7 @@ import javax.persistence.Column; ...@@ -8,6 +8,7 @@ import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.Id; import javax.persistence.Id;
import javax.persistence.Table; import javax.persistence.Table;
import java.time.LocalDate;
@Entity @Entity
@Table(name = TableNames.SETTINGS) @Table(name = TableNames.SETTINGS)
...@@ -42,7 +43,7 @@ public class DestinationSettings ...@@ -42,7 +43,7 @@ public class DestinationSettings
private boolean backupReminderActivated; private boolean backupReminderActivated;
@Column(name = "last_backup_reminder_date") @Column(name = "last_backup_reminder_date")
private String lastBackupReminderDate; private LocalDate lastBackupReminderDate;
@Column(name = "search_items_per_page") @Column(name = "search_items_per_page")
private Integer searchItemsPerPage; private Integer searchItemsPerPage;
......
...@@ -60,7 +60,7 @@ public class SettingsReader extends BaseReader<DestinationSettings> ...@@ -60,7 +60,7 @@ public class SettingsReader extends BaseReader<DestinationSettings>
settings.setShowCategoriesAsCircles(rs.getBoolean(DatabaseColumns.SHOW_CATEGORIES_AS_CIRCLES)); settings.setShowCategoriesAsCircles(rs.getBoolean(DatabaseColumns.SHOW_CATEGORIES_AS_CIRCLES));
settings.setAutoUpdateCheckEnabled(rs.getBoolean(DatabaseColumns.AUTO_UPDATE_CHECK_ENABLED)); settings.setAutoUpdateCheckEnabled(rs.getBoolean(DatabaseColumns.AUTO_UPDATE_CHECK_ENABLED));
settings.setBackupReminderActivated(rs.getBoolean(DatabaseColumns.BACKUP_REMINDER_ACTIVATED)); 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.setSearchItemsPerPage(rs.getInt(DatabaseColumns.SEARCH_ITEMS_PER_PAGE));
settings.setAutoBackupStrategy(rs.getInt(DatabaseColumns.AUTO_BACKUP_STRATEGY)); settings.setAutoBackupStrategy(rs.getInt(DatabaseColumns.AUTO_BACKUP_STRATEGY));
......
...@@ -19,6 +19,7 @@ import org.springframework.core.io.Resource; ...@@ -19,6 +19,7 @@ import org.springframework.core.io.Resource;
import javax.sql.DataSource; import javax.sql.DataSource;
import java.io.IOException; import java.io.IOException;
import java.time.LocalDate;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -62,7 +63,7 @@ class MigrateSettingsTest extends MigratorTestBase ...@@ -62,7 +63,7 @@ class MigrateSettingsTest extends MigratorTestBase
assertThat(stepExecution.getReadCount()).isEqualTo(1); assertThat(stepExecution.getReadCount()).isEqualTo(1);
assertThat(stepExecution.getCommitCount()).isEqualTo(2); 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(); final List<DestinationSettings> settingsItems = settingsRepository.findAll();
assertThat(settingsItems) assertThat(settingsItems)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment