set key-field for documents

floriansemm · Jul 24, 2015 · eb6dbea · eb6dbea
1 parent 4e9c38c
commit eb6dbea
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/Doctrine/Mapper/Mapping/AbstractDocumentCommand.php b/Doctrine/Mapper/Mapping/AbstractDocumentCommand.php
@@ -19,8 +19,9 @@ public function createDocument(MetaInformationInterface $meta)
     {
         $document = new Document();
 
-        $document->addField('id', $meta->getEntityId());
-        $document->addField('document_name_s', $meta->getDocumentName());
+        $key = $meta->getDocumentName() . '_' . $meta->getEntityId();
+        $document->setKey('id', $key);
+
         $document->setBoost($meta->getBoost());
 
         return $document;

diff --git a/Tests/Doctrine/Mapper/Mapping/MapIdentifierCommandTest.php b/Tests/Doctrine/Mapper/Mapping/MapIdentifierCommandTest.php
@@ -20,8 +20,8 @@ public function testCreateDocument_DocumentHasOnlyIdAndNameField()
 
         $document = $command->createDocument(MetaTestInformationFactory::getMetaInformation());
 
-        $this->assertEquals(2, $document->count(), 'fieldcount is two');
-        $this->assertEquals(2, $document->id, 'id is 2');
+        $this->assertEquals(1, $document->count(), 'fieldcount is two');
+        $this->assertEquals('validtestentity_2', $document->id, 'id is 2');
 
     }
 

diff --git a/Tests/Doctrine/Mapper/Mapping/SolrDocumentTest.php b/Tests/Doctrine/Mapper/Mapping/SolrDocumentTest.php
@@ -5,7 +5,7 @@
 
 abstract class SolrDocumentTest extends \PHPUnit_Framework_TestCase
 {
-    const FIELDS_ALWAYS_MAPPED = 2;
+    const FIELDS_ALWAYS_MAPPED = 1;
 
     protected function assertHasDocumentFields(Document $document, $expectedFields)
     {