BFLOWS/bflows-bandi-be
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #258 from Kitzanos/feature/GEPAFINBE-201

Browse Source 
GEPAFINBE-201 (Fix application filter for number value as string.)
This commit is contained in:
Rinaldo
2025-04-02 10:35:35 +02:00
committed by GitHub
parent c4626a834b e9c72b5463
commit a4bd8d9329
1 changed files with 33 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/main/java/net/gepafin/tendermanagement/util/Utils.java
View File

@@ -826,20 +826,48 @@ public class Utils {
} }
public static void applyNumberFilter(Path<?> fieldPath, CriteriaBuilder criteriaBuilder, List<Predicate> predicates, Object value, MatchModeEnum matchMode) { public static void applyNumberFilter(Path<?> fieldPath, CriteriaBuilder criteriaBuilder, List<Predicate> predicates, Object value, MatchModeEnum matchMode) {
if (Number.class.isAssignableFrom(fieldPath.getJavaType())) { if (Number.class.isAssignableFrom(fieldPath.getJavaType())) {
Number numberValue = null; Number numberValue = null;
if (value instanceof Number) {
numberValue = (Number) value; if (value instanceof String stringValue) {
if (isInteger(stringValue)) {
numberValue = Long.parseLong(stringValue);
} else if (isDecimal(stringValue)) {
numberValue = Double.parseDouble(stringValue);
}
} else if (value instanceof Number number) {
numberValue = number;
} }
MatchModeEnum mode = MatchModeEnum.fromObject(matchMode.getValue()); if (numberValue != null) {
switch (mode) { MatchModeEnum mode = MatchModeEnum.fromObject(matchMode.getValue());
case EQUALS -> predicates.add(criteriaBuilder.equal(fieldPath, numberValue));
if (mode == MatchModeEnum.EQUALS) {
predicates.add(criteriaBuilder.equal(fieldPath, numberValue));
}
} }
} }
} }
private static boolean isInteger(String value) {
try {
Long.parseLong(value);
return true;
} catch (NumberFormatException e) {
return false;
}
}
private static boolean isDecimal(String value) {
try {
Double.parseDouble(value);
return value.contains(".");
} catch (NumberFormatException e) {
return false;
}
}
public static void applyDateFilter(Path<?> fieldPath, CriteriaBuilder criteriaBuilder, List<Predicate> predicates, Object value, MatchModeEnum matchMode, Root<?> root) { public static void applyDateFilter(Path<?> fieldPath, CriteriaBuilder criteriaBuilder, List<Predicate> predicates, Object value, MatchModeEnum matchMode, Root<?> root) {
if (fieldPath.getJavaType().equals(LocalDateTime.class)) { if (fieldPath.getJavaType().equals(LocalDateTime.class)) {