✂️ Resolve relationships on upsert

Author: jonathanwiesel

sfdx-source/apex-common/main/classes/fflib_SObjectUnitOfWork.cls

@@ -772,6 +772,7 @@ public virtual class fflib_SObjectUnitOfWork
         String sobjName;
         for (Schema.SObjectType sObjectType : m_sObjectTypes) {
             sobjName = sObjectType.getDescribe().getName();
+            m_relationships.get(sobjName).resolve();
 			m_dml.dmlUpsert(m_upsertRecordsPerType.get(sobjName), m_externalIdToUpsertPerType.get(sobjName));
 		}
     }
@@ -964,7 +965,8 @@ public virtual class fflib_SObjectUnitOfWork
 
         public void resolve()
         {
-            this.Record.put( this.RelatedToField, this.RelatedTo.Id);
+            if (this.Record.get(this.RelatedToField) == null) 
+                this.Record.put( this.RelatedToField, this.RelatedTo.Id);
         }
     }
 

sfdx-source/apex-common/test/classes/fflib_SObjectUnitOfWorkTest.cls

@@ -589,6 +589,97 @@ private with sharing class fflib_SObjectUnitOfWorkTest
         System.assertEquals(1, [SELECT COUNT() FROM Opportunity WHERE StageName = 'Closed']);
     }
 
+
+    @isTest
+    private static void testRegisterUpsertByExternalIdParentWillResolve() {
+
+        Opportunity existingOpp = new Opportunity(Name = 'Existing Opportunity', StageName = 'Open', CloseDate = System.today());
+        insert existingOpp;
+
+        existingOpp.StageName = 'Closed';
+
+        System.assertEquals(1, [SELECT COUNT() FROM Opportunity]);
+        System.assertEquals(0, [SELECT COUNT() FROM Opportunity WHERE StageName = 'Closed']);
+        
+        List<Schema.SObjectType> orderWithAccounts = new List<Schema.SObjectType>();
+        orderWithAccounts.add(Account.SObjectType);
+        orderWithAccounts.addAll(MY_SOBJECTS);
+
+        String accName = 'new account';
+        Account newAccount = new Account(Name = accName);
+
+        Test.startTest();
+            fflib_SObjectUnitOfWork uow = new fflib_SObjectUnitOfWork(orderWithAccounts);
+            uow.registerNew(newAccount);
+            uow.registerUpsert(existingOpp, Opportunity.Id, Opportunity.AccountId, newAccount);
+            uow.commitWork();
+        Test.stopTest();
+
+        System.assertEquals(1, [SELECT COUNT() FROM Opportunity]);
+
+        Opportunity updatedOpp = [SELECT StageName, Account.Name FROM Opportunity];
+        System.assertEquals('Closed', updatedOpp.StageName);
+        System.assertEquals(accName, updatedOpp.Account.Name );
+    }
+
+
+    @isTest
+    private static void testRegisterUpsertByExternalIdChildWillResolve() {
+
+        Opportunity newOpportunity = new Opportunity(Name = 'Existing Opportunity', StageName = 'Closed', CloseDate = System.today());
+
+        Account existingAccount = new Account(Name = 'old account name');
+        insert existingAccount;
+        
+        List<Schema.SObjectType> orderWithAccounts = new List<Schema.SObjectType>();
+        orderWithAccounts.add(Account.SObjectType);
+        orderWithAccounts.addAll(MY_SOBJECTS);
+
+        String accName = 'new account';
+
+        existingAccount.Name = accName;
+
+        Test.startTest();
+            fflib_SObjectUnitOfWork uow = new fflib_SObjectUnitOfWork(orderWithAccounts);
+            uow.registerDirty(existingAccount);
+            uow.registerUpsert(newOpportunity, Opportunity.Id, Opportunity.AccountId, existingAccount);
+            uow.commitWork();
+        Test.stopTest();
+
+        System.assertEquals(1, [SELECT COUNT() FROM Opportunity]);
+
+        Opportunity updatedOpp = [SELECT StageName, Account.Name FROM Opportunity];
+        System.assertEquals('Closed', updatedOpp.StageName);
+        System.assertEquals(accName, updatedOpp.Account.Name );
+    }
+
+
+    @isTest
+    private static void testRegisterUpsertByExternalIdBothWillResolve() {
+
+        Opportunity newOpportunity = new Opportunity(Name = 'Existing Opportunity', StageName = 'Closed', CloseDate = System.today());
+
+        String accName = 'new account';
+        Account newAccount = new Account(Name = accName);
+        
+        List<Schema.SObjectType> orderWithAccounts = new List<Schema.SObjectType>();
+        orderWithAccounts.add(Account.SObjectType);
+        orderWithAccounts.addAll(MY_SOBJECTS);
+
+        Test.startTest();
+            fflib_SObjectUnitOfWork uow = new fflib_SObjectUnitOfWork(orderWithAccounts);
+            uow.registerNew(newAccount);
+            uow.registerUpsert(newOpportunity, Opportunity.Id, Opportunity.AccountId, newAccount);
+            uow.commitWork();
+        Test.stopTest();
+
+        System.assertEquals(1, [SELECT COUNT() FROM Opportunity]);
+
+        Opportunity updatedOpp = [SELECT StageName, Account.Name FROM Opportunity];
+        System.assertEquals('Closed', updatedOpp.StageName);
+        System.assertEquals(accName, updatedOpp.Account.Name );
+    }
+
     /**
      * Assert that actual events exactly match expected events (size, order and name)
      * and types match expected types