[JN-1547] allow ternary in email templates #1421
Conversation
| @@ -45,6 +45,12 @@ protected EnrolleeEmailSubstitutor(EnrolleeContext ruleData, NotificationContext | |||
| valueMap.put("siteMediaBaseUrl", getImageBaseUrl(contextInfo.portalEnv(), contextInfo.portalEnvConfig(), contextInfo.portal().getShortcode())); | |||
| valueMap.put("siteImageBaseUrl", getImageBaseUrl(contextInfo.portalEnv(), contextInfo.portalEnvConfig(), contextInfo.portal().getShortcode())); | |||
| valueMap.put("profile", enrolleeContext.getProfile()); | |||
| if (enrolleeContext.getParticipantUser().getUsername().contains("-prox-")) { | |||
There was a problem hiding this comment.
I couldn't find another way to glean this information from the enrollee context. I think this is probably OK but obviously not foolproof, so let me know if there's a better way to do this.
As an aside, seeing this (+ Matt's participant document PR where he does some profileId checks) makes me think we should have some kind of EnrolleeAccountType enum where the values are something like PROXY_ONLY GOVERNED_USER SELF_ENROLL and SELF_AND_PROXY
| @@ -45,6 +46,13 @@ protected EnrolleeEmailSubstitutor(EnrolleeContext ruleData, NotificationContext | |||
| valueMap.put("siteMediaBaseUrl", getImageBaseUrl(contextInfo.portalEnv(), contextInfo.portalEnvConfig(), contextInfo.portal().getShortcode())); | |||
| valueMap.put("siteImageBaseUrl", getImageBaseUrl(contextInfo.portalEnv(), contextInfo.portalEnvConfig(), contextInfo.portal().getShortcode())); | |||
| valueMap.put("profile", enrolleeContext.getProfile()); | |||
| if (Objects.nonNull(enrolleeContext.getParticipantUser()) | |||
| && StringUtils.contains(enrolleeContext.getParticipantUser().getUsername(), "-prox-")) { | |||
There was a problem hiding this comment.
we'll want to make this more robust -- this might not work in the context of age-up protocols, there may be a period of time when they have their real email address as their account name but are still proxied.
I'd add an "isGoverned" field to EnrolleeContext, and a query in EnrolleeContextService to populate it
There was a problem hiding this comment.
I found it simpler to just fetch all the enrollee relations and populate them - perhaps a heavyweight solution, though
| && StringUtils.contains(enrolleeContext.getParticipantUser().getUsername(), "-prox-")) { | ||
| valueMap.put("isProxy", "true"); | ||
| } else { | ||
| valueMap.put("isSubject", "true"); |
There was a problem hiding this comment.
let's go ahead and just put the whole enrolleee on the valueMap -- that way we have subject and consented available
| } | ||
|
|
||
| public static boolean isTernary(String key) { | ||
| return key.contains("?") && key.contains(":") && key.indexOf('?') < key.indexOf(':'); |
There was a problem hiding this comment.
Might be just my personal preference, but I lean towards (commented) regexes for stuff like this -- something like/[^:]+\?.+:
| @@ -80,6 +90,37 @@ public String lookup(String key) { | |||
| return ""; | |||
| } | |||
|
|
|||
| private record Ternary(String condition, String left, String right) { | |||
There was a problem hiding this comment.
Nice, I like how you made this as a record -- good encapsulation of logic
|
|
test failure is a fluke and sonarcloud is flagging the regex which shouldn't be a security problem |
DESCRIPTION (include screenshots, and mobile screenshots for participant UX)
Allow ternary e.g.
{isSubject ? "your" : "your child's"}in email templates. Not super robust (doesn't allow escaping quotes, doesn't allow nesting) but should work for 99.9% of use cases.TO TEST: (simple manual steps for confirming core behavior -- used for pre-release checks)