From f27390d50314c18af022a417b5bb690e65f9d224 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Mon, 12 Jul 2021 23:11:40 +0200
Subject: [PATCH] ImportRunBasedPurgeStrategy: fixed combined keys

fixes #2339
---
 doc/82-Changelog.md                                         | 3 +++
 .../Import/PurgeStrategy/ImportRunBasedPurgeStrategy.php    | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/doc/82-Changelog.md b/doc/82-Changelog.md
index a67b03fe..b19701f1 100644
--- a/doc/82-Changelog.md
+++ b/doc/82-Changelog.md
@@ -48,6 +48,9 @@ next patch release (will be 1.8.1)
 * FIX: don't fail when showing a Host overriding multiple inherited groups (#2253)
 * FIX: deal with inherited values which are invalid for a select box (#2288)
 
+### Import and Sync
+* FIX: Purge didn't remove more than 1000 services at once (#2339)
+
 ### Automation, User Interface
 * FIX: error message wording on failing related (or parent) object ref (#2224)
 
diff --git a/library/Director/Import/PurgeStrategy/ImportRunBasedPurgeStrategy.php b/library/Director/Import/PurgeStrategy/ImportRunBasedPurgeStrategy.php
index e8a7ae15..9f0e8ab5 100644
--- a/library/Director/Import/PurgeStrategy/ImportRunBasedPurgeStrategy.php
+++ b/library/Director/Import/PurgeStrategy/ImportRunBasedPurgeStrategy.php
@@ -71,14 +71,14 @@ class ImportRunBasedPurgeStrategy extends PurgeStrategy
             $columns = SyncUtils::getRootVariables(
                 SyncUtils::extractVariableNames($pattern)
             );
-
+            $resultForCombinedKey = array();
             foreach (array_chunk($result, 1000) as $keys) {
                 $rows = $runA->fetchRows($columns, null, $keys);
-                $result = array();
                 foreach ($rows as $row) {
-                    $result[] = SyncUtils::fillVariables($pattern, $row);
+                    $resultForCombinedKey[] = SyncUtils::fillVariables($pattern, $row);
                 }
             }
+            $result = $resultForCombinedKey;
         }
 
         if (empty($result)) {