Merge pull request #880 from Daimler/feature-877-bugfix-old-reports-n…

…ot-fetchable Feature 877 bugfix old reports not fetchable
mercedes-benz · Nov 8, 2021 · 26ef8bd · 26ef8bd
2 parents 5810a49 + 372dc14
commit 26ef8bd
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/sechub-scan/src/main/java/com/daimler/sechub/domain/scan/report/ScanReport.java b/sechub-scan/src/main/java/com/daimler/sechub/domain/scan/report/ScanReport.java
@@ -59,6 +59,7 @@ public class ScanReport {
     @Column(name = COLUMN_RESULT)
     private String result;
 
+    @Enumerated(STRING)
     @Column(name = COLUMN_RESULT_TYPE)
     private ScanReportResultType resultType;
 

diff --git a/sechub-server/src/main/resources/db/migration/U14__sechub_report_type_bugfix2.sql b/sechub-server/src/main/resources/db/migration/U14__sechub_report_type_bugfix2.sql
@@ -0,0 +1,2 @@
+-- Undo / revert string enum to (wrong) integer representation
+UPDATE scan_report SET result_type ='1' WHERE result_type ='MODEL';
diff --git a/sechub-server/src/main/resources/db/migration/V14__sechub_report_type_bugfix.sql b/sechub-server/src/main/resources/db/migration/V14__sechub_report_type_bugfix.sql
@@ -0,0 +1,4 @@
+-- 0.27.0-server and 0.27.1-sesrver did store result enum values accidently as integers instead
+-- using string representation - this was fixed already, but we must clean up wrong created entries 
+-- here as well (new reports only, old ones where already migrated to 'RESULT' )
+UPDATE scan_report SET result_type ='MODEL' WHERE result_type ='1';
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		-- Undo / revert string enum to (wrong) integer representation
		UPDATE scan_report SET result_type ='1' WHERE result_type ='MODEL';