pkp#10948 Optimize delete query and resequence at vocab insertion

touhidurabir · Feb 19, 2025 · 346ea85 · 346ea85
1 parent fe56411
commit 346ea85
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/classes/controlledVocab/Repository.php b/classes/controlledVocab/Repository.php
@@ -82,20 +82,14 @@ public function insertBySymbolic(
     ): void
     {
         $controlledVocab = $this->build($symbolic, $assocType, $assocId);
-        $controlledVocab->load('controlledVocabEntries');
         $controlledVocabEntry = new ControlledVocabEntry;
         $controlledVocabEntrySettings = $controlledVocabEntry->getSettings();
         $multilingualProps = array_flip($controlledVocabEntry->getMultilingualProps());
         $idKey = ControlledVocabEntry::CONTROLLED_VOCAB_ENTRY_IDENTIFIER;
         $srcKey = ControlledVocabEntry::CONTROLLED_VOCAB_ENTRY_SOURCE;
 
         if ($deleteFirst) {
-            ControlledVocabEntry::query()
-                ->whereIn(
-                    (new ControlledVocabEntry)->getKeyName(),
-                    $controlledVocab->controlledVocabEntries->pluck('id')->toArray()
-                )
-                ->delete();
+            ControlledVocabEntry::query()->withControlledVocabId($controlledVocab->id)->delete();
         }
 
         collect($vocabs)
@@ -122,7 +116,11 @@ public function insertBySymbolic(
                     )
             );
 
-        $this->resequence($controlledVocab->id);
+        // Only resequence at the time of insert when `$deleteFirst` set to false
+        // Otherwise all existing data will be deleted and sequenced at the time of insertion.
+        if (!$deleteFirst) {
+            $this->resequence($controlledVocab->id);
+        }
     }
 
     /**