fix: correct JPQL field name subThemeDiscriminatorValue → subTheme in JPADAO queries

The field was renamed in CMSPage entity in commit 02debd5 (refs #27710),
but three JPQL queries in JPADAO and the corresponding test assertions were
not updated, causing an IllegalArgumentException at runtime.

refs #27710

Author: janvonde

goobi-viewer-core/src/main/java/io/goobi/viewer/dao/impl/JPADAO.java

@@ -4534,7 +4534,8 @@ public List<CMSPage> getCMSPagesForSubtheme(String subtheme) throws DAOException
         preQuery();
         EntityManager em = getEntityManager();
         try {
-            Query q = em.createQuery("SELECT DISTINCT page FROM CMSPage page WHERE page.subThemeDiscriminatorValue = :subtheme");
+            // Use field name 'subTheme' as defined in CMSPage entity (was previously named subThemeDiscriminatorValue)
+            Query q = em.createQuery("SELECT DISTINCT page FROM CMSPage page WHERE page.subTheme = :subtheme");
             q.setParameter("subtheme", subtheme);
             return q.getResultList();
         } finally {
@@ -4615,7 +4616,7 @@ public static String createCMSPageFilter(Map<String, Object> params, String page
                         .append(templateParameter)
                         .append(" = ")
                         .append(pageParameter)
-                        .append(".subThemeDiscriminatorValue")
+                        .append(".subTheme")
                         .append(" OR ");
                 params.put(templateParameter, subtheme);
             }
@@ -4625,7 +4626,7 @@ public static String createCMSPageFilter(Map<String, Object> params, String page
             }
             query += ") AND";
         } else if (allowedSubthemes != null) {
-            query += " (" + pageParameter + ".subThemeDiscriminatorValue = \"\") AND";
+            query += " (" + pageParameter + ".subTheme = \"\") AND";
         }
 
         index = 0;

goobi-viewer-core/src/test/java/io/goobi/viewer/dao/impl/JPADAOTest.java

@@ -2138,7 +2138,7 @@ void testCreateCMSPageFilter_createValidQueryWithAllParams() throws AccessDenied
 
         String query = JPADAO.createCMSPageFilter(params, "p", templates, subThemes, categories);
 
-        String shouldQuery = "(:tpl1 = p.templateId OR :tpl2 = p.templateId) AND (:thm1 = p.subThemeDiscriminatorValue) AND "
+        String shouldQuery = "(:tpl1 = p.templateId OR :tpl2 = p.templateId) AND (:thm1 = p.subTheme) AND "
                 + "(:cat1 IN (SELECT c.id FROM p.categories c) OR :cat2 IN (SELECT c.id FROM p.categories c) OR :cat3 IN (SELECT c.id FROM p.categories c))";
         assertEquals(shouldQuery, query);
 
@@ -2161,7 +2161,7 @@ void testCreateCMSPageFilter_createValidQueryWithTwoParams() throws AccessDenied
 
         String query = JPADAO.createCMSPageFilter(params, "p", null, subThemes, categories);
 
-        String shouldQuery = "(:thm1 = p.subThemeDiscriminatorValue) AND "
+        String shouldQuery = "(:thm1 = p.subTheme) AND "
                 + "(:cat1 IN (SELECT c.id FROM p.categories c) OR :cat2 IN (SELECT c.id FROM p.categories c) OR :cat3 IN (SELECT c.id FROM p.categories c))";
         assertEquals(shouldQuery, query);