Allow inheritance for document and field entities

DependencyInjection/StingerSoftEntitySearchExtension.php → DependencyInjection/StingerSoftDoctrineEntitySearchExtension.php

@@ -20,7 +20,7 @@
  * A Keen Metronic Admin Theme (http://www.keenthemes.com/) Bundle for Symfony2
  * with some additional libraries and PecPlatform specific customization.
  */
-class StingerSoftEntitySearchExtension extends Extension {
+class StingerSoftDoctrineEntitySearchExtension extends Extension {
 
 	/**
 	 *

Model/Document.php

@@ -176,6 +176,14 @@ public function setEntityId($entityId) {
 	public function getInternalEntityId() {
 		return $this->entityId;
 	}
+
+	public function __get($name) {
+		return $this->getFieldValue($name);
+	}
+
+	public function __isset($name) {
+		return $this->getFieldValue($name) !== null;
+	}
 
 	/**
 	 * Creates a new field instance

Model/Field.php

@@ -17,7 +17,9 @@ abstract class Field {
 
 	protected $fieldName;
 
-	protected $fieldValue;
+	protected $internalFieldValue;
+
+	protected $serialized;
 
 	/**
 	 * @var Document
@@ -38,11 +40,17 @@ public function setFieldName($fieldName) {
 	}
 
 	public function getFieldValue() {
-		return $this->fieldValue;
+		return $this->serialized ? unserialize($this->internalFieldValue) : $this->internalFieldValue;
 	}
 
 	public function setFieldValue($fieldValue) {
-		$this->fieldValue = $fieldValue;
+		if(is_scalar($fieldValue)){
+			$this->internalFieldValue = $fieldValue;
+			$this->serialized = false;
+		}else{
+			$this->internalFieldValue = serialize($fieldValue);
+			$this->serialized = true;
+		}
 		return $this;
 	}
 
@@ -54,5 +62,16 @@ public function setDocument(Document $document) {
 		$this->document = $document;
 		return $this;
 	}
+
+	public function getSerialized() {
+		return $this->serialized;
+	}
+
+	public function setSerialized($serialized) {
+		$this->serialized = $serialized;
+		return $this;
+	}
+
+
 
 }

Resources/config/doctrine/Document.orm.yml

@@ -1,5 +1,10 @@
 StingerSoft\DoctrineEntitySearchBundle\Entity\Document:
   type: entity
+  inheritanceType: SINGLE_TABLE
+  discriminatorColumn:
+    name: discr
+    type: string
+    length: 255
   id:
     id:
       type: integer

Resources/config/doctrine/Field.orm.yml

@@ -1,5 +1,10 @@
 StingerSoft\DoctrineEntitySearchBundle\Entity\Field:
   type: entity
+  inheritanceType: SINGLE_TABLE
+  discriminatorColumn:
+    name: discr
+    type: string
+    length: 255
   id:
     id:
       type: integer
@@ -9,9 +14,13 @@ StingerSoft\DoctrineEntitySearchBundle\Entity\Field:
       type: string
       length: 512
       nullable: false
-    fieldValue: 
+    internalFieldValue:
+      column: fieldValue 
       type: text
       nullable: false
+    serialized:
+      type: boolean
+      nullable: false
   manyToOne:
     document:
       targetEntity: StingerSoft\DoctrineEntitySearchBundle\Entity\Document

Resources/config/services.yml

@@ -8,5 +8,5 @@ services:
   stinger_soft.doctrine_entity_search.search_service:
     class: '%stinger_soft.doctrine_entity_search.search_service.class%'
     arguments:
-      - documentClazz: '%stinger_soft.doctrine_entity_search.document.class%'
-      - fieldClazz: '%stinger_soft.doctrine_entity_search.field.class%'
+      - '%stinger_soft.doctrine_entity_search.document.class%'
+      - '%stinger_soft.doctrine_entity_search.field.class%'

Services/SearchService.php

@@ -113,16 +113,16 @@ public function autocomplete($search, $maxResults = 10) {
 	public function autocompleteOrm(EntityManager $em, $search, $maxResults = 10) {
 		$fieldRepos = $em->getRepository($this->fieldClazz);
 		$qb = $fieldRepos->createQueryBuilder('field');
-		$qb->select('field.fieldValue');
-		$qb->orWhere('field.fieldName = :titleFieldName AND field.fieldValue LIKE :term');
+		$qb->select('field.internalFieldValue');
+		$qb->orWhere('field.fieldName = :titleFieldName AND field.internalFieldValue LIKE :term');
 		$qb->setParameter('titleFieldName', \StingerSoft\EntitySearchBundle\Model\Document::FIELD_TITLE);
-		$qb->orWhere('field.fieldName = :contentFieldName AND field.fieldValue LIKE :term');
+		$qb->orWhere('field.fieldName = :contentFieldName AND field.internalFieldValue LIKE :term');
 		$qb->setParameter('contentFieldName', \StingerSoft\EntitySearchBundle\Model\Document::FIELD_CONTENT);
-		$qb->setParameter('term', $search . '%');
+		$qb->setParameter('term', '%'.$search . '%');
 		$iterator = $qb->getQuery()->iterate(null, \Doctrine\ORM\Query::HYDRATE_SCALAR);
 		$suggestions = array();
 		foreach($iterator as $res) {
-			$suggestions = array_merge($suggestions, array_filter(explode(' ', $res[0]['fieldValue']), function ($word) use ($search) {
+			$suggestions = array_merge($suggestions, array_filter(explode(' ', strip_tags($res[0]['internalFieldValue'])), function ($word) use ($search) {
 				return stripos($word, $search) === 0;
 			}));
 		}
@@ -151,7 +151,7 @@ protected function searchOrm(Query $query, EntityManager $em) {
 		$qb = $docRepos->createQueryBuilder('doc');
 		$qb->leftJoin('doc.internalFields', 'field');
 		foreach(self::$searchableFields as $field) {
-			$qb->orWhere('field.fieldName = :' . $field . 'FieldName AND field.fieldValue LIKE :term');
+			$qb->orWhere('field.fieldName = :' . $field . 'FieldName AND field.internalFieldValue LIKE :term');
 			$qb->setParameter($field . 'FieldName', $field);
 		}
 		$qb->setParameter('term', '%' . $term . '%');
@@ -162,7 +162,7 @@ protected function searchOrm(Query $query, EntityManager $em) {
 			foreach($query->getFacets() as $facetField => $facetValues) {
 				if($facetValues === null || count($facetValues) == 0)
 					continue;
-				$facetedQb->andWhere('field.fieldName = :' . $facetField . 'FacetFieldName AND field.fieldValue IN :' . $facetValues . 'FacetFieldValues');
+				$facetedQb->andWhere('field.fieldName = :' . $facetField . 'FacetFieldName AND field.internalFieldValue IN :' . $facetValues . 'FacetFieldValues');
 				$qb->setParameter($facetField . 'FacetFieldName', $facetField);
 				$qb->setParameter($facetField . 'FacetFieldValues', $facetValues);
 			}
@@ -173,10 +173,10 @@ protected function searchOrm(Query $query, EntityManager $em) {
 
 		$facetQb = clone $qb;
 		$facetQb->select('field.fieldName');
-		$facetQb->addSelect('field.fieldValue');
+		$facetQb->addSelect('field.internalFieldValue');
 		$facetQb->addSelect('COUNT(doc.id) as resultCount');
 		$facetQb->addGroupBy('field.fieldName');
-		$facetQb->addGroupBy('field.fieldValue');
+		$facetQb->addGroupBy('field.internalFieldValue');
 		$facetQb->orderBy('resultCount', 'DESC');
 
 		if($query->getUsedFacets() !== null) {
@@ -187,7 +187,7 @@ protected function searchOrm(Query $query, EntityManager $em) {
 		$facetSet = new FacetSetAdapter();
 		if($query->getUsedFacets() === null || count($query->getUsedFacets()) > 0) {
 			foreach($facetQb->getQuery()->getScalarResult() as $facetResult) {
-				$facetSet->addFacetValue($facetResult['fieldName'], $facetResult['fieldValue'], $facetResult['resultCount']);
+				$facetSet->addFacetValue($facetResult['fieldName'], $facetResult['internalFieldValue'], $facetResult['resultCount']);
 			}
 
 			if($query->getUsedFacets() === null || in_array('type', $query->getUsedFacets())) {

Tests/Services/SearchServiceTest.php

@@ -166,9 +166,12 @@ protected function getMetadataDriverImplementation() {
 			realpath(__DIR__.'/../../Resources/config/doctrine/') => 'StingerSoft\DoctrineEntitySearchBundle\Entity',
 		);
 
-
 		$yamlDriver = new SimplifiedYamlDriver($namespaces);
 		$driver->addDriver($yamlDriver, 'StingerSoft\DoctrineEntitySearchBundle');
 		return $driver;
 	}
+
+	protected function getPaths(){
+		return array(realpath(__DIR__.'/../../Entity'));
+	}
 }