#30950 refactor done

dotCMS · Dec 20, 2024 · 6bf2730 · 6bf2730
1 parent cf15906
commit 6bf2730
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/dotCMS/src/main/java/com/dotmarketing/business/VersionableAPIImpl.java b/dotCMS/src/main/java/com/dotmarketing/business/VersionableAPIImpl.java
@@ -366,8 +366,7 @@ public boolean hasWorkingVersionInAnyOtherLanguage(Versionable versionable, fina
 
         // only contents are multi language
         return "contentlet".equals(identifier.getAssetType())?
-                !new DotConnect().setSQL("select working_inode, lang from contentlet_version_info where identifier = ? and lang != ?")
-                        .addParam(identifier.getId()).addParam(versionableLanguageId).loadObjectResults().isEmpty():false;
+                !this.versionableFactory.getWorkingVersionsExcludingLanguage(identifier.getId(), versionableLanguageId).isEmpty():false;
     }
 
     @CloseDBIfOpened

diff --git a/dotCMS/src/main/java/com/dotmarketing/business/VersionableFactory.java b/dotCMS/src/main/java/com/dotmarketing/business/VersionableFactory.java
@@ -2,6 +2,7 @@
 
 import com.dotcms.variant.model.Variant;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 
 import com.dotmarketing.beans.Identifier;
@@ -108,6 +109,15 @@ public abstract class VersionableFactory {
 	 */
 	protected abstract VersionInfo getVersionInfo(String identifier) throws DotDataException, DotStateException;
 
+	/**
+	 * Get a list of all the working versions of a contentlet excluding the one with the specified language id.
+	 * @param identifier
+	 * @param lang
+	 * @return List of the rows (working_inode + lang)
+	 * @throws DotDataException
+	 */
+	protected abstract List<Map<String, Object>> getWorkingVersionsExcludingLanguage(String identifier, long lang) throws DotDataException;
+
 	/**
 	 * 
 	 * @param identifier

diff --git a/dotCMS/src/main/java/com/dotmarketing/business/VersionableFactoryImpl.java b/dotCMS/src/main/java/com/dotmarketing/business/VersionableFactoryImpl.java
@@ -31,6 +31,7 @@
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
@@ -239,6 +240,13 @@ protected  List<Versionable> findAllVersions(final String id, final Optional<Int
         }
 	}
 
+	@Override
+	protected List<Map<String, Object>> getWorkingVersionsExcludingLanguage(final String identifier, final long lang) throws DotDataException {
+
+		return new DotConnect().setSQL("select working_inode, lang from contentlet_version_info where identifier = ? and lang != ?")
+				.addParam(identifier).addParam(lang).loadObjectResults();
+	}
+
     @Override
     protected VersionInfo getVersionInfo(String identifier) throws DotDataException,
             DotStateException {