From bd86379d074f368daff3c36145b57d17449f9afa Mon Sep 17 00:00:00 2001
From: Thomas Peetz <thomas.peetz@ingenieurbuero-peetz.de>
Date: Mon, 19 May 2025 15:14:29 +0200
Subject: [PATCH] add missing fields for comic

---
 kontor-api/src/db/models/comic.py                            | 1 +
 kontor-scripts/db/models/comic.py                            | 1 +
 kontor-scripts/db/schemas/metadata.py                        | 2 +-
 .../main/java/de/thpeetz/kontor/admin/SetupModuleAdmin.java  | 5 +++--
 .../de/thpeetz/kontor/admin/services/MetaDataService.java    | 5 +++--
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/kontor-api/src/db/models/comic.py b/kontor-api/src/db/models/comic.py
index f59da22..e5e3851 100644
--- a/kontor-api/src/db/models/comic.py
+++ b/kontor-api/src/db/models/comic.py
@@ -15,6 +15,7 @@ class Publisher(Base):
     last_modified_date: Mapped[datetime] = mapped_column(default=func.now())
     version: Mapped[int] = mapped_column(default=0)
     name = Column(String, unique=True)
+    weblink = Column(String, nullable=True)
     parent_publisher_id: Mapped[Optional[str]] = mapped_column(ForeignKey('publisher.id'))
     parent_publisher: Mapped[Optional['Publisher']] = relationship("Publisher", back_populates="imprints", remote_side=[id])
     imprints: Mapped[List['Publisher']] = relationship('Publisher', back_populates="parent_publisher")
diff --git a/kontor-scripts/db/models/comic.py b/kontor-scripts/db/models/comic.py
index 3dfdd11..5e92caa 100644
--- a/kontor-scripts/db/models/comic.py
+++ b/kontor-scripts/db/models/comic.py
@@ -14,6 +14,7 @@ class Publisher(Base):
     last_modified_date: Mapped[datetime] = mapped_column(default=func.now())
     version: Mapped[int] = mapped_column(default=0)
     name = Column(String, unique=True)
+    weblink = Column(String, nullable=True)
     parent_publisher_id: Mapped[Optional[str]] = mapped_column(ForeignKey('publisher.id'))
     parent_publisher: Mapped[Optional['Publisher']] = relationship("Publisher", back_populates="imprints", remote_side=[id])
     imprints: Mapped[List['Publisher']] = relationship('Publisher', back_populates="parent_publisher")
diff --git a/kontor-scripts/db/schemas/metadata.py b/kontor-scripts/db/schemas/metadata.py
index 8986fa9..cdc1051 100644
--- a/kontor-scripts/db/schemas/metadata.py
+++ b/kontor-scripts/db/schemas/metadata.py
@@ -9,7 +9,7 @@ class MetaDataTableResponse(BaseModel):
 class MetaDataColumnResponse(BaseModel):
     id: str
     name: str
-    label: str
+    label: str | None
     order: PositiveInt
     ref_column: str | None
     column_type: str
diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/admin/SetupModuleAdmin.java b/kontor-spring/src/main/java/de/thpeetz/kontor/admin/SetupModuleAdmin.java
index be28ecd..5cdf02e 100644
--- a/kontor-spring/src/main/java/de/thpeetz/kontor/admin/SetupModuleAdmin.java
+++ b/kontor-spring/src/main/java/de/thpeetz/kontor/admin/SetupModuleAdmin.java
@@ -179,14 +179,15 @@ public class SetupModuleAdmin implements ApplicationListener<ContextRefreshedEve
         metaDataService.getColumn(artistTable, "last_modified_date", "modified", "TIMESTAMP", null, 3, Boolean.FALSE, "", Boolean.FALSE, null);
         metaDataService.getColumn(artistTable, "version", "version", "LONG", null, 4, Boolean.FALSE, "", Boolean.FALSE, null);
         metaDataService.getColumn(artistTable, "name", "name", "TEXT", "UNIQUE", 5, Boolean.FALSE, "", Boolean.FALSE, null);
-        metaDataService.getColumn(artistTable, "weblink", "weblink", "TEXT", null, 9, Boolean.TRUE, "Link", Boolean.FALSE, null);
+        metaDataService.getColumn(artistTable, "weblink", "weblink", "TEXT", null, 6, Boolean.TRUE, "Link", Boolean.FALSE, null);
         MetaDataTable publisherTable = metaDataService.getTable("publisher");
         metaDataService.getColumn(publisherTable, "id", "identifier", "TEXT", "PRIMARY KEY", 1, Boolean.TRUE, "", Boolean.FALSE, null);
         metaDataService.getColumn(publisherTable, "created_date", "created", "TIMESTAMP", null, 2, Boolean.FALSE, "", Boolean.FALSE, null);
         metaDataService.getColumn(publisherTable, "last_modified_date", "modified", "TIMESTAMP", null, 3, Boolean.FALSE, "", Boolean.FALSE, null);
         metaDataService.getColumn(publisherTable, "version", "version", "LONG", null, 4, Boolean.FALSE, "", Boolean.FALSE, null);
         metaDataService.getColumn(publisherTable, "name", "name", "TEXT", "UNIQUE", 5, Boolean.TRUE, "", Boolean.FALSE, null);
-        metaDataService.getColumn(publisherTable, "parent_publisher_id", "parent_publisher_id", "TEXT", null, 6, Boolean.TRUE, "Parent Company", Boolean.FALSE, null, "name");
+        metaDataService.getColumn(publisherTable, "weblink", "weblink", "TEXT", null, 6, Boolean.TRUE, "Link", Boolean.FALSE, null);
+        metaDataService.getColumn(publisherTable, "parent_publisher_id", "parent_publisher_id", "TEXT", null, 7, Boolean.TRUE, "Parent Company", Boolean.FALSE, null, "name");
         MetaDataTable comicTable = metaDataService.getTable("comic");
         metaDataService.getColumn(comicTable, "id", "identifier", "TEXT", "PRIMARY KEY", 1, Boolean.TRUE, "ID", Boolean.FALSE, null);
         metaDataService.getColumn(comicTable, "created_date", "created", "TIMESTAMP", null, 2, Boolean.FALSE, "", Boolean.FALSE, null);
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 a60829d..99520e4 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
@@ -122,11 +122,11 @@ public class MetaDataService {
             checkColumnValues(table, column, columnName, columnSyncName, columnType, columnModifier, columnOrder, isShown, columnLabel, showFilter, filterLabel, refColumn);
         } else {
             log.info("Column {} of table {} not found, will create it", columnName, table.getTableName());
-            //addColumn(table,columnName,columnSyncName,columnType,columnModifier,columnOrder,isShown);
+            addColumn(table,columnName,columnSyncName,columnType,columnModifier,columnOrder,isShown, refColumn);
         }
     }
 
-    private void addColumn(MetaDataTable table, String columnName, String columnSyncName, String columnType, String columnModifier, Integer columnOrder, Boolean isShown) {
+    private void addColumn(MetaDataTable table, String columnName, String columnSyncName, String columnType, String columnModifier, Integer columnOrder, Boolean isShown, String refColumn) {
         MetaDataColumn column = new MetaDataColumn();
         column.setTable(table);
         column.setColumnName(columnName);
@@ -135,6 +135,7 @@ public class MetaDataService {
         column.setColumnModifier(columnModifier);
         column.setColumnOrder(columnOrder);
         column.setIsShown(isShown);
+        column.setRefColumn(refColumn);
         saveMetaDataColumn(column);
     }