Add support to TableName and ColumnName of Report

adempiere · Sep 13, 2024 · 9d3f1d4 · 9d3f1d4
1 parent f71af1d
commit 9d3f1d4
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 2 deletions.
diff --git a/.settings/org.eclipse.buildship.core.prefs b/.settings/org.eclipse.buildship.core.prefs
@@ -1,7 +1,7 @@
-arguments=--init-script /home/yamel/.config/Code/User/globalStorage/redhat.java/1.32.0/config_linux/org.eclipse.osgi/55/0/.cp/gradle/init/init.gradle --init-script /home/yamel/.config/Code/User/globalStorage/redhat.java/1.32.0/config_linux/org.eclipse.osgi/55/0/.cp/gradle/protobuf/init.gradle
+arguments=--init-script /home/yamel/.config/Code/User/globalStorage/redhat.java/1.34.0/config_linux/org.eclipse.osgi/55/0/.cp/gradle/init/init.gradle --init-script /home/yamel/.config/Code/User/globalStorage/redhat.java/1.34.0/config_linux/org.eclipse.osgi/55/0/.cp/gradle/protobuf/init.gradle
 auto.sync=false
 build.scans.enabled=false
-connection.gradle.distribution=GRADLE_DISTRIBUTION(VERSION(8.1.1))
+connection.gradle.distribution=GRADLE_DISTRIBUTION(VERSION(8.9))
 connection.project.dir=
 eclipse.preferences.version=1
 gradle.user.home=

diff --git a/docker-compose/envoy/definitions/adempiere-report-engine-service.dsc b/docker-compose/envoy/definitions/adempiere-report-engine-service.dsc
diff --git a/src/main/java/org/spin/report_engine/data/ColumnInfo.java b/src/main/java/org/spin/report_engine/data/ColumnInfo.java
@@ -39,9 +39,11 @@ public class ColumnInfo {
 	private String fontCode;
 	private String mappingClassName;
 	private PrintFormatItem item;
+	private String columnName;
 
 
 	private ColumnInfo(PrintFormatItem item) {
+		this.columnName = item.getColumnName();
 		this.title = item.getPrintText();
 		this.printFormatItemId = item.getPrintFormatItemId();
 		this.code = String.valueOf(item.getPrintFormatItemId());
@@ -64,6 +66,15 @@ public PrintFormatItem getPrintformatItem() {
 		return item;
 	}
 
+	public String getColumnName() {
+		return columnName;
+	}
+
+	public ColumnInfo withColumnName(String columnName) {
+		this.columnName = columnName;
+		return this;
+	}
+
 	public String getMappingClassName() {
 		return mappingClassName;
 	}

diff --git a/src/main/java/org/spin/report_engine/data/ReportInfo.java b/src/main/java/org/spin/report_engine/data/ReportInfo.java
@@ -60,6 +60,7 @@ public class ReportInfo {
 	private long recordCount;
 	private int instanceId;
 	private PrintFormat printFormat;
+	private String tableName;
 
 	private ReportInfo(PrintFormat printFormat, QueryDefinition queryDefinition) {
 		this.printFormat = printFormat;
@@ -80,6 +81,7 @@ private ReportInfo(PrintFormat printFormat, QueryDefinition queryDefinition) {
 		sortingItems = printFormat.getSortingItems();
 		printFormatId = printFormat.getPrintFormatId();
 		this.queryDefinition = queryDefinition;
+		this.tableName = printFormat.getTableName();
 	}
 
 	public static ReportInfo newInstance(PrintFormat printFormat, QueryDefinition queryDefinition) {
@@ -90,6 +92,15 @@ public Map<Integer, PrintFormatItem> getGroupLevels() {
 		return groupLevels;
 	}
 
+	public String getTableName() {
+		return tableName;
+	}
+
+	public ReportInfo withTableName(String tableName) {
+		this.tableName = tableName;
+		return this;
+	}
+
 	public QueryDefinition getQueryDefinition() {
 		return queryDefinition;
 	}

diff --git a/src/main/java/org/spin/report_engine/service/Service.java b/src/main/java/org/spin/report_engine/service/Service.java
@@ -220,6 +220,7 @@ private static Report.Builder convertReport(ReportInfo reportInfo, int limit, in
 		.setReportViewId(reportInfo.getReportViewId())
 		.setRecordCount(reportInfo.getRecordCount())
 		.setInstanceId(reportInfo.getInstanceId())
+		.setTableName(ValueManager.validateNull(reportInfo.getTableName()))
 		.addAllColumns(
 				reportInfo.getColumns().stream().map(
 						column -> ReportColumn.newBuilder()
@@ -228,6 +229,7 @@ private static Report.Builder convertReport(ReportInfo reportInfo, int limit, in
 						.setColor(ValueManager.validateNull(column.getColor()))
 						.setStyle(ValueManager.validateNull(column.getStyle()))
 						.setFontCode(ValueManager.validateNull(column.getFontCode()))
+						.setColumnName(ValueManager.validateNull(column.getColumnName()))
 						.setIsFixedWidth(column.isFixedWidth())
 						.setColumnWidth(column.getColumnWidth())
 						.setColumnCharactersSize(column.getColumnCharactersSize())

diff --git a/src/main/proto/service/report_engine.proto b/src/main/proto/service/report_engine.proto
@@ -82,6 +82,7 @@ message Report {
 	repeated ReportRow rows = 8;
 	string next_page_token = 9;
 	int32 instance_id = 10;
+	string table_name = 11;
 }
 
 message ReportColumn {
@@ -96,6 +97,7 @@ message ReportColumn {
 	int32 column_characters_size = 9;
 	bool is_fixed_width = 10;
 	string font_code = 11;
+	string column_name = 12;
 }
 
 message ReportRow {