diff --git a/modules/salesforce_mapping/tests/src/Unit/SalesforceMappingTest.php b/modules/salesforce_mapping/tests/src/Unit/SalesforceMappingTest.php index 5a5df8cea36bcc31f3d459e46ba3005594743aaf..5447866fc58c889be634c8c1fce282b572c5d84e 100644 --- a/modules/salesforce_mapping/tests/src/Unit/SalesforceMappingTest.php +++ b/modules/salesforce_mapping/tests/src/Unit/SalesforceMappingTest.php @@ -192,11 +192,12 @@ class SalesforceMappingTest extends UnitTestCase { $expectedQuery->addCondition($this->mapping->getPullTriggerDate(), gmdate('Y-m-d\TH:i:s\Z', $start), '>'); $expectedQuery->addCondition($this->mapping->getPullTriggerDate(), gmdate('Y-m-d\TH:i:s\Z', $stop), '<'); $expectedQuery->fields = $this->mapping->getPullFieldsArray(); - $expectedQuery->fields[] = 'Id'; - $expectedQuery->fields[] = $this->mapping->getPullTriggerDate(); $expectedQuery->order[$this->mapping->getPullTriggerDate()] = 'ASC'; ksort($expectedQuery->fields); ksort($query->fields); + $expectedQuery->fields['Id'] = 'Id'; + $expectedQuery->fields[$this->mapping->getPullTriggerDate()] = $this->mapping->getPullTriggerDate(); + $expectedQuery->fields['LastModifiedDate'] = 'LastModifiedDate'; $this->assertEquals($expectedQuery->fields, $query->fields); ksort($expectedQuery->order); ksort($query->order); diff --git a/modules/salesforce_pull/src/DeleteHandler.php b/modules/salesforce_pull/src/DeleteHandler.php index bf7a3058d3c5bc42a2df4c01d547be7ac73a0a75..e11a9db4749f02ff7baede83761573d16c0875dc 100644 --- a/modules/salesforce_pull/src/DeleteHandler.php +++ b/modules/salesforce_pull/src/DeleteHandler.php @@ -227,12 +227,12 @@ class DeleteHandler { try { // Flag this entity to avoid duplicate processing. $entity->setSyncing(TRUE); - + $entity_id = $entity->id(), $entity->delete(); $message = 'Deleted entity %label with ID: %id associated with Salesforce Object ID: %sfid'; $args = [ '%label' => $entity->label(), - '%id' => $mapped_object->entity_id, + '%id' => $entity->id(), '%sfid' => $record['id'], ]; $this->eventDispatcher->dispatch(new SalesforceNoticeEvent(NULL, $message, $args), SalesforceEvents::NOTICE);