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

Jump to bottom

bug/1505 fix bad asset links on journeys when retrieved together with triggeredSends #1640

Merged
merged 1 commit into from
Aug 30, 2024
Merged

bug/1505 fix bad asset links on journeys when retrieved together with triggeredSends #1640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion @types/lib/metadataTypes/Journey.d.ts.map
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

169 changes: 100 additions & 69 deletions lib/metadataTypes/Journey.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -630,49 +630,78 @@ class Journey extends MetadataType {
'triggeredSend',
triggeredSend.r__triggeredSend_key
);
triggeredSend.emailId = linkedTS?.Email?.ID;
triggeredSend.dynamicEmailSubject = linkedTS.DynamicEmailSubject;
triggeredSend.emailSubject = linkedTS.EmailSubject;
triggeredSend.bccEmail = linkedTS.BccEmail;
triggeredSend.isMultipart = linkedTS.IsMultipart;
triggeredSend.autoAddSubscribers = linkedTS.AutoAddSubscribers;
triggeredSend.autoUpdateSubscribers = linkedTS.AutoUpdateSubscribers;
triggeredSend.isTrackingClicks = !linkedTS.SuppressTracking;
// from name & email are set in the senderProfile, not in the triggeredSend
// triggeredSend.fromName = linkedTS.FromName;
// triggeredSend.fromAddress = linkedTS.FromAddress;

if (linkedTS.SenderProfile?.CustomerKey) {
try {
const spKey = cache.searchForField(
'senderProfile',
linkedTS.SenderProfile.ObjectID,
'ObjectID',
'CustomerKey'
);
triggeredSend.r__senderProfile_key = spKey;
delete triggeredSend.senderProfileId;
} catch (ex) {
Util.logger.warn(
` - triggeredSend ${linkedTS.CustomerKey}: ${ex.message} (senderProfile key ${linkedTS.SenderProfile.CustomerKey})`
);
if (linkedTS) {
triggeredSend.emailId = linkedTS.Email?.ID;
triggeredSend.dynamicEmailSubject = linkedTS.DynamicEmailSubject;
triggeredSend.emailSubject = linkedTS.EmailSubject;
triggeredSend.bccEmail = linkedTS.BccEmail;
triggeredSend.isMultipart = linkedTS.IsMultipart;
triggeredSend.autoAddSubscribers = linkedTS.AutoAddSubscribers;
triggeredSend.autoUpdateSubscribers =
linkedTS.AutoUpdateSubscribers;
triggeredSend.isTrackingClicks = !linkedTS.SuppressTracking;
// from name & email are set in the senderProfile, not in the triggeredSend
// triggeredSend.fromName = linkedTS.FromName;
// triggeredSend.fromAddress = linkedTS.FromAddress;

if (linkedTS.List?.ID) {
triggeredSend.publicationListId = linkedTS.List.ID;
} else if (linkedTS.r__list_PathName) {
delete triggeredSend.publicationListId;
triggeredSend.r__list_PathName = {
publicationList: linkedTS.r__list_PathName,
};
}
}
// send classification
if (linkedTS.SendClassification?.CustomerKey) {
try {
const scKey = cache.searchForField(
'sendClassification',
linkedTS.SendClassification.ObjectID,
'ObjectID',
'CustomerKey'
);
triggeredSend.r__sendClassification_key = scKey;
delete triggeredSend.sendClassificationId;
} catch (ex) {
Util.logger.warn(
` - triggeredSend ${linkedTS.CustomerKey}: ${ex.message} (sendClassification key ${linkedTS.SendClassification.CustomerKey})`
);
if (linkedTS.SenderProfile?.CustomerKey) {
try {
const spKey = cache.searchForField(
'senderProfile',
linkedTS.SenderProfile.ObjectID,
'ObjectID',
'CustomerKey'
);
triggeredSend.r__senderProfile_key = spKey;
delete triggeredSend.senderProfileId;
} catch (ex) {
Util.logger.warn(
` - triggeredSend ${linkedTS.CustomerKey}: ${ex.message} (senderProfile key ${linkedTS.SenderProfile.CustomerKey})`
);
}
} else if (linkedTS.r__senderProfile_key) {
triggeredSend.r__senderProfile_key =
linkedTS.r__senderProfile_key;
}
// send classification
if (linkedTS.SendClassification?.CustomerKey) {
try {
const scKey = cache.searchForField(
'sendClassification',
linkedTS.SendClassification.ObjectID,
'ObjectID',
'CustomerKey'
);
triggeredSend.r__sendClassification_key = scKey;
delete triggeredSend.sendClassificationId;
} catch (ex) {
Util.logger.warn(
` - triggeredSend ${linkedTS.CustomerKey}: ${ex.message} (sendClassification key ${linkedTS.SendClassification.CustomerKey})`
);
}
} else if (linkedTS.r__sendClassification_key) {
triggeredSend.r__sendClassification_key =
linkedTS.r__sendClassification_key;
}
if (linkedTS.c__priority) {
delete triggeredSend.priority;
triggeredSend.c__priority = linkedTS.c__priority;
}
if (linkedTS.Email?.ID) {
triggeredSend.emailId = linkedTS.Email.ID;
} else if (linkedTS.r__asset_key) {
delete triggeredSend.emailId;
triggeredSend.r__asset_name_readOnly =
linkedTS.r__asset_name_readOnly;
triggeredSend.r__asset_key = linkedTS.r__asset_key;
}
}
} else if (triggeredSend.id) {
Expand Down Expand Up @@ -707,7 +736,7 @@ class Journey extends MetadataType {
}

// List (optional)
triggeredSend.r__list_PathName = {};
triggeredSend.r__list_PathName ||= {};
if (triggeredSend.publicationListId) {
try {
triggeredSend.r__list_PathName.publicationList =
Expand Down Expand Up @@ -827,37 +856,39 @@ class Journey extends MetadataType {
delete triggeredSend.priority;
}
// email
try {
// content builder
triggeredSend.r__asset_name_readOnly = cache.searchForField(
'asset',
triggeredSend.emailId,
'legacyData.legacyId',
'name'
);
triggeredSend.r__asset_key = cache.searchForField(
'asset',
triggeredSend.emailId,
'legacyData.legacyId',
'customerKey'
);
delete triggeredSend.emailId;
} catch {
if (triggeredSend.emailId) {
try {
// classic
triggeredSend.r__email_name = cache.searchForField(
'email',
// content builder
triggeredSend.r__asset_name_readOnly = cache.searchForField(
'asset',
triggeredSend.emailId,
'legacyData.legacyId',
'name'
);
triggeredSend.r__asset_key = cache.searchForField(
'asset',
triggeredSend.emailId,
'ID',
'Name'
'legacyData.legacyId',
'customerKey'
);
delete triggeredSend.emailId;
} catch {
Util.logger.warn(
` - ${this.definition.type} '${metadata[this.definition.nameField]}' (${
metadata[this.definition.keyField]
}): Could not find email with ID ${triggeredSend.emailId} in Classic nor in Content Builder.`
);
try {
// classic
triggeredSend.r__email_name = cache.searchForField(
'email',
triggeredSend.emailId,
'ID',
'Name'
);
delete triggeredSend.emailId;
} catch {
Util.logger.warn(
` - ${this.definition.type} '${metadata[this.definition.nameField]}' (${
metadata[this.definition.keyField]
}): Could not find email with ID ${triggeredSend.emailId} in Classic nor in Content Builder.`
);
}
}
}
}
Expand Down
Loading