From d8bc7b6b3a6d17cbd8328e9b73472743599b06db Mon Sep 17 00:00:00 2001
From: PremSuthar <jangidprem1999@gmail.com>
Date: Tue, 28 Jan 2025 20:49:45 +0530
Subject: [PATCH 1/2] Try To address the #3 suggestion and convert the patch to
mr for better review.
---
modules/salesforce_push/salesforce_push.module | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/modules/salesforce_push/salesforce_push.module b/modules/salesforce_push/salesforce_push.module
index ffb8d1f8..b3153605 100644
--- a/modules/salesforce_push/salesforce_push.module
+++ b/modules/salesforce_push/salesforce_push.module
@@ -6,6 +6,7 @@
*/
use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Entity\SynchronizableInterface;
use Drupal\salesforce\Event\SalesforceErrorEvent;
use Drupal\salesforce\Event\SalesforceEvents;
use Drupal\salesforce_mapping\Entity\MappedObject;
@@ -46,10 +47,18 @@ function salesforce_push_entity_delete(EntityInterface $entity) {
* One of push_create, push_update, push_delete.
*/
function salesforce_push_entity_crud(EntityInterface $entity, $op) {
+ // Enforce SynchronizableInterface for mappable entities.
+ if (!$entity instanceof SynchronizableInterface) {
+ return;
+ }
+
// Don't allow mapped objects or mappings to be pushed!
- if ($entity->isSyncing()
- || $entity instanceof MappedObjectInterface
- || $entity instanceof SalesforceMappingInterface) {
+ if ($entity instanceof MappedObjectInterface || $entity instanceof SalesforceMappingInterface) {
+ return;
+ }
+
+ // Do not push entities which are synchronizing currently.
+ if ($entity->isSyncing()) {
return;
}
--
GitLab
From c23d6813f4e3822a54b751a920787106b8845f3a Mon Sep 17 00:00:00 2001
From: PremSuthar <jangidprem1999@gmail.com>
Date: Tue, 28 Jan 2025 20:56:37 +0530
Subject: [PATCH 2/2] revert the changes of failed test case.
---
modules/salesforce_push/salesforce_push.module | 5 -----
1 file changed, 5 deletions(-)
diff --git a/modules/salesforce_push/salesforce_push.module b/modules/salesforce_push/salesforce_push.module
index b3153605..02915a16 100644
--- a/modules/salesforce_push/salesforce_push.module
+++ b/modules/salesforce_push/salesforce_push.module
@@ -47,11 +47,6 @@ function salesforce_push_entity_delete(EntityInterface $entity) {
* One of push_create, push_update, push_delete.
*/
function salesforce_push_entity_crud(EntityInterface $entity, $op) {
- // Enforce SynchronizableInterface for mappable entities.
- if (!$entity instanceof SynchronizableInterface) {
- return;
- }
-
// Don't allow mapped objects or mappings to be pushed!
if ($entity instanceof MappedObjectInterface || $entity instanceof SalesforceMappingInterface) {
return;
--
GitLab