QRunIO/qqq
2
0
Fork 0
mirror of https://github.com/Kingsrook/qqq.git synced 2025-07-18 13:10:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

updated ses sender to consider adding label to from if provided

Browse Source
This commit is contained in:
Tim Chamberlain
2025-03-06 16:28:51 -06:00
parent 04e13413ef
commit e0045bb212
1 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/metadata/messaging/ses/SendSESAction.java
View File

@ -216,11 +216,16 @@ public class SendSESAction
{ {
LOG.warn("More than one FROM value was found, will send using the first one found [" + partyList.get(0).getAddress() + "]."); LOG.warn("More than one FROM value was found, will send using the first one found [" + partyList.get(0).getAddress() + "].");
} }
Party fromParty = partyList.get(0);
if(fromParty.getAddress() == null)
{
throw (new QException("Cannot send SES message because a FROM address was not provided."));
}
///////////////////////////// /////////////////////////////
// return the from address // // return the from address //
///////////////////////////// /////////////////////////////
return (partyList.get(0).getAddress()); return (getFullEmailAddress(fromParty));
} }
@ -267,15 +272,15 @@ public class SendSESAction
{ {
if(EmailPartyRole.CC.equals(party.getRole())) if(EmailPartyRole.CC.equals(party.getRole()))
{ {
ccList.add(party.getAddress()); ccList.add(getFullEmailAddress(party));
} }
else if(EmailPartyRole.BCC.equals(party.getRole())) else if(EmailPartyRole.BCC.equals(party.getRole()))
{ {
bccList.add(party.getAddress()); bccList.add(getFullEmailAddress(party));
} }
else if(party.getRole() == null || PartyRole.Default.DEFAULT.equals(party.getRole()) || EmailPartyRole.TO.equals(party.getRole())) else if(party.getRole() == null || PartyRole.Default.DEFAULT.equals(party.getRole()) || EmailPartyRole.TO.equals(party.getRole()))
{ {
toList.add(party.getAddress()); toList.add(getFullEmailAddress(party));
} }
else else
{ {
@ -332,4 +337,22 @@ public class SendSESAction
return amazonSES; return amazonSES;
} }
/*******************************************************************************
**
*******************************************************************************/
private String getFullEmailAddress(Party party)
{
if(party.getLabel() != null)
{
return (party.getLabel() + " <" + party.getAddress() + ">");
}
/////////////////////////////
// return the from address //
/////////////////////////////
return (party.getAddress());
}
} }