upgrade dependencies, migration
This commit is contained in:
+2
-2
@@ -115,7 +115,7 @@ public class ShortenedUrlManager implements SmartInitializingSingleton, UserData
|
||||
public Page<ShortenedUrl> get(int page, int size, String sortBy, boolean descending, String search) {
|
||||
if (StringUtils.hasText(search)) {
|
||||
return shortenedUrlRepository.findAll(
|
||||
qShortenedUrl.note.containsIgnoreCase(search).or(qShortenedUrl.url.containsIgnoreCase(search))
|
||||
qShortenedUrl.note.contains(search).or(qShortenedUrl.url.contains(search))
|
||||
.or(qShortenedUrl.link.containsIgnoreCase(search)),
|
||||
PageRequest.of(page, size,
|
||||
descending ? Sort.by(sortBy).descending() : Sort.by(sortBy).ascending()));
|
||||
@@ -147,7 +147,7 @@ public class ShortenedUrlManager implements SmartInitializingSingleton, UserData
|
||||
query.and(qShortenedUrl.owner.eq(userId));
|
||||
|
||||
if (StringUtils.hasText(search)) {
|
||||
query.and(qShortenedUrl.note.containsIgnoreCase(search).or(qShortenedUrl.url.containsIgnoreCase(search))
|
||||
query.and(qShortenedUrl.note.contains(search).or(qShortenedUrl.url.contains(search))
|
||||
.or(qShortenedUrl.link.containsIgnoreCase(search)));
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user