Work-Related/search_core
Work-Related/search_core
1
0
mirror of https://github.com/Codappix/search_core.git synced 2024-11-21 21:36:11 +01:00
Code Releases Activity

Merge remote-tracking branch 'origin/develop' into feature/134-allow-header-element-to-be-indexed

Browse source
This commit is contained in:
Daniel Siepmann 2018-03-15 16:03:20 +01:00
commit 9c25f1560b
6 changed files with 85 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Classes/Domain/Index/TcaIndexer/TcaTableService.php
View file

@ -174,7 +174,7 @@ class TcaTableService implements TcaTableServiceInterface
}
if ($this->isBlackListedRootLineConfigured()) {
$parameters[':blacklistedRootLine'] = $this->getBlackListedRootLine();
$parameters[':blacklistedRootLine'] = implode(',', $this->getBlackListedRootLine());
$whereClause .= ' AND pages.uid NOT IN (:blacklistedRootLine)'
. ' AND pages.pid NOT IN (:blacklistedRootLine)';
}

1
Classes/Domain/Index/TcaIndexer/TcaTableService76.php
View file

@ -257,7 +257,6 @@ class TcaTableService76 implements TcaTableServiceInterface
$this->tca['ctrl']['cruser_id'],
$this->tca['ctrl']['fe_cruser_id'],
$this->tca['ctrl']['fe_crgroup_id'],
$this->tca['ctrl']['languageField'],
$this->tca['ctrl']['origUid'],
];

3
Classes/Domain/Model/SearchRequest.php
View file

@ -87,6 +87,9 @@ class SearchRequest implements SearchRequestInterface
return $this->query;
}
/**
* @param array $filter
*/
public function setFilter(array $filter)
{
$filter = \TYPO3\CMS\Core\Utility\ArrayUtility::removeArrayEntryByValue($filter, '');

23
Tests/Functional/Fixtures/Indexing/TcaIndexer/KeepSysLanguageUid.xml Normal file
View file

@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<dataset>
<tt_content>
<uid>1</uid>
<pid>1</pid>
<tstamp>1480686370</tstamp>
<crdate>1480686370</crdate>
<hidden>0</hidden>
<sorting>72</sorting>
<sys_language_uid>2</sys_language_uid>
<CType>header</CType>
<header>indexed content element</header>
<bodytext>this is the content of header content element that should get indexed</bodytext>
<media>0</media>
<layout>0</layout>
<deleted>0</deleted>
<cols>0</cols>
<starttime>0</starttime>
<endtime>0</endtime>
<colPos>0</colPos>
<filelink_sorting>0</filelink_sorting>
</tt_content>
</dataset>

36
Tests/Functional/Indexing/TcaIndexerTest.php
View file

@ -77,4 +77,40 @@ class TcaIndexerTest extends AbstractFunctionalTestCase
$objectManager->get(TcaIndexer::class, $tableService, $connection)->indexAllDocuments();
}
/**
* @test
*/
public function sysLanguageIsKept()
{
$this->importDataSet('Tests/Functional/Fixtures/Indexing/TcaIndexer/KeepSysLanguageUid.xml');
$objectManager = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(ObjectManager::class);
$tableName = 'tt_content';
$tableService = $objectManager->get(
TcaTableServiceInterface::class,
$tableName,
$objectManager->get(RelationResolver::class),
$objectManager->get(ConfigurationContainerInterface::class)
);
$connection = $this->getMockBuilder(Elasticsearch::class)
->setMethods(['addDocuments'])
->disableOriginalConstructor()
->getMock();
$connection->expects($this->once())
->method('addDocuments')
->with(
$this->stringContains('tt_content'),
$this->callback(function ($documents) {
if ($this->isLegacyVersion()) {
return isset($documents[0]['sys_language_uid']) && $documents[0]['sys_language_uid'] === '2';
} else {
return isset($documents[0]['sys_language_uid']) && $documents[0]['sys_language_uid'] === 2;
}
})
);
$objectManager->get(TcaIndexer::class, $tableService, $connection)->indexAllDocuments();
}
}

43
Tests/Unit/Domain/Index/TcaIndexer/TcaTableServiceTest.php
View file

@ -74,7 +74,7 @@ class TcaTableServiceTest extends AbstractUnitTestCase
*/
public function doUsePlainQueryIfNoAdditionalWhereClauseIsDefined()
{
$this->markTestSkipped('We have to migrate this test for TYPO3 CMS 8.x');
$this->markTestIncomplete('We have to migrate this test for TYPO3 CMS 8.x');
$this->configuration->expects($this->exactly(2))
->method('getIfExists')
->withConsecutive(['indexing.table.additionalWhereClause'], ['indexing.table.rootLineBlacklist'])
@ -98,7 +98,7 @@ class TcaTableServiceTest extends AbstractUnitTestCase
*/
public function configuredAdditionalWhereClauseIsAdded()
{
$this->markTestSkipped('We have to migrate this test for TYPO3 CMS 8.x');
$this->markTestIncomplete('We have to migrate this test for TYPO3 CMS 8.x');
$this->configuration->expects($this->exactly(2))
->method('getIfExists')
->withConsecutive(['indexing.table.additionalWhereClause'], ['indexing.table.rootLineBlacklist'])
@ -110,15 +110,15 @@ class TcaTableServiceTest extends AbstractUnitTestCase
$this->subject->getRecord(10);
// $whereClause = $this->subject->getWhereClause();
// $this->assertSame(
// '1=1 AND pages.no_search = 0 AND table.field = "someValue"',
// $whereClause->getStatement()
// );
// $this->assertSame(
// [],
// $whereClause->getParameters()
// );
$whereClause = $this->subject->getWhereClause();
$this->assertSame(
'1=1 AND pages.no_search = 0 AND table.field = "someValue"',
$whereClause->getStatement()
);
$this->assertSame(
[],
$whereClause->getParameters()
);
}
/**
@ -126,6 +126,7 @@ class TcaTableServiceTest extends AbstractUnitTestCase
*/
public function allConfiguredAndAllowedTcaColumnsAreReturnedAsFields()
{
$this->markTestIncomplete('We have to migrate this test');
$GLOBALS['TCA']['test_table'] = [
'ctrl' => [
'languageField' => 'sys_language_uid',
@ -161,16 +162,16 @@ class TcaTableServiceTest extends AbstractUnitTestCase
);
$this->inject($subject, 'logger', $this->getMockedLogger());
// $this->assertSame(
// [
// 'test_table.uid',
// 'test_table.pid',
// 'test_table.sys_language_uid',
// 'test_table.available_column',
// ],
// $subject->getFields(),
// ''
// );
$this->assertSame(
[
'test_table.uid',
'test_table.pid',
'test_table.sys_language_uid',
'test_table.available_column',
],
$subject->getFields(),
''
);
unset($GLOBALS['TCA']['test_table']);
}
}