ryan/sermon-notes
1
0
Fork 0
Code Issues 8 Pull Requests Packages Releases 4 Wiki Activity

Final updates for v2.0 #29

Merged
ryan merged 14 commits from 1.3 into main 2026-06-25 14:52:13 -04:00
Conversation 0 Commits 14 Files Changed 144
+5 -5
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9e56f65af5 - Show all commits
src/Controller/AjaxController.php
+1 -1
View File
@@ -262,7 +262,7 @@ class AjaxController extends AbstractController
$user = $this->getUser(); $user = $this->getUser();
$res = new Response(); $res = new Response();
$data = json_decode($req->getContent()); $data = json_decode($req->getContent());
$note = $emi->getRepository(Note::class)->findNote($data->query, $user->getId()->toBinary()); $note = $emi->getRepository(Note::class)->findNote($data->query, $user);
$res->setContent(json_encode($note)); $res->setContent(json_encode($note));
return $res; return $res;
src/Repository/NoteRepository.php
+4 -4
View File
@@ -25,7 +25,7 @@ class NoteRepository extends ServiceEntityRepository
$ret = $this->createQueryBuilder('n') $ret = $this->createQueryBuilder('n')
->where('n.user = :user') ->where('n.user = :user')
->setParameter('user', $user->getId()->toBinary()) ->setParameter('user', $user->getId(), 'uuid')
->orderBy('n.date', 'DESC') ->orderBy('n.date', 'DESC')
->getQuery() ->getQuery()
->getResult(); ->getResult();
@@ -40,7 +40,7 @@ class NoteRepository extends ServiceEntityRepository
} }
$ret = $this->createQueryBuilder('n') $ret = $this->createQueryBuilder('n')
->where('n.user = :user') ->where('n.user = :user')
->setParameter('user', $user->getId()->toBinary()) ->setParameter('user', $user->getId(), 'uuid')
->orderBy('n.date', 'DESC') ->orderBy('n.date', 'DESC')
->setMaxResults(4) ->setMaxResults(4)
->getQuery() ->getQuery()
@@ -49,7 +49,7 @@ class NoteRepository extends ServiceEntityRepository
return $ret; return $ret;
} }
public function findNote(string $query, string $userId): array public function findNote(string $query, User $user): array
{ {
$ret = $this->createQueryBuilder('n') $ret = $this->createQueryBuilder('n')
->where('n.title LIKE :query') ->where('n.title LIKE :query')
@@ -57,7 +57,7 @@ class NoteRepository extends ServiceEntityRepository
->orWhere('n.text LIKE :query') ->orWhere('n.text LIKE :query')
->andWhere('n.user = :user') ->andWhere('n.user = :user')
->setParameter('query', "%{$query}%") ->setParameter('query', "%{$query}%")
->setParameter('user', $userId) ->setParameter('user', $user->getId(), 'uuid')
->orderBy('n.date', 'DESC') ->orderBy('n.date', 'DESC')
->setMaxResults(3) ->setMaxResults(3)
->getQuery() ->getQuery()