devol/wallabag
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6771 from wallabag/add-annotations-in-search

Browse Source 
Add articles which have annotations with search term in results
This commit is contained in:
Nicolas Lœuillet 2023-08-21 20:19:00 +02:00 committed by GitHub
commit 4b338afa40
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Wallabag/CoreBundle/Repository/EntryRepository.php
View File

@ -133,8 +133,10 @@ class EntryRepository extends ServiceEntityRepository
// We lower() all parts here because PostgreSQL 'LIKE' verb is case-sensitive // We lower() all parts here because PostgreSQL 'LIKE' verb is case-sensitive
$qb $qb
->andWhere('lower(e.content) LIKE lower(:term) OR lower(e.title) LIKE lower(:term) OR lower(e.url) LIKE lower(:term)')->setParameter('term', '%' . $term . '%') ->andWhere('lower(e.content) LIKE lower(:term) OR lower(e.title) LIKE lower(:term) OR lower(e.url) LIKE lower(:term) OR lower(a.text) LIKE lower(:term)')
->setParameter('term', '%' . $term . '%')
->leftJoin('e.tags', 't') ->leftJoin('e.tags', 't')
->leftJoin('e.annotations', 'a')
->groupBy('e.id'); ->groupBy('e.id');
return $qb; return $qb;

11
tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php
View File

@ -1499,6 +1499,17 @@ class EntryControllerTest extends WallabagCoreTestCase
$crawler = $client->submit($form, $data); $crawler = $client->submit($form, $data);
$this->assertCount(1, $crawler->filter($this->entryDataTestAttribute)); $this->assertCount(1, $crawler->filter($this->entryDataTestAttribute));
$crawler = $client->request('GET', '/unread/list');
$form = $crawler->filter('form[name=search]')->form();
$data = [
'search_entry[term]' => 'annotation',
];
$crawler = $client->submit($form, $data);
$this->assertCount(2, $crawler->filter($this->entryDataTestAttribute));
} }
public function dataForLanguage() public function dataForLanguage()