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

W-15103158 - Fix incorrect updates to the System_Custom_Naming field #7277

Merged
merged 1 commit into from
Jan 21, 2025
Merged

W-15103158 - Fix incorrect updates to the System_Custom_Naming field #7277

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
38 changes: 35 additions & 3 deletions force-app/main/service/HouseholdNamingService.cls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
public without sharing class HouseholdNamingService {

private HouseholdSettings settings = new HouseholdSettings();
private static Boolean isNamingServiceExecuted = false;

@TestVisible
private ContactSelector contactSelector {
Expand Down Expand Up @@ -419,12 +420,38 @@ public without sharing class HouseholdNamingService {
}

public void setCustomNamingField(List<SObject> records, Map<Id, SObject> oldMap) {
if (isNamingServiceExecuted) {
return;
}
isNamingServiceExecuted = true;

for (SObject household : records) {
SObject oldRecord = oldMap.get(household.Id);
setCustomNamingStringValue(household, oldRecord);
// Update only if manual changes are detected in the relevant fields
if (manualChangesDetected(household, oldRecord)) {
setCustomNamingStringValue(household, oldRecord); // Populate the custom naming field
} else {
household.put('npo02__SYSTEM_CUSTOM_NAMING__c', null);
}
}
}

private Boolean manualChangesDetected(SObject household, SObject oldRecord) {
// Detect changes in fields that impact the custom naming logic
return hasFieldChanged(household, oldRecord, 'npo02__Formal_Greeting__c') ||
hasFieldChanged(household, oldRecord, 'npo02__Informal_Greeting__c') ||
hasFieldChanged(household, oldRecord, 'Name');
}

private Boolean hasFieldChanged(SObject current, SObject oldRecord, String fieldApiName) {
if (oldRecord == null) {
return true; // Treat as changed if no old record exists
}
Object currentValue = current.get(fieldApiName);
Object oldValue = oldRecord.get(fieldApiName);
return currentValue != oldValue; // Compare values for change
}

public void setNameAndGreetingsToReplacementText(List<SObject> records) {
for (SObject household : records) {
setNameAndGreetingsToReplacementText(household);
Expand Down Expand Up @@ -534,8 +561,13 @@ public without sharing class HouseholdNamingService {
private void setCustomNamingStringValue(SObject household, SObject oldRecord) {
HouseholdNamingUserControlledFields userControlledNamingFields =
new HouseholdNamingUserControlledFields(household, oldRecord);
household.put('npo02__SYSTEM_CUSTOM_NAMING__c',
userControlledNamingFields.asConcatenatedString());
String concatenatedValue = userControlledNamingFields.asConcatenatedString();

if (!String.isBlank(concatenatedValue)) {
household.put('npo02__SYSTEM_CUSTOM_NAMING__c', concatenatedValue); // Populate field
} else {
household.put('npo02__SYSTEM_CUSTOM_NAMING__c', null); // Clear the field if no value is needed
}
}

private String namingOverridesFor(SObject household) {
Expand Down
Loading