[Thesaurus] Fix #3768, remove warning if term repeated only in right hand side of expansions

Author: vahonc

src/module-elasticsuite-thesaurus/Model/Thesaurus.php

@@ -299,56 +299,113 @@ public function setIsActive($status)
     }
 
     /**
-     * Check for existing terms in other thesaurus
+     * Check for existing terms in other thesaurus.
+     *
+     * For thesaurus with type 'expansion' we only show a warning about duplicate when the reference term (LHS)
+     * exists as a reference term in another thesaurus (duplicate LHS). Duplicate values (RHS) are ignored entirely.
+     *
+     * For thesaurus with type 'synonym' all synonym terms are checked on duplicate across all tables.
+     * If duplicates exist, a warning about duplicate will be displayed.
      *
      * @return void
+     *
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
      */
-    public function checkThesaurusTerms()
+    public function checkThesaurusTerms(): void
     {
         $termsData = $this->getTermsData();
+        $currentType = $this->getType();
+
+        $connection = $this->resourceConnection->getConnection();
+        $referenceTable = $this->resourceConnection->getTableName(self::THESAURUS_REFERENCE_TERMS_TABLE_NAME);
+        $expandedTable  = $this->resourceConnection->getTableName(self::THESAURUS_EXPANDED_TERMS_TABLE_NAME);
+
+        $lhs = [];
+        $rhs = [];
 
-        $terms = [];
-        foreach ($termsData as $termData) {
-            if (isset($termData['reference_term']) && !empty($termData['reference_term'])) {
-                $terms[] = $termData['reference_term'];
+        foreach ($termsData as $row) {
+            if (!empty($row['reference_term'])) {
+                $lhs[] = trim($row['reference_term']);
             }
+            if (!empty($row['values'])) {
+                foreach (explode(',', $row['values']) as $v) {
+                    $value = trim($v);
+                    if ($value !== '') {
+                        $rhs[] = $value;
+                    }
+                }
+            }
+        }
+
+        $lhs = array_values(array_unique($lhs));
+        $rhs = array_values(array_unique($rhs));
 
-            $terms = array_merge($terms, explode(',', $termData['values']));
+        if (empty($lhs) && empty($rhs)) {
+            return;
         }
 
-        $connection = $this->resourceConnection->getConnection();
-        $expandedTableName = $this->resourceConnection->getTableName(self::THESAURUS_EXPANDED_TERMS_TABLE_NAME);
-        $referenceTableName = $this->resourceConnection->getTableName(self::THESAURUS_REFERENCE_TERMS_TABLE_NAME);
-
-        $selectExpanded = $connection->select()
-            ->from(['expanded' => $expandedTableName], ['term', 'thesaurus_id', 'count' => 'COUNT(*)'])
-            ->where('expanded.term IN (?)', $terms)
-            ->where('expanded.thesaurus_id != ?', $this->getId())
-            ->group(['term', 'thesaurus_id'])
-            ->order('expanded.term ASC');
-
-        $selectReference = $connection->select()
-            ->from(['reference' => $referenceTableName], ['term', 'thesaurus_id', 'count' => 'COUNT(*)'])
-            ->where('reference.term IN (?)', $terms)
-            ->where('reference.thesaurus_id != ?', $this->getId())
+        // Logic for thesaurus with type 'expansion'.
+        if ($currentType === self::TYPE_EXPANSION) {
+            if (empty($lhs)) {
+                return;
+            }
+
+            $select = $connection->select()
+                ->from(['r' => $referenceTable], ['term', 'thesaurus_id', 'count' => 'COUNT(*)'])
+                ->where('r.term IN (?)', $lhs)
+                ->where('r.thesaurus_id != ?', (int) $this->getId())
+                ->group(['term', 'thesaurus_id']);
+
+            $rows = $connection->fetchAll($select);
+
+            foreach ($rows as $row) {
+                if ($row['count'] > 0) {
+                    $name = $this->getThesaurusNameById($row['thesaurus_id']);
+                    $this->messageManager->addWarning(__(
+                        'The reference term "<strong>%1</strong>" is already defined as a ' .
+                        'reference term in the <strong>%2</strong> thesaurus.',
+                        $row['term'],
+                        $name
+                    ));
+                }
+            }
+
+            return;
+        }
+
+        // Logic for thesaurus with type 'synonym'.
+        $allTerms = array_unique(array_merge($lhs, $rhs));
+
+        if (empty($allTerms)) {
+            return;
+        }
+
+        $selectRef = $connection->select()
+            ->from(['r' => $referenceTable], ['term', 'thesaurus_id', 'count' => 'COUNT(*)'])
+            ->where('r.term IN (?)', $allTerms)
+            ->where('r.thesaurus_id != ?', (int) $this->getId())
             ->group(['term', 'thesaurus_id']);
 
-        $resultExpanded = $connection->fetchAll($selectExpanded);
-        $resultReference = $connection->fetchAll($selectReference);
+        $selectExp = $connection->select()
+            ->from(['e' => $expandedTable], ['term', 'thesaurus_id', 'count' => 'COUNT(*)'])
+            ->where('e.term IN (?)', $allTerms)
+            ->where('e.thesaurus_id != ?', (int) $this->getId())
+            ->group(['term', 'thesaurus_id']);
 
-        $result = array_merge($resultReference, $resultExpanded);
+        $rows = array_merge(
+            $connection->fetchAll($selectRef),
+            $connection->fetchAll($selectExp)
+        );
 
-        foreach ($result as $row) {
+        foreach ($rows as $row) {
             if ($row['count'] > 0) {
-                $existingThesaurusId = $row['thesaurus_id'];
-                $existingThesaurusName = $this->getThesaurusNameById($existingThesaurusId);
-
-                $message = __(
+                $name = $this->getThesaurusNameById($row['thesaurus_id']);
+                $this->messageManager->addWarning(__(
                     'The term "<strong>%1</strong>" is already existing in the <strong>%2</strong> thesaurus.',
                     $row['term'],
-                    $existingThesaurusName
-                );
-                $this->messageManager->addWarning($message);
+                    $name
+                ));
             }
         }
     }