From edcaed1b1ac2b80e3b50b96ab4b1a01b93e27db1 Mon Sep 17 00:00:00 2001
From: Thomas Peetz <thomas.peetz@cimt-ag.de>
Date: Mon, 19 May 2025 14:34:26 +0200
Subject: [PATCH] fix problem when adding columns

---
 .../de/thpeetz/kontor/admin/services/MetaDataService.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/admin/services/MetaDataService.java b/kontor-spring/src/main/java/de/thpeetz/kontor/admin/services/MetaDataService.java
index 89da070..a60829d 100644
--- a/kontor-spring/src/main/java/de/thpeetz/kontor/admin/services/MetaDataService.java
+++ b/kontor-spring/src/main/java/de/thpeetz/kontor/admin/services/MetaDataService.java
@@ -111,7 +111,10 @@ public class MetaDataService {
     public void getColumn(MetaDataTable table, String columnName, String columnSyncName, String columnType, String columnModifier, Integer columnOrder, Boolean isShown, String columnLabel, Boolean showFilter, String filterLabel, String refColumn) {
         log.info("check if column {} of table {} exists", columnName, table.getTableName());
         boolean columnNameExists = table.getTableColumns().stream().anyMatch(column -> column.getColumnName().equals(columnName));
-        boolean columnOrderExists = table.getTableColumns().get(columnOrder-1) != null;
+        boolean columnOrderExists = false;
+        if (table.getTableColumns().size() > columnOrder-1) {
+            columnOrderExists = table.getTableColumns().get(columnOrder-1) != null;
+        }
         List<MetaDataColumn> metaDataColumns = metaDataColumnRepository.findByTableAndColumnName(table, columnName);
         log.debug("column found: name: {}, order: {}:  table.columns: {}", columnNameExists, columnOrderExists, metaDataColumns);
         if (columnOrderExists) {