Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue 29709 make personalization work with keytag #29715

Merged
merged 7 commits into from
Aug 23, 2024
Merged

Issue 29709 make personalization work with keytag #29715

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
90cf53b
feat(personalization) adding support for personalizing by keytag
wezell Aug 22, 2024
b5d9e4e
feat(personalization) adding support for personalizing by keytag
wezell Aug 22, 2024
f5b8ecd
feat(personalization) checking for values before searching
wezell Aug 22, 2024
6cca89c
feat(personalization) checking for values before searching
wezell Aug 22, 2024
8a49595
feat(personalization) deleting the test persona
wezell Aug 22, 2024
3076f27
feat(personalization) fixing mistaken add
wezell Aug 22, 2024
967f2c1
Merge branch 'master' into issue-29709-make-personalization-work-with…
wezell Aug 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions dotCMS/src/main/java/com/dotmarketing/portlets/personas/business/PersonaAPIImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,7 +473,13 @@ private Persona find(final String identifier, final User user, final boolean res
final Contentlet contentlet = APILocator.getContentletAPI().findContentletByIdentifier(identifier, live,
APILocator.getLanguageAPI().getDefaultLanguage().getId(), user, respectFrontEndRoles);

return UtilMethods.isSet(contentlet) ? fromContentlet(contentlet) : null;

if(contentlet != null) {
return fromContentlet(contentlet);
}


return findPersonaByTag(identifier, user, respectFrontEndRoles).orElseGet(()->null);
}

@Override
Expand Down Expand Up @@ -502,11 +508,15 @@ public Structure getDefaultPersonaStructure() throws DotSecurityException, DotDa
public Optional<Persona> findPersonaByTag(final String personaTag, final User user, final boolean respectFrontEndRoles)
throws DotSecurityException, DotDataException {

if(UtilMethods.isEmpty(personaTag)){
return Optional.empty();
}

final StringBuilder query = new StringBuilder(" +baseType:").append(BaseContentType.PERSONA.getType())
.append(" +").append(PERSONA_KEY_TAG).append(":").append(personaTag);

final List<Contentlet> contentlets =
APILocator.getContentletAPI().search(query.toString(), -1, 0, StringPool.BLANK, user, respectFrontEndRoles);
APILocator.getContentletAPI().search(query.toString(), 1, 0, StringPool.BLANK, user, respectFrontEndRoles);
final Optional<Contentlet> persona = null != contentlets ? contentlets.stream().findFirst() : Optional.empty();
return persona.isPresent() ? Optional.ofNullable(fromContentlet(persona.get())) : Optional.empty();
}
Expand Down
Loading
Loading