Skip to content

Commit

Permalink
fix: Fix Restrieving SNV Pusblished Translations - MEED-8299 - Meeds-…
Browse files Browse the repository at this point in the history 
…io/meeds#2847 (#1309)

Prior to this change, when importing an SNV, the default language page
content isn't published and can't be considered as published
automatically using the new Notes API updated to fit News usage. This
change ensures through a specific Test Case to not regress the
export/import strategy of note pages and to consider all time the
default page language content as published even if not specific version
has been created for the main Notes Page content.
  • Loading branch information
@boubaker @exo-swf
boubaker authored and exo-swf committed Feb 4, 2025
1 parent 2088e4c commit 90beb00
Show file tree
Hide file tree
Showing 2 changed files with 77 additions and 13 deletions.
8 changes: 5 additions & 3 deletions notes-service/src/main/java/io/meeds/notes/service/NotePageViewService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,9 +163,11 @@ public Map<String, Page> getNotePages(String name) {
long pageId = Long.parseLong(page.getId());
List<String> languages = noteService.getPageAvailableTranslationLanguages(pageId, false);
languages.forEach(lang -> {
Page pageByLang = noteService.getNoteByIdAndLang(pageId, lang);
if (pageByLang != null) {
pages.put(lang, pageByLang);
if (!pages.containsKey(lang)) {
Page pageByLang = noteService.getNoteByIdAndLang(pageId, lang);
if (pageByLang != null) {
pages.put(lang, pageByLang);
}
}
});
return pages;
Expand Down
82 changes: 72 additions & 10 deletions notes-service/src/test/java/io/meeds/notes/service/NotePageViewServiceTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,20 +40,27 @@
import org.exoplatform.wiki.model.Page;
import org.exoplatform.wiki.service.NoteService;

import io.meeds.notes.model.NotePageData;
import io.meeds.social.cms.service.CMSService;
import io.meeds.social.cms.service.CMSServiceImpl;

import lombok.SneakyThrows;

public class NotePageViewServiceTest extends BaseTest { // NOSONAR

protected static final Random RANDOM = new Random();
private static final String PAGE_NAME_PREFIX = "pageName";

private static final String PAGE_NOTE_NAME_PREFIX = "pageNoteName";

protected static final Random RANDOM = new Random();

private static final long USER_IDENTITY_ID = 5l;
private static final long USER_IDENTITY_ID = 5l;

private static final String USERS_GROUP = "*:/platform/users";
private static final String USERS_GROUP = "*:/platform/users";

private static final String ADMINISTRATORS_GROUP = "*:/platform/administrators";
private static final String ADMINISTRATORS_GROUP = "*:/platform/administrators";

private static final String USERNAME = "testUser";
private static final String USERNAME = "testUser";

private NoteService noteService;

Expand All @@ -78,9 +85,9 @@ public void setUp() throws Exception {
public void testGetNotePageWithAnonim() throws IllegalAccessException, ObjectAlreadyExistsException, ObjectNotFoundException {
assertNull(notePageViewService.getNotePage("notExistingPage", null, null));

String pageNoteName = "pageNoteName" + RANDOM.nextLong();
String pageNoteName = PAGE_NOTE_NAME_PREFIX + RANDOM.nextLong();
String pageContent = "pageContent" + RANDOM.nextLong();
String pageReference = createPage("pageName" + RANDOM.nextLong(), UserACL.EVERYONE, ADMINISTRATORS_GROUP);
String pageReference = createPage(PAGE_NAME_PREFIX + RANDOM.nextLong(), UserACL.EVERYONE, ADMINISTRATORS_GROUP);
cmsService.saveSettingName(NotePageViewService.CMS_CONTENT_TYPE, pageNoteName, pageReference, 0l, USER_IDENTITY_ID);

Page notePage = notePageViewService.getNotePage(pageNoteName, null, null);
Expand All @@ -99,10 +106,10 @@ public void testGetNotePageWithAuthenticated() throws IllegalAccessException,
ObjectAlreadyExistsException,
ObjectNotFoundException,
WikiException {
String pageNoteName = "pageNoteName" + RANDOM.nextLong();
String pageNoteName = PAGE_NOTE_NAME_PREFIX + RANDOM.nextLong();
String pageContentEn = "pageContentEn" + RANDOM.nextLong();
String pageContentFr = "pageContentFr" + RANDOM.nextLong();
String pageReference = createPage("pageName" + RANDOM.nextLong(), USERS_GROUP, ADMINISTRATORS_GROUP);
String pageReference = createPage(PAGE_NAME_PREFIX + RANDOM.nextLong(), USERS_GROUP, ADMINISTRATORS_GROUP);
cmsService.saveSettingName(NotePageViewService.CMS_CONTENT_TYPE, pageNoteName, pageReference, 0l, USER_IDENTITY_ID);

assertThrows(IllegalAccessException.class, () -> notePageViewService.getNotePage(pageNoteName, null, null));
Expand All @@ -111,7 +118,8 @@ public void testGetNotePageWithAuthenticated() throws IllegalAccessException,
assertThrows(ObjectNotFoundException.class,
() -> notePageViewService.saveNotePage(pageNoteName + "22", pageContentEn, null, null));
assertThrows(IllegalAccessException.class, () -> notePageViewService.saveNotePage(pageNoteName, pageContentEn, null, null));
assertThrows(IllegalAccessException.class, () -> notePageViewService.saveNotePage(pageNoteName, pageContentEn, null, registerInternalUser(USERNAME)));
assertThrows(IllegalAccessException.class,
() -> notePageViewService.saveNotePage(pageNoteName, pageContentEn, null, registerInternalUser(USERNAME)));
notePageViewService.saveNotePage(pageNoteName, pageContentFr, null, registerAdministratorUser(USERNAME));
// Test save a language not saved, which has to change the default lang
notePageViewService.saveNotePage(pageNoteName, pageContentEn, "fr", registerAdministratorUser(USERNAME));
Expand Down Expand Up @@ -142,6 +150,60 @@ public void testGetNotePageWithAuthenticated() throws IllegalAccessException,
assertEquals(pageContentEn, notePage.getContent());
}

@SneakyThrows
public void testGetNotePageNoLang() {
String pageReference = createPage(PAGE_NAME_PREFIX + RANDOM.nextLong(), USERS_GROUP, ADMINISTRATORS_GROUP);

String pageContent = "pageContent" + RANDOM.nextLong();
String pageContentModified = "pageContentModified" + RANDOM.nextLong();

String pageNoteName = PAGE_NOTE_NAME_PREFIX + RANDOM.nextLong();
cmsService.saveSettingName(NotePageViewService.CMS_CONTENT_TYPE, pageNoteName, pageReference, 0l, USER_IDENTITY_ID);

notePageViewService.saveNotePage(pageNoteName, pageContent, null, registerAdministratorUser(USERNAME));

Page notePage = notePageViewService.getNotePage(pageNoteName, null, registerInternalUser(USERNAME));
assertNotNull(notePage);
assertEquals(pageContent, notePage.getContent());
notePage = notePageViewService.getNotePage(pageNoteName, "fr", registerInternalUser(USERNAME));
assertNotNull(notePage);
assertEquals(pageContent, notePage.getContent());

notePageViewService.saveNotePage(pageNoteName, pageContentModified, null, registerAdministratorUser(USERNAME));

notePage = notePageViewService.getNotePage(pageNoteName, "fr", registerInternalUser(USERNAME));
assertNotNull(notePage);
assertEquals(pageContentModified, notePage.getContent());

notePage = notePageViewService.getNotePage(pageNoteName, null, registerInternalUser(USERNAME));
assertNotNull(notePage);
assertEquals(pageContentModified, notePage.getContent());

NotePageData notePageData = notePageViewService.getNotePageData(pageNoteName);
assertNotNull(notePageData);
assertEquals(pageContentModified, notePageData.getPages().get(""));
assertEquals(1, notePageData.getPages().size());

pageNoteName = PAGE_NOTE_NAME_PREFIX + RANDOM.nextLong();
cmsService.saveSettingName(NotePageViewService.CMS_CONTENT_TYPE, pageNoteName, pageReference, 0l, USER_IDENTITY_ID);
notePageViewService.savePageData(pageNoteName, notePageData);

notePageViewService.saveNotePage(pageNoteName, pageContent, null, registerAdministratorUser(USERNAME));

notePage = notePageViewService.getNotePage(pageNoteName, "fr", registerInternalUser(USERNAME));
assertNotNull(notePage);
assertEquals(pageContent, notePage.getContent());

notePage = notePageViewService.getNotePage(pageNoteName, null, registerInternalUser(USERNAME));
assertNotNull(notePage);
assertEquals(pageContent, notePage.getContent());

notePageData = notePageViewService.getNotePageData(pageNoteName);
assertNotNull(notePageData);
assertEquals(pageContent, notePageData.getPages().get(""));
assertEquals(1, notePageData.getPages().size());
}

private String createPage(String pageName, String accessPermission, String editPermission) {
String siteType = "portal";
String siteName = "classic";
Expand Down

0 comments on commit 90beb00

Please sign in to comment.