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

RD - Handle updating commitments where productMetadata is null #6923

Closed
wants to merge 2 commits into from
Closed

RD - Handle updating commitments where productMetadata is null #6923

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c7050f
RD - Handle updating commitments where productMetadata is null
Apr 12, 2022
5ea33c7
Elevate/Payments - Use putAll consistently in mergeWithExistingMetadata.
Apr 13, 2022
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
11 changes: 8 additions & 3 deletions force-app/main/default/classes/PS_ProductMetadata.cls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,14 +68,19 @@ public inherited sharing class PS_ProductMetadata {
return this.origin?.type != null;
}

public Map<String, Object> mergeWithExistingMetadata(Map<String, Object> existingMetadata) {
public Map<String, Object> mergeWithExistingMetadata(final Map<String, Object> existingMetadata) {
Map<String, Object> updatedMetadata = this.toUntypedMap();
Map<String, Object> mergedMetadata = new Map<String, Object>();

if (existingMetadata != null) {
mergedMetadata.putAll(existingMetadata);
}

for(String key : updatedMetadata.keySet()) {
existingMetadata.put(key, updatedMetadata.get(key));
mergedMetadata.put(key, updatedMetadata.get(key));
}

return existingMetadata;
return mergedMetadata;
}

public Map<String, Object> toUntypedMap() {
Expand Down
20 changes: 17 additions & 3 deletions force-app/main/default/classes/PS_ProductMetadata_TEST.cls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ private with sharing class PS_ProductMetadata_TEST {
*/
@isTest
private static void shouldCreateUntypedMap() {
String campaignId = '701R00000027JNdIAA';
String campaignId = UTIL_UnitTestData_TEST.mockId(Campaign.SObjectType);
String originType = PS_Request.OriginType.CRM.name();

PS_ProductMetadata productMetadata = new PS_ProductMetadata()
Expand Down Expand Up @@ -75,7 +75,7 @@ private with sharing class PS_ProductMetadata_TEST {

@IsTest
static void productMetadataShouldPreserveOrigin() {
String newCampaignId = '701R00000027JNdIAA';
String newCampaignId = UTIL_UnitTestData_TEST.mockId(Campaign.SObjectType);
String serializedProductMetadata = '{"origin":{"type":"CRM"},"campaign":{"id":"701R00000027JNdIAM"}}';
Map<String, Object> untypedMetadata = (Map<String, Object>) JSON.deserializeUntyped(serializedProductMetadata);

Expand All @@ -90,7 +90,7 @@ private with sharing class PS_ProductMetadata_TEST {

@IsTest
static void productMetadataShouldPreserveAny() {
String newCampaignId = '701R00000027JNdIAA';
String newCampaignId = UTIL_UnitTestData_TEST.mockId(Campaign.SObjectType);
String serializedProductMetadata = '{"origin":{"type":"CRM"},"campaign":{"id":"701R00000027JNdIAM"},"consent":{"message":"Some message","optin":true}}';
Map<String, Object> untypedMetadata = (Map<String, Object>) JSON.deserializeUntyped(serializedProductMetadata);

Expand All @@ -111,6 +111,20 @@ private with sharing class PS_ProductMetadata_TEST {
System.assertEquals(true, optin);
}

@IsTest
static void productMetadataShouldMergeWhenExistingMetadataIsNull() {
String newCampaignId = UTIL_UnitTestData_TEST.mockId(Campaign.SObjectType);
PS_ProductMetadata productMetadata = new PS_ProductMetadata().withCampaign(newCampaignId);

Test.startTest();
Map<String, Object> updatedUntypedMetadata = productMetadata.mergeWithExistingMetadata(null);
Test.stopTest();

PS_ProductMetadata updatedMetadata = parseUntypedMetadata(updatedUntypedMetadata);

System.assertEquals(newCampaignId, updatedMetadata.campaign.id);
}

/**
* @param untypedProductMetadata Parse origin and campaign out of productMetadata Map<String, Object>
*
Expand Down