fix: resolve pages requested with trailing slash - fixing /c/ pattern #25264

Author: wezell

dotCMS/src/main/java/com/dotmarketing/business/IdentifierFactoryImpl.java

@@ -529,6 +529,23 @@ protected Identifier saveIdentifier(final Identifier id) throws DotDataException
             query = "INSERT INTO identifier (parent_path,asset_name,host_inode,asset_type,syspublish_date,sysexpire_date,owner,create_date,asset_subtype,base_type,id) values (?,?,?,?,?,?,?,?,?,?,?)";
         }
 
+        // Guard against stale cached Identifiers (loaded before base_type was denormalized)
+        // writing null back and temporarily undoing the backfill for this row.
+        if (id.getBaseType() == null && UtilMethods.isSet(id.getAssetSubType())) {
+            final Integer resolvedBaseType = Try.of(() ->
+                    APILocator.getContentTypeAPI(APILocator.systemUser())
+                            .find(id.getAssetSubType())
+                            .baseType()
+                            .getType())
+                    .onFailure(e -> Logger.warn(IdentifierFactoryImpl.class,
+                            "Could not resolve base_type for asset_subtype=" + id.getAssetSubType()
+                            + " on identifier=" + id.getId() + ": " + e.getMessage()))
+                    .getOrNull();
+            if (resolvedBaseType != null) {
+                id.setBaseType(resolvedBaseType);
+            }
+        }
+
         DotConnect dc = new DotConnect();
         dc.setSQL(query);
 

dotCMS/src/main/java/com/dotmarketing/quartz/job/PopulateIdentifierBaseTypeUtil.java

@@ -2,10 +2,12 @@
 
 import com.dotcms.business.WrapInTransaction;
 import com.dotmarketing.common.db.DotConnect;
+import com.dotmarketing.db.DbConnectionFactory;
 import com.dotmarketing.exception.DotDataException;
 import com.dotmarketing.exception.DotRuntimeException;
 import com.dotmarketing.util.Config;
 import com.dotmarketing.util.Logger;
+import java.sql.Connection;
 
 /**
  * Populates the {@code base_type} column on the {@code identifier} table in small, independently
@@ -111,11 +113,13 @@ public int populate() {
      *
      * @return Number of rows updated in this batch; 0 means all rows are already populated.
      */
-    @WrapInTransaction
     private int processBatch() {
-        try {
-            return new DotConnect().executeUpdate(UPDATE_BATCH);
-        } catch (final DotDataException e) {
+        try(Connection conn = DbConnectionFactory.getDataSource().getConnection()) {
+            conn.setAutoCommit(false);
+            int result= new DotConnect().executeUpdate(UPDATE_BATCH, conn);
+            conn.commit();
+            return result;
+        } catch (final Exception e) {
             throw new DotRuntimeException(
                     "PopulateIdentifierBaseType: error executing batch update", e);
         }

dotcms-integration/src/test/java/com/dotmarketing/quartz/job/PopulateIdentifierBaseTypeJobTest.java

@@ -11,6 +11,10 @@
 import org.junit.Test;
 import org.quartz.SchedulerException;
 
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
@@ -103,10 +107,21 @@ public void test_removeJob_removesFromScheduler() throws SchedulerException {
     public void test_fireJob_skipsSchedulingWhenNoWorkPending() throws Exception {
         removeJob();
 
-        // Temporarily back-fill any NULLs so hasPendingRows() returns false
-        new DotConnect().executeStatement(
-                "UPDATE identifier SET base_type = 1 " +
-                "WHERE base_type IS NULL AND asset_subtype IS NOT NULL");
+        // Capture only the IDs that are currently NULL so we restore exactly those rows
+        final List<String> nullIds = new DotConnect()
+                .setSQL("SELECT id FROM identifier WHERE base_type IS NULL AND asset_subtype IS NOT NULL")
+                .loadObjectResults()
+                .stream()
+                .map(row -> (String) row.get("id"))
+                .collect(Collectors.toList());
+
+        if (!nullIds.isEmpty()) {
+            final String idList = nullIds.stream()
+                    .map(id -> "'" + id + "'")
+                    .collect(Collectors.joining(","));
+            new DotConnect().executeStatement(
+                    "UPDATE identifier SET base_type = 1 WHERE id IN (" + idList + ")");
+        }
 
         try {
             assertFalse("hasPendingRows() should return false when all rows are populated",
@@ -121,9 +136,14 @@ public void test_fireJob_skipsSchedulingWhenNoWorkPending() throws Exception {
             final var jobDetail = Try.of(() -> scheduler.getJobDetail(jobName, groupName)).getOrNull();
             assertNull("Job should NOT be scheduled when migration is already complete", jobDetail);
         } finally {
-            // Restore NULL so other tests stay valid
-            new DotConnect().executeStatement(
-                    "UPDATE identifier SET base_type = NULL WHERE base_type = 1 AND asset_subtype IS NOT NULL");
+            // Restore only the rows we modified
+            if (!nullIds.isEmpty()) {
+                final String idList = nullIds.stream()
+                        .map(id -> "'" + id + "'")
+                        .collect(Collectors.joining(","));
+                new DotConnect().executeStatement(
+                        "UPDATE identifier SET base_type = NULL WHERE id IN (" + idList + ")");
+            }
         }
     }
 

dotcms-integration/src/test/java/com/dotmarketing/startup/runonce/Task260407AddBaseTypeColumnToIdentifierTest.java

@@ -11,6 +11,8 @@
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.util.List;
+import java.util.stream.Collectors;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -73,16 +75,34 @@ public void test_forceRun_returnsFalseWhenMigrationComplete() throws DotDataExce
         final var task = new Task260407AddBaseTypeColumnToIdentifier();
         task.executeUpgrade();
 
-        // Ensure no pending rows remain
-        new DotConnect().executeStatement(
-                "UPDATE identifier SET base_type = 1 WHERE base_type IS NULL AND asset_subtype IS NOT NULL");
+        // Capture only the IDs that are currently NULL so we restore exactly those rows
+        final List<String> nullIds = new DotConnect()
+                .setSQL("SELECT id FROM identifier WHERE base_type IS NULL AND asset_subtype IS NOT NULL")
+                .loadObjectResults()
+                .stream()
+                .map(row -> (String) row.get("id"))
+                .collect(Collectors.toList());
+
+        if (!nullIds.isEmpty()) {
+            final String idList = nullIds.stream()
+                    .map(id -> "'" + id + "'")
+                    .collect(Collectors.joining(","));
+            new DotConnect().executeStatement(
+                    "UPDATE identifier SET base_type = 1 WHERE id IN (" + idList + ")");
+        }
 
         try {
             assertFalse("forceRun() should return false when index exists and no pending rows remain",
                     task.forceRun());
         } finally {
-            new DotConnect().executeStatement(
-                    "UPDATE identifier SET base_type = NULL WHERE base_type = 1 AND asset_subtype IS NOT NULL");
+            // Restore only the rows we modified
+            if (!nullIds.isEmpty()) {
+                final String idList = nullIds.stream()
+                        .map(id -> "'" + id + "'")
+                        .collect(Collectors.joining(","));
+                new DotConnect().executeStatement(
+                        "UPDATE identifier SET base_type = NULL WHERE id IN (" + idList + ")");
+            }
         }
     }