#20094 adding an upgrade task to update the anonymous old email to th…

dotCMS/src/integration-test/java/com/dotcms/MainSuite.java

@@ -96,6 +96,7 @@
 import com.dotmarketing.startup.runonce.Task210319CreateStorageTableTest;
 import com.dotmarketing.startup.runonce.Task210321RemoveOldMetadataFilesTest;
 import com.dotmarketing.startup.runonce.Task210506UpdateStorageTableTest;
+import com.dotmarketing.startup.runonce.Task210520UpdateAnonymousEmailTest;
 import com.dotmarketing.startup.runonce.Task210510UpdateStorageTableDropMetadataColumnTest;
 import com.dotmarketing.util.ConfigTest;
 import com.dotmarketing.util.HashBuilderTest;
@@ -414,6 +415,8 @@
         FileAssetTemplateUtilTest.class,
         SiteSearchJobImplTest.class,
         Task210506UpdateStorageTableTest.class,
+        StaticPushPublishBundleGeneratorTest.class,
+        Task210520UpdateAnonymousEmailTest.class,
         Task210510UpdateStorageTableDropMetadataColumnTest.class,
         StaticPushPublishBundleGeneratorTest.class
 })

dotCMS/src/integration-test/java/com/dotmarketing/startup/runonce/Task210520UpdateAnonymousEmailTest.java

@@ -0,0 +1,39 @@
+package com.dotmarketing.startup.runonce;
+
+import com.dotcms.util.IntegrationTestInitService;
+import com.dotmarketing.business.UserAPI;
+import com.dotmarketing.common.db.DotConnect;
+import com.dotmarketing.db.LocalTransaction;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+public class Task210520UpdateAnonymousEmailTest {
+
+    @BeforeClass
+    public static void prepare() throws Exception {
+        // Setting web app environment
+        IntegrationTestInitService.getInstance().init();
+    }
+
+    @Test
+    public void testExecuteUpgrade() throws Exception {
+
+        LocalTransaction.wrapReturnWithListeners(()->
+            new DotConnect().executeUpdate("UPDATE user_ SET emailaddress = ? where emailaddress = ?",
+                Task210520UpdateAnonymousEmail.OLD_ANONYMOUS_EMAIL, UserAPI.CMS_ANON_USER_EMAIL)
+        );
+
+
+        LocalTransaction.wrapReturnWithListeners(()-> {
+            final Task210520UpdateAnonymousEmail upgradeTask = new Task210520UpdateAnonymousEmail();
+            assertTrue(upgradeTask.forceRun());
+            upgradeTask.executeUpgrade();
+            assertFalse(upgradeTask.forceRun());
+            return null;
+        });
+
+    }
+}

dotCMS/src/main/java/com/dotmarketing/startup/runonce/Task210520UpdateAnonymousEmail.java

@@ -0,0 +1,42 @@
+package com.dotmarketing.startup.runonce;
+
+import com.dotmarketing.business.UserAPI;
+import com.dotmarketing.common.db.DotConnect;
+import com.dotmarketing.exception.DotDataException;
+import com.dotmarketing.exception.DotRuntimeException;
+import com.dotmarketing.startup.StartupTask;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Updates the anonymous email to avoid the "anonymous@dotcmsfakeemail.org"
+ * @author jsanca
+ */
+public class Task210520UpdateAnonymousEmail implements StartupTask {
+
+    protected static final String OLD_ANONYMOUS_EMAIL = "anonymous@dotcmsfakeemail.org";
+
+    @Override
+    public boolean forceRun() {
+
+        try {
+            final List<Map<String, Object>> results =
+                    new DotConnect()
+                    .setSQL("select * from user_ where emailaddress = ?")
+                    .addParam(OLD_ANONYMOUS_EMAIL)
+                    .loadObjectResults();
+
+            return null != results && results.size() > 0; // any result?? update the email
+        } catch(Exception ex) {
+            return true;
+        }
+    }
+
+    @Override
+    public void executeUpgrade() throws DotDataException, DotRuntimeException {
+
+        new DotConnect().executeUpdate("UPDATE user_ SET emailaddress = ? where emailaddress = ?",
+                UserAPI.CMS_ANON_USER_EMAIL, OLD_ANONYMOUS_EMAIL);
+    }
+}

dotCMS/src/main/java/com/dotmarketing/util/TaskLocatorUtil.java

@@ -298,6 +298,7 @@ public static List<Class<?>> getStartupRunOnceTaskClasses() {
 		.add(Task210321RemoveOldMetadataFiles.class)
         .add(Task210506UpdateStorageTable.class)
 		.add(Task210510UpdateStorageTableDropMetadataColumn.class)
+		.add(Task210520UpdateAnonymousEmail.class)
         .build();
 
         return ret.stream().sorted(classNameComparator).collect(Collectors.toList());