From f1f2d02266426878ab5acd143ee934c265d1150f Mon Sep 17 00:00:00 2001
From: Kilian Schuettler <kilian.schuettler@knecon.com>
Date: Fri, 15 Nov 2024 16:28:13 +0100
Subject: [PATCH] RED-9139-pageOrderHotfix

---
 .../redaction/v1/server/mapper/DocumentDataMapper.java |  2 ++
 .../v1/server/mapper/DocumentGraphMapper.java          | 10 ++++------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/redaction-service-v1/document/src/main/java/com/iqser/red/service/redaction/v1/server/mapper/DocumentDataMapper.java b/redaction-service-v1/document/src/main/java/com/iqser/red/service/redaction/v1/server/mapper/DocumentDataMapper.java
index 6255a6b4..bd634a2d 100644
--- a/redaction-service-v1/document/src/main/java/com/iqser/red/service/redaction/v1/server/mapper/DocumentDataMapper.java
+++ b/redaction-service-v1/document/src/main/java/com/iqser/red/service/redaction/v1/server/mapper/DocumentDataMapper.java
@@ -2,6 +2,7 @@ package com.iqser.red.service.redaction.v1.server.mapper;
 
 import java.awt.geom.Rectangle2D;
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -60,6 +61,7 @@ public class DocumentDataMapper {
 
         List<DocumentPage> documentPageData = document.getPages()
                 .stream()
+                .sorted(Comparator.comparingInt(Page::getNumber))
                 .map(DocumentDataMapper::toPageData)
                 .toList();
 
diff --git a/redaction-service-v1/document/src/main/java/com/iqser/red/service/redaction/v1/server/mapper/DocumentGraphMapper.java b/redaction-service-v1/document/src/main/java/com/iqser/red/service/redaction/v1/server/mapper/DocumentGraphMapper.java
index 7faa7423..d1a23ce2 100644
--- a/redaction-service-v1/document/src/main/java/com/iqser/red/service/redaction/v1/server/mapper/DocumentGraphMapper.java
+++ b/redaction-service-v1/document/src/main/java/com/iqser/red/service/redaction/v1/server/mapper/DocumentGraphMapper.java
@@ -44,11 +44,6 @@ public class DocumentGraphMapper {
         DocumentTree documentTree = new DocumentTree(document);
         Context context = new Context(documentData, documentTree);
 
-        context.pageData.addAll(documentData.getDocumentPages().getDocumentPagesList()
-                                        .stream()
-                                        .map(DocumentGraphMapper::buildPage)
-                                        .toList());
-
         context.documentTree.getRoot().getChildren().addAll(buildEntries(documentData.getDocumentStructure().getRoot().getChildrenList(), context));
 
         document.setDocumentTree(context.documentTree);
@@ -227,7 +222,10 @@ public class DocumentGraphMapper {
         Context(DocumentData documentData, DocumentTree documentTree) {
 
             this.documentTree = documentTree;
-            this.pageData = new ArrayList<>();
+            this.pageData = documentData.getDocumentPages().getDocumentPagesList()
+                    .stream()
+                    .map(DocumentGraphMapper::buildPage)
+                    .toList();
             this.documentTextData = documentData.getDocumentTextData();
             this.documentPositionData = documentData.getDocumentPositionData();