From 171bdbc5209cd3ba49d5c58b1fcaded129619b4c Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Sun, 17 Apr 2022 16:57:36 +0200
Subject: [PATCH] #663 - migrator: fixed report settings id
---
.../destination/report/DestinationReportColumn.java | 1 -
.../steps/reader/report/ReportSettingsReader.java | 2 +-
.../databasemigrator/MigrateReportSettingsTest.java | 2 +-
3 files changed, 2 insertions(+), 3 deletions(-)
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 225223ee8..2fed3a234 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 956336e10..ad2e9f9d4 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 6205a9493..b0fe9e21c 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)
--
GitLab