From 5654eed5c6ce97a219913757f1d9de3926a28688 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Wed, 20 Apr 2022 21:44:52 +0200
Subject: [PATCH] #663 - renamed ReportColumn fields that are reserved names in
mariadb
---
.../report/DestinationReportColumn.java | 6 ++--
.../reader/report/ReportColumnReader.java | 4 +--
.../reports/ReportGeneratorService.java | 6 ++--
.../reports/columns/ReportColumn.java | 30 +++++++++----------
.../columns/ReportColumnRepository.java | 6 ++--
.../reports/columns/ReportColumnService.java | 4 +--
.../reports/settings/ReportSettings.java | 4 +--
.../settings/ReportSettingsService.java | 2 +-
.../resources/templates/reports/reports.ftl | 4 +--
9 files changed, 34 insertions(+), 32 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 2fed3a234..6ded44721 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
@@ -24,9 +24,11 @@ public class DestinationReportColumn
private boolean activated;
- private String key;
+ @Column(name = "localization_key")
+ private String localizationKey;
- private Integer position;
+ @Column(name = "column_position")
+ private Integer columnPosition;
@Column(name = "referring_settings_id")
private Integer referringSettingsID = 1;
diff --git a/BudgetMasterDatabaseMigrator/src/main/java/de/deadlocker8/budgetmaster/databasemigrator/steps/reader/report/ReportColumnReader.java b/BudgetMasterDatabaseMigrator/src/main/java/de/deadlocker8/budgetmaster/databasemigrator/steps/reader/report/ReportColumnReader.java
index efc517cdd..bfc7cf1ed 100644
--- a/BudgetMasterDatabaseMigrator/src/main/java/de/deadlocker8/budgetmaster/databasemigrator/steps/reader/report/ReportColumnReader.java
+++ b/BudgetMasterDatabaseMigrator/src/main/java/de/deadlocker8/budgetmaster/databasemigrator/steps/reader/report/ReportColumnReader.java
@@ -38,8 +38,8 @@ public class ReportColumnReader extends BaseReader<DestinationReportColumn>
final DestinationReportColumn column = new DestinationReportColumn();
column.setID(rs.getInt(DatabaseColumns.ID));
column.setActivated(rs.getBoolean(DatabaseColumns.ACTIVATED));
- column.setKey(rs.getString(DatabaseColumns.KEY));
- column.setPosition(rs.getInt(DatabaseColumns.POSITION));
+ column.setLocalizationKey(rs.getString(DatabaseColumns.KEY));
+ column.setColumnPosition(rs.getInt(DatabaseColumns.POSITION));
return column;
}
}
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/ReportGeneratorService.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/ReportGeneratorService.java
index 383cf9791..2a3403a97 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/ReportGeneratorService.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/ReportGeneratorService.java
@@ -71,7 +71,7 @@ public class ReportGeneratorService
for(int i = 0; i < columns.size(); i++)
{
ReportColumn column = columns.get(i);
- proportions[i] = ColumnType.getByName(column.getKey()).getProportion();
+ proportions[i] = ColumnType.getByName(column.getLocalizationKey()).getProportion();
}
PdfPTable table = new PdfPTable(proportions);
@@ -136,7 +136,7 @@ public class ReportGeneratorService
for(ReportColumn column : columns)
{
- ColumnType columnType = ColumnType.getByName(column.getKey());
+ ColumnType columnType = ColumnType.getByName(column.getLocalizationKey());
PdfPCell cell = getTransactionTableCell(currentItem, columnType, index, font);
table.addCell(cell);
}
@@ -147,7 +147,7 @@ public class ReportGeneratorService
{
for(ReportColumn column : columns)
{
- ColumnType columnType = ColumnType.getByName(column.getKey());
+ ColumnType columnType = ColumnType.getByName(column.getLocalizationKey());
PdfPCell cell = new PdfPCell(new Phrase(columnType.getName(), font));
cell.setBackgroundColor(LIGHT_GRAY);
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/columns/ReportColumn.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/columns/ReportColumn.java
index 7614afcfd..596193871 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/columns/ReportColumn.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/columns/ReportColumn.java
@@ -11,18 +11,18 @@ public class ReportColumn
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Integer ID;
- private String key;
+ private String localizationKey;
private boolean activated;
- private int position;
+ private int columnPosition;
@ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
private ReportSettings referringSettings;
- public ReportColumn(String key, int position)
+ public ReportColumn(String localizationKey, int columnPosition)
{
- this.key = key;
+ this.localizationKey = localizationKey;
this.activated = true;
- this.position = position;
+ this.columnPosition = columnPosition;
}
public ReportColumn()
@@ -39,14 +39,14 @@ public class ReportColumn
this.ID = ID;
}
- public String getKey()
+ public String getLocalizationKey()
{
- return key;
+ return localizationKey;
}
- public void setKey(String key)
+ public void setLocalizationKey(String key)
{
- this.key = key;
+ this.localizationKey = key;
}
public boolean isActivated()
@@ -59,14 +59,14 @@ public class ReportColumn
this.activated = activated;
}
- public int getPosition()
+ public int getColumnPosition()
{
- return position;
+ return columnPosition;
}
- public void setPosition(int position)
+ public void setColumnPosition(int position)
{
- this.position = position;
+ this.columnPosition = position;
}
public ReportSettings getReferringSettings()
@@ -84,9 +84,9 @@ public class ReportColumn
{
return "ReportColumn{" +
"ID=" + ID +
- ", key='" + key + '\'' +
+ ", localizationKey='" + localizationKey + '\'' +
", activated=" + activated +
- ", position=" + position +
+ ", columnPosition=" + columnPosition +
'}';
}
}
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/columns/ReportColumnRepository.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/columns/ReportColumnRepository.java
index ed609f2c9..65a1ba6e4 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/columns/ReportColumnRepository.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/columns/ReportColumnRepository.java
@@ -7,9 +7,9 @@ import java.util.List;
public interface ReportColumnRepository extends JpaRepository<ReportColumn, Integer>
{
- List<ReportColumn> findAllByOrderByPositionAsc();
+ List<ReportColumn> findAllByOrderByColumnPositionAsc();
- ReportColumn findByKey(String key);
+ ReportColumn findByLocalizationKey(String key);
- ReportColumn findByPosition(int position);
+ ReportColumn findByColumnPosition(int position);
}
\ No newline at end of file
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/columns/ReportColumnService.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/columns/ReportColumnService.java
index f49e826bf..ce621a966 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/columns/ReportColumnService.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/columns/ReportColumnService.java
@@ -27,14 +27,14 @@ public class ReportColumnService
public void createDefaultsWithReportSettings(ReportSettings settings)
{
- if(reportColumnRepository.findAllByOrderByPositionAsc().size() != ColumnType.values().length)
+ if(reportColumnRepository.findAllByOrderByColumnPositionAsc().size() != ColumnType.values().length)
{
reportColumnRepository.deleteAllInBatch();
for(int i = 0; i < ColumnType.values().length; i++)
{
ColumnType currentType = ColumnType.values()[i];
- if(reportColumnRepository.findByKey(currentType.getKey()) == null)
+ if(reportColumnRepository.findByLocalizationKey(currentType.getKey()) == null)
{
reportColumnRepository.save(new ReportColumn(currentType.getKey(), i));
}
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/settings/ReportSettings.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/settings/ReportSettings.java
index 569cf8bd0..2688cdaf8 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/settings/ReportSettings.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/settings/ReportSettings.java
@@ -98,12 +98,12 @@ public class ReportSettings
public List<ReportColumn> getColumnsSorted()
{
- return columns.stream().sorted(Comparator.comparing(ReportColumn::getPosition)).toList();
+ return columns.stream().sorted(Comparator.comparing(ReportColumn::getColumnPosition)).toList();
}
public List<ReportColumn> getColumnsSortedAndFiltered()
{
- return columns.stream().filter(ReportColumn::isActivated).sorted(Comparator.comparing(ReportColumn::getPosition)).toList();
+ return columns.stream().filter(ReportColumn::isActivated).sorted(Comparator.comparing(ReportColumn::getColumnPosition)).toList();
}
public List<ReportColumn> getColumns()
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/settings/ReportSettingsService.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/settings/ReportSettingsService.java
index 287775cf9..64d483aae 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/settings/ReportSettingsService.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/settings/ReportSettingsService.java
@@ -37,7 +37,7 @@ public class ReportSettingsService
if(reportSettingsOptional.isEmpty())
{
ReportSettings reportSettings = ReportSettings.getDefault();
- for(ReportColumn reportColumn : reportColumnService.getRepository().findAllByOrderByPositionAsc())
+ for(ReportColumn reportColumn : reportColumnService.getRepository().findAllByOrderByColumnPositionAsc())
{
reportSettings.getColumns().add(reportColumn);
}
diff --git a/BudgetMasterServer/src/main/resources/templates/reports/reports.ftl b/BudgetMasterServer/src/main/resources/templates/reports/reports.ftl
index 90a77634c..bbd1e5f1e 100644
--- a/BudgetMasterServer/src/main/resources/templates/reports/reports.ftl
+++ b/BudgetMasterServer/src/main/resources/templates/reports/reports.ftl
@@ -81,10 +81,10 @@
<div class="columnName">
<label>
<input type="checkbox" class="columnName-checkbox" data-index="${column?index}" name="columns['${column?index}'].activated" <#if column.isActivated()>checked="checked"</#if>/>
- <span class="columnName-label">${locale.getString(column.getKey())}</span>
+ <span class="columnName-label">${locale.getString(column.getLocalizationKey())}</span>
</label>
<input type="hidden" name="columns['${column?index}'].ID" value="${column.getID()}"/>
- <input type="hidden" name="columns['${column?index}'].key" value="${column.getKey()}"/>
+ <input type="hidden" name="columns['${column?index}'].key" value="${column.getLocalizationKey()}"/>
<input type="hidden" name="columns['${column?index}'].position" value=""/>
</div>
</#list>
--
GitLab