diff --git a/BudgetMasterDatabaseMigrator/src/main/java/de/deadlocker8/budgetmaster/databasemigrator/destination/report/DestinationReportColumn.java b/BudgetMasterDatabaseMigrator/src/main/java/de/deadlocker8/budgetmaster/databasemigrator/destination/report/DestinationReportColumn.java index 225223ee8f72c614c302b37615d31f1c86b3b935..2fed3a234dade7d9e44f59d995ea5a37c7e27390 100644 --- a/BudgetMasterDatabaseMigrator/src/main/java/de/deadlocker8/budgetmaster/databasemigrator/destination/report/DestinationReportColumn.java +++ b/BudgetMasterDatabaseMigrator/src/main/java/de/deadlocker8/budgetmaster/databasemigrator/destination/report/DestinationReportColumn.java @@ -20,7 +20,6 @@ import javax.persistence.Table; public class DestinationReportColumn { @Id - private int ID; private boolean activated; diff --git a/BudgetMasterDatabaseMigrator/src/main/java/de/deadlocker8/budgetmaster/databasemigrator/steps/reader/report/ReportSettingsReader.java b/BudgetMasterDatabaseMigrator/src/main/java/de/deadlocker8/budgetmaster/databasemigrator/steps/reader/report/ReportSettingsReader.java index 956336e10949b29a995e20e9b4a78d6e097f7e3f..ad2e9f9d4e4118ac1c4e366f4f2ffb64d2e39cdb 100644 --- a/BudgetMasterDatabaseMigrator/src/main/java/de/deadlocker8/budgetmaster/databasemigrator/steps/reader/report/ReportSettingsReader.java +++ b/BudgetMasterDatabaseMigrator/src/main/java/de/deadlocker8/budgetmaster/databasemigrator/steps/reader/report/ReportSettingsReader.java @@ -37,7 +37,7 @@ public class ReportSettingsReader extends BaseReader<DestinationReportSettings> public DestinationReportSettings mapRow(ResultSet rs, int rowNum) throws SQLException { final DestinationReportSettings settings = new DestinationReportSettings(); - settings.setID(rs.getInt(DatabaseColumns.ID)); + settings.setID(1); settings.setDate(rs.getDate(DatabaseColumns.DATE).toLocalDate()); settings.setIncludeBudget(rs.getBoolean(DatabaseColumns.INCLUDE_BUDGET)); settings.setIncludeCategoryBudgets(rs.getBoolean(DatabaseColumns.INCLUDE_CATEGORY_BUDGETS)); diff --git a/BudgetMasterDatabaseMigrator/src/test/java/de/deadlocker8/budgetmaster/databasemigrator/MigrateReportSettingsTest.java b/BudgetMasterDatabaseMigrator/src/test/java/de/deadlocker8/budgetmaster/databasemigrator/MigrateReportSettingsTest.java index 6205a94933306b86251b71b2df8e680ccd2c3d8e..b0fe9e21cf7b2bbc47748d63c2db82e50a7e1cd3 100644 --- a/BudgetMasterDatabaseMigrator/src/test/java/de/deadlocker8/budgetmaster/databasemigrator/MigrateReportSettingsTest.java +++ b/BudgetMasterDatabaseMigrator/src/test/java/de/deadlocker8/budgetmaster/databasemigrator/MigrateReportSettingsTest.java @@ -63,7 +63,7 @@ class MigrateReportSettingsTest extends MigratorTestBase assertThat(stepExecution.getReadCount()).isEqualTo(1); assertThat(stepExecution.getCommitCount()).isEqualTo(2); - final DestinationReportSettings settings = new DestinationReportSettings(0, LocalDate.of(2022, 3, 15), true, true, true); + final DestinationReportSettings settings = new DestinationReportSettings(1, LocalDate.of(2022, 3, 15), true, true, true); final List<DestinationReportSettings> reportSettings = settingsRepository.findAll(); assertThat(reportSettings)