From 77c83c32b11af1149283c32cc43924ba2c6f19d1 Mon Sep 17 00:00:00 2001
From: Tauno Hogue <tauno@thinkshout.com>
Date: Thu, 27 Jul 2017 16:24:48 -0700
Subject: [PATCH] Sort mappings by weight when loading them
---
.../src/Form/SalesforceMappingFormCrudBase.php | 2 +-
.../src/SalesforceMappingStorage.php | 14 ++++++++++++++
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/modules/salesforce_mapping/src/Form/SalesforceMappingFormCrudBase.php b/modules/salesforce_mapping/src/Form/SalesforceMappingFormCrudBase.php
index 118d38f7..cfb870a3 100644
--- a/modules/salesforce_mapping/src/Form/SalesforceMappingFormCrudBase.php
+++ b/modules/salesforce_mapping/src/Form/SalesforceMappingFormCrudBase.php
@@ -338,7 +338,7 @@ abstract class SalesforceMappingFormCrudBase extends SalesforceMappingFormBase {
'#title' => t('Weight'),
'#type' => 'select',
'#options' => array_combine(range(-50, 50), range(-50, 50)),
- '#description' => t('Not yet in use.'),
+ '#description' => t('During cron, mapping weight determines in which order items will be pushed or pulled. Lesser weight items will be pushed or pulled before greater weight items.'),
'#default_value' => $mapping->weight,
];
diff --git a/modules/salesforce_mapping/src/SalesforceMappingStorage.php b/modules/salesforce_mapping/src/SalesforceMappingStorage.php
index 13f52c3f..4c861faa 100644
--- a/modules/salesforce_mapping/src/SalesforceMappingStorage.php
+++ b/modules/salesforce_mapping/src/SalesforceMappingStorage.php
@@ -152,6 +152,20 @@ class SalesforceMappingStorage extends ConfigEntityStorage {
return $pull_mappings;
}
+ /**
+ * {@inheritdoc}
+ */
+ public function loadByProperties(array $values = []) {
+ // Build a query to fetch the entity IDs.
+ $entity_query = $this->getQuery();
+ $this->buildPropertyQuery($entity_query, $values);
+ // Sort by the mapping weight to ensure entities/objects are processed in
+ // the correct order.
+ $entity_query->sort('weight');
+ $result = $entity_query->execute();
+ return $result ? $this->loadMultiple($result) : [];
+ }
+
/**
* Return a unique list of mapped Salesforce object types.
* @see loadMultipleMapping()
--
GitLab