Skip to content

Commit

Permalink
fix: Fix NewsArticlesUpgrade execution for eXo 7.0.x fresh install - E…
Browse files Browse the repository at this point in the history 
…XO-72583 (#236)

Prior to this change, when stating an eXo 7.0.x fresh install an exception javax.jcr.query.InvalidQueryException: Node type [[exoplatform.com/jcr/exo/1.0]news](http://www.exoplatform.com/jcr/exo/1.0]news) not found occurs with NewsArticlesUpgrade. After this fix, we ensure that the NewsArticlesUpgrade is executed only when exo:news nodetype exists.
  • Loading branch information
@azayati
azayati authored Jun 21, 2024
1 parent a834bb4 commit 1747965
Show file tree
Hide file tree
Showing 2 changed files with 47 additions and 28 deletions.
59 changes: 34 additions & 25 deletions data-upgrade-news/src/main/java/org/exoplatform/news/upgrade/jcr/NewsArticlesUpgrade.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
import org.exoplatform.services.jcr.RepositoryService;
import org.exoplatform.services.jcr.ext.app.SessionProviderService;
import org.exoplatform.services.jcr.ext.common.SessionProvider;
import org.exoplatform.services.jcr.impl.core.nodetype.NodeTypeManagerImpl;
import org.exoplatform.services.log.ExoLogger;
import org.exoplatform.services.log.Log;
import org.exoplatform.services.security.IdentityConstants;
Expand Down Expand Up @@ -142,31 +143,38 @@ public void processUpgrade(String oldVersion, String newVersion) {
.getDefaultWorkspaceName(),
repositoryService.getCurrentRepository());

String queryString = "SELECT * FROM exo:news WHERE jcr:path LIKE '/Groups/spaces/%/News/%' order by exo:dateModified DESC";
QueryManager queryManager = session.getWorkspace().getQueryManager();
Query query = queryManager.createQuery(queryString, Query.SQL);

Iterator<Node> newsIterator = query.execute().getNodes();
List<Node> newsArticlesNodes = new ArrayList<Node>();
while (newsIterator.hasNext()) {
Node newsArticleNode = newsIterator.next();
if (!newsArticleNode.hasProperty("exo:archived") || !newsArticleNode.getProperty("exo:archived").getBoolean()) {
newsArticlesNodes.add(newsArticleNode);
NodeTypeManagerImpl ntManager = (NodeTypeManagerImpl) session.getWorkspace().getNodeTypeManager();
if (ntManager.hasNodeType("exo:news")) {
String queryString =
"SELECT * FROM exo:news WHERE jcr:path LIKE '/Groups/spaces/%/News/%' order by exo:dateModified DESC";
QueryManager queryManager = session.getWorkspace().getQueryManager();
Query query = queryManager.createQuery(queryString, Query.SQL);

Iterator<Node> newsIterator = query.execute().getNodes();
List<Node> newsArticlesNodes = new ArrayList<Node>();
while (newsIterator.hasNext()) {
Node newsArticleNode = newsIterator.next();
if (!getBooleanProperty(newsArticleNode, "exo:archived")) {
newsArticlesNodes.add(newsArticleNode);
} else {
newsArticleNode.remove();
session.save();
}
}
totalNewsArticlesCount = newsArticlesNodes.size();
LOG.info("Total number of news articles to be migrated: {}", totalNewsArticlesCount);
for (List<Node> newsArticlesChunk : ListUtils.partition(newsArticlesNodes, 10)) {
int notMigratedNewsArticlesCountByTransaction = manageNewsArticles(newsArticlesChunk, session);
int processedNewsArticlesCountByTransaction = newsArticlesChunk.size();
processedNewsArticlesCount += processedNewsArticlesCountByTransaction;
migratedNewsArticlesCount += processedNewsArticlesCountByTransaction - notMigratedNewsArticlesCountByTransaction;
notMigratedNewsArticlesCount += notMigratedNewsArticlesCountByTransaction;
LOG.info("News articles migration progress: processed={}/{} succeeded={} error={}",
processedNewsArticlesCount,
totalNewsArticlesCount,
migratedNewsArticlesCount,
notMigratedNewsArticlesCount);
}
}
totalNewsArticlesCount = newsArticlesNodes.size();
LOG.info("Total number of news articles to be migrated: {}", totalNewsArticlesCount);
for (List<Node> newsArticlesChunk : ListUtils.partition(newsArticlesNodes, 10)) {
int notMigratedNewsArticlesCountByTransaction = manageNewsArticles(newsArticlesChunk, session);
int processedNewsArticlesCountByTransaction = newsArticlesChunk.size();
processedNewsArticlesCount += processedNewsArticlesCountByTransaction;
migratedNewsArticlesCount += processedNewsArticlesCountByTransaction - notMigratedNewsArticlesCountByTransaction;
notMigratedNewsArticlesCount += notMigratedNewsArticlesCountByTransaction;
LOG.info("News articles migration progress: processed={}/{} succeeded={} error={}",
processedNewsArticlesCount,
totalNewsArticlesCount,
migratedNewsArticlesCount,
notMigratedNewsArticlesCount);
}
} catch (Exception e) {
LOG.error("An error occurred when upgrading news articles:", e);
Expand Down Expand Up @@ -408,7 +416,8 @@ private void setArticleActivities(News article, Node newsNode) throws Repository
String newsActivityId = newsActivity.split(":")[1];
ExoSocialActivity activity = activityManager.getActivity(newsActivityId);
if (activity != null) {
Map<String, String> templateParams = activity.getTemplateParams() == null ? new HashMap<>() : activity.getTemplateParams();
Map<String, String> templateParams = activity.getTemplateParams() == null ? new HashMap<>()
: activity.getTemplateParams();
templateParams.put("newsId", article.getId());
activity.setTemplateParams(templateParams);
activity.setMetadataObjectId(article.getId());
Expand Down
16 changes: 13 additions & 3 deletions ...-upgrade-news/src/test/java/org/exoplatform/news/upgrade/jcr/NewsArticlesUpgradeTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@
import javax.jcr.Session;
import javax.jcr.Value;
import javax.jcr.Workspace;
import javax.jcr.nodetype.NodeType;
import javax.jcr.nodetype.NodeTypeManager;
import javax.jcr.query.Query;
import javax.jcr.query.QueryManager;
import javax.jcr.query.QueryResult;
Expand All @@ -61,6 +63,7 @@
import org.exoplatform.services.jcr.core.ManageableRepository;
import org.exoplatform.services.jcr.ext.app.SessionProviderService;
import org.exoplatform.services.jcr.ext.common.SessionProvider;
import org.exoplatform.services.jcr.impl.core.nodetype.NodeTypeManagerImpl;
import org.exoplatform.services.wcm.extensions.publication.lifecycle.authoring.AuthoringPublicationConstant;
import org.exoplatform.social.core.activity.model.ExoSocialActivity;
import org.exoplatform.social.core.manager.ActivityManager;
Expand Down Expand Up @@ -154,11 +157,14 @@ public void testProcessUpgrade() throws Exception {
when(sessionProviderService.getSystemSessionProvider(null)).thenReturn(sessionProvider);
Session session = mock(Session.class);
when(sessionProvider.getSession(anyString(), any())).thenReturn(session);
Workspace workspace = mock(Workspace.class);
when(session.getWorkspace()).thenReturn(workspace);
NodeTypeManagerImpl nodetypeManager = mock(NodeTypeManagerImpl.class);
when(workspace.getNodeTypeManager()).thenReturn(nodetypeManager);
when(nodetypeManager.hasNodeType(anyString())).thenReturn(true);

// Mock the query manager and query
QueryManager queryManager = mock(QueryManager.class);
Workspace workspace = mock(Workspace.class);
when(session.getWorkspace()).thenReturn(workspace);
when(workspace.getQueryManager()).thenReturn(queryManager);
Query query = mock(Query.class);
when(queryManager.createQuery(anyString(), eq(Query.SQL))).thenReturn(query);
Expand All @@ -178,6 +184,10 @@ public void testProcessUpgrade() throws Exception {

// Mock the necessary properties of the node1
when(node1.hasProperty("publication:currentState")).thenReturn(true);
Property archivedProperty = mock(Property.class);
when(node1.hasProperty("exo:archived")).thenReturn(true);
when(node1.getProperty("exo:archived")).thenReturn(archivedProperty);
when(archivedProperty.getBoolean()).thenReturn(false);
Property publishedStateProperty = mock(Property.class);
when(node1.getProperty("publication:currentState")).thenReturn(publishedStateProperty);
when(publishedStateProperty.getString()).thenReturn("published");
Expand Down Expand Up @@ -267,4 +277,4 @@ public void testProcessUpgrade() throws Exception {
verify(activityManager, times(1)).getActivity(any());
verify(activityManager, times(1)).updateActivity(any(ExoSocialActivity.class), eq(false));
}
}
}

0 comments on commit 1747965

Please sign in to comment.