Skip to content
Snippets Groups Projects
Commit bbc9302b authored by Lukasz Lopatowski's avatar Lukasz Lopatowski
Browse files

Merge branch 'fix-id-search' into 'develop'

fix id search, dont cast to string

See merge request !280
parents b2c88fa3 60e10409
No related branches found
No related tags found
1 merge request!280fix id search, dont cast to string
Pipeline #95533 passed
......@@ -2,6 +2,7 @@ package net.geant.nmaas.portal.persistent.spec;
import jakarta.persistence.criteria.CriteriaBuilder;
import jakarta.persistence.criteria.CriteriaQuery;
import jakarta.persistence.criteria.Expression;
import jakarta.persistence.criteria.Predicate;
import jakarta.persistence.criteria.Root;
import net.geant.nmaas.portal.persistent.entity.Domain;
......@@ -24,8 +25,10 @@ public class DomainSpecification {
for (String attribute : attributes) {
if (attribute.equalsIgnoreCase("id")) {
if (searchText.matches("\\d+")) {
predicates.add(cb.equal(root.get("id"), Long.valueOf(searchText)));
}
predicates.add(cb.like(root.get(attribute).as(String.class), lowerCaseSearchText));
} else {
predicates.add(cb.like(cb.lower(root.get(attribute)), lowerCaseSearchText));
}
......
package net.geant.nmaas.portal.persistent.spec;
import jakarta.persistence.criteria.Expression;
import jakarta.persistence.criteria.Predicate;
import net.geant.nmaas.portal.persistent.entity.User;
import org.springframework.data.jpa.domain.Specification;
......@@ -20,10 +21,11 @@ public class UserSpecification {
if (searchValue != null && !searchValue.trim().isEmpty()) {
String lowerCaseSearchValue = searchValue.toLowerCase().trim();
predicates.add(criteriaBuilder.like(criteriaBuilder.lower(root.get("username")),
"%" + lowerCaseSearchValue + "%"));
if (lowerCaseSearchValue.matches("\\d+")) {
predicates.add(criteriaBuilder.equal(root.get("id"), Long.valueOf(lowerCaseSearchValue)));
}
predicates.add(criteriaBuilder.like(criteriaBuilder.lower(root.get("id").as(String.class)),
predicates.add(criteriaBuilder.like(criteriaBuilder.lower(root.get("username")),
"%" + lowerCaseSearchValue + "%"));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment