Skip to content
Open
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ global with sharing class LogEntryEventBuilder {
* @return The same instance of `LogEntryEventBuilder`, useful for chaining methods
*/
global LogEntryEventBuilder setApprovalResult(List<Approval.LockResult> lockResults) {
return this.setDatabaseDetails(lockResults, Approval.LockResult.class, null);
return this.setDatabaseDetails(lockResults, Approval.LockResult.class, ((Approval.LockResult)fetchOnlyElement(lockResults))?.getId());
}

/**
Expand All @@ -239,7 +239,7 @@ global with sharing class LogEntryEventBuilder {
* @return The same instance of `LogEntryEventBuilder`, useful for chaining methods
*/
global LogEntryEventBuilder setApprovalResult(List<Approval.ProcessResult> processResults) {
return this.setDatabaseDetails(processResults, Approval.ProcessResult.class, null);
return this.setDatabaseDetails(processResults, Approval.ProcessResult.class, ((Approval.ProcessResult)fetchOnlyElement(processResults))?.getEntityId());
}

/**
Expand All @@ -248,7 +248,7 @@ global with sharing class LogEntryEventBuilder {
* @return The same instance of `LogEntryEventBuilder`, useful for chaining methods
*/
global LogEntryEventBuilder setApprovalResult(List<Approval.UnlockResult> unlockResults) {
return this.setDatabaseDetails(unlockResults, Approval.UnlockResult.class, null);
return this.setDatabaseDetails(unlockResults, Approval.UnlockResult.class, ((Approval.UnlockResult)fetchOnlyElement(unlockResults))?.getId());
}

// DML-result builder methods. All* of the Result classes behave the same (*except Upsert)
Expand Down Expand Up @@ -332,7 +332,7 @@ global with sharing class LogEntryEventBuilder {
* @return The same instance of `LogEntryEventBuilder`, useful for chaining methods
*/
global LogEntryEventBuilder setDatabaseResult(List<Database.DeleteResult> deleteResults) {
return this.setDatabaseDetails(deleteResults, Database.DeleteResult.class, null);
return this.setDatabaseDetails(deleteResults, Database.DeleteResult.class, ((Database.DeleteResult)fetchOnlyElement(deleteResults))?.getId());
}

/**
Expand All @@ -341,7 +341,7 @@ global with sharing class LogEntryEventBuilder {
* @return The same instance of `LogEntryEventBuilder`, useful for chaining methods
*/
global LogEntryEventBuilder setDatabaseResult(List<Database.EmptyRecycleBinResult> emptyRecycleBinResults) {
return this.setDatabaseDetails(emptyRecycleBinResults, Database.EmptyRecycleBinResult.class, null);
return this.setDatabaseDetails(emptyRecycleBinResults, Database.EmptyRecycleBinResult.class, ((Database.EmptyRecycleBinResult)fetchOnlyElement(emptyRecycleBinResults))?.getId());
}

/**
Expand All @@ -350,7 +350,7 @@ global with sharing class LogEntryEventBuilder {
* @return The same instance of `LogEntryEventBuilder`, useful for chaining methods
*/
global LogEntryEventBuilder setDatabaseResult(List<Database.LeadConvertResult> leadConvertResults) {
return this.setDatabaseDetails(leadConvertResults, Database.LeadConvertResult.class, null);
return this.setDatabaseDetails(leadConvertResults, Database.LeadConvertResult.class, ((Database.LeadConvertResult)fetchOnlyElement(leadConvertResults))?.getLeadId());
}

/**
Expand All @@ -359,7 +359,7 @@ global with sharing class LogEntryEventBuilder {
* @return The same instance of `LogEntryEventBuilder`, useful for chaining methods
*/
global LogEntryEventBuilder setDatabaseResult(List<Database.MergeResult> mergeResults) {
return this.setDatabaseDetails(mergeResults, Database.MergeResult.class, null);
return this.setDatabaseDetails(mergeResults, Database.MergeResult.class, ((Database.MergeResult)fetchOnlyElement(mergeResults))?.getId());
}

/**
Expand All @@ -368,7 +368,7 @@ global with sharing class LogEntryEventBuilder {
* @return The same instance of `LogEntryEventBuilder`, useful for chaining methods
*/
global LogEntryEventBuilder setDatabaseResult(List<Database.SaveResult> saveResults) {
return this.setDatabaseDetails(saveResults, Database.SaveResult.class, null);
return this.setDatabaseDetails(saveResults, Database.SaveResult.class, ((Database.SaveResult)fetchOnlyElement(saveResults))?.getId());
}

/**
Expand All @@ -377,7 +377,7 @@ global with sharing class LogEntryEventBuilder {
* @return The same instance of `LogEntryEventBuilder`, useful for chaining methods
*/
global LogEntryEventBuilder setDatabaseResult(List<Database.UpsertResult> upsertResults) {
return this.setDatabaseDetails(upsertResults, Database.UpsertResult.class, null);
return this.setDatabaseDetails(upsertResults, Database.UpsertResult.class, ((Database.UpsertResult)fetchOnlyElement(upsertResults))?.getId());
}

/**
Expand All @@ -386,7 +386,7 @@ global with sharing class LogEntryEventBuilder {
* @return The same instance of `LogEntryEventBuilder`, useful for chaining methods
*/
global LogEntryEventBuilder setDatabaseResult(List<Database.UndeleteResult> undeleteResults) {
return this.setDatabaseDetails(undeleteResults, Database.UndeleteResult.class, null);
return this.setDatabaseDetails(undeleteResults, Database.UndeleteResult.class, ((Database.UndeleteResult)fetchOnlyElement(undeleteResults))?.getId());
}

/**
Expand Down Expand Up @@ -1331,6 +1331,10 @@ global with sharing class LogEntryEventBuilder {
return securityDecision.getRecords();
}

private static Object fetchOnlyElement(List<Object> objs) {
return objs?.size() == 1 ? objs.get(0) : null;
}

@SuppressWarnings('PMD.ApexDoc')
public class LoggingContext {
public String currentEntryScenario;
Expand Down