CleadIndexCommand & refactoring of "getConfigFieldName" method

Author: mdiyakov

Command/ClearIndexCommand.php

@@ -135,24 +135,32 @@ private function deleteByEntityConfig($entityConfig, $id = null)
         $schemaName = $entityConfig['schema'];
         $updateQuery = $this->updateQueryBuilder->buildUpdateQueryBySchemaName($schemaName);
         $schema = $this->config->getSchemaByName($schemaName);
-        $discriminatorField = $schema->getDiscriminatorConfigField();
-        $discriminatorValue = $discriminatorField->getValue($entityConfig);
 
         if (empty($id)) {
-            $updateQuery->addDeleteCriteriaByField(
+            $discriminatorField = $schema->getDiscriminatorConfigField();
+            $discriminatorValue = $discriminatorField->getValue($entityConfig);
+            $updateQuery->addDeleteCriteriaByConfigField(
                 $discriminatorField->getDocumentFieldName(),
                 $discriminatorValue
             );
-            $message = sprintf('Removing of %s is completed successfully',
-                $entityConfig['class']
-            );
-
+            $message = sprintf('Removing of %s is completed successfully', $entityConfig['class']);
         } else {
+            $entityClass = $entityConfig['class'];
+            $repository = $this->em->getRepository($entityClass);
+            $entity = $repository->find($id);
+
+            if (!$entity) {
+                throw new EntityNotFoundException(
+                    sprintf('% with %s id is not found', $entityClass, $id)
+                );
+            }
+
             $updateQuery->addDeleteCriteriaByUniqueFieldValue(
-                sprintf('%s-%s', $discriminatorValue, $id)
+                $schema->getDocumentUniqueField()->getValue($entity, $entityConfig)
             );
+
             $message = sprintf('Removing of %s with id %s is completed successfully',
-                $entityConfig['class'],
+                $entityClass,
                 $id
             );
 

Query/Select/AbstractSelectQuery.php

@@ -432,7 +432,7 @@ private function prepareField($fieldName, $isConfigField = false)
         }
 
         if ($isConfigField) {
-            $field = $this->schema->getConfigFieldName($fieldName);
+            $field = $this->schema->getConfigFieldByName($fieldName);
         } else {
             $field = $this->getField($fieldName);
         }

Query/Update/UpdateQuery.php

@@ -119,7 +119,7 @@ public function addConfigField($configFieldName, $value)
             throw new UpdateQueryException('Entity is not started. Call "beginEntity" method before add field value');
         }
 
-        $configEntityField = $this->schema->getConfigFieldName($configFieldName);
+        $configEntityField = $this->schema->getConfigFieldByName($configFieldName);
         $this->addFieldsConditions[$configEntityField->getDocumentFieldName()] = $value;
     }
 
@@ -161,6 +161,16 @@ public function addDeleteCriteriaByField($entityFieldName, $value)
         $this->deleteConditions[$field->getDocumentFieldName()] = $value;
     }
 
+    /**
+     * @param string $entityFieldName
+     * @param mixed $value
+     */
+    public function addDeleteCriteriaByConfigField($entityFieldName, $value)
+    {
+        $field = $this->schema->getConfigFieldByName($entityFieldName);
+        $this->deleteConditions[$field->getDocumentFieldName()] = $value;
+    }
+
 
     /**
      * @param $value

Schema/Schema.php

@@ -184,7 +184,7 @@ public function getClient()
      * @param $configFieldName
      * @return mixed
      */
-    public function getConfigFieldName($configFieldName)
+    public function getConfigFieldByName($configFieldName)
     {
         if (!array_key_exists($configFieldName, $this->configEntityFields)) {
             throw new SchemaConfigException(

Tests/Query/Select/AbstractSelectQueryTest.php

@@ -19,7 +19,7 @@ public function testAddConfigFieldOrWhere()
         $searchTerm = 'search';
 
         $schema->expects($this->any())
-            ->method('getConfigFieldName')
+            ->method('getConfigFieldByName')
             ->with($fieldName)
             ->will($this->returnValue($field));
         ;