matt
/
opnform-host-nginx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve numeric condition handling in form logic checker 

- Add robust numeric comparison for zero and negative numbers
- Implement safe numeric parsing and validation
- Enhance condition checking for numeric fields across PHP and JavaScript
- Add comprehensive test cases for edge case numeric comparisons
- Fix 'is_not_empty' operator logic in JavaScript condition checker
This commit is contained in:
Julien Nahum 2025-03-03 19:03:09 +08:00
parent 405ab64e41
commit cf4688d75e
3 changed files with 136 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
api/app/Service/Forms/FormLogicConditionChecker.php
View File

@ -81,6 +81,15 @@ class FormLogicConditionChecker
private function checkEquals($condition, $fieldValue): bool
{
// For numeric values, convert to numbers before comparison
if (
$this->areValidNumbers($condition, $fieldValue) &&
is_numeric($condition['value']) &&
is_numeric($fieldValue)
) {
return (float) $condition['value'] === (float) $fieldValue;
}
return $condition['value'] === $fieldValue;
}
@ -152,24 +161,44 @@ class FormLogicConditionChecker
return $fieldValue == '' || $fieldValue == null || !$fieldValue;
}
/**
* Helper function to check if values are valid for numeric comparison
*/
private function areValidNumbers($condition, $fieldValue): bool
{
return isset($condition['value']) && $fieldValue !== null && $fieldValue !== '';
}
private function checkGreaterThan($condition, $fieldValue): bool
{
return $condition['value'] && $fieldValue && (float) $fieldValue > (float) $condition['value'];
if (!$this->areValidNumbers($condition, $fieldValue)) {
return false;
}
return (float) $fieldValue > (float) $condition['value'];
}
private function checkGreaterThanEqual($condition, $fieldValue): bool
{
return $condition['value'] && $fieldValue && (float) $fieldValue >= (float) $condition['value'];
if (!$this->areValidNumbers($condition, $fieldValue)) {
return false;
}
return (float) $fieldValue >= (float) $condition['value'];
}
private function checkLessThan($condition, $fieldValue): bool
{
return $condition['value'] && $fieldValue && (float) $fieldValue < (float) $condition['value'];
if (!$this->areValidNumbers($condition, $fieldValue)) {
return false;
}
return (float) $fieldValue < (float) $condition['value'];
}
private function checkLessThanEqual($condition, $fieldValue): bool
{
return $condition['value'] && $fieldValue && (float) $fieldValue <= (float) $condition['value'];
if (!$this->areValidNumbers($condition, $fieldValue)) {
return false;
}
return (float) $fieldValue <= (float) $condition['value'];
}
private function checkBefore($condition, $fieldValue): bool

76
api/tests/Unit/Service/Forms/FormLogicConditionCheckerTest.php
View File

@ -150,6 +150,82 @@ describe('FormLogicConditionChecker', function () {
expect(FormLogicConditionChecker::conditionsMet($condition, $formData))->toBeTrue();
});
it('handles zero values correctly', function () {
$condition = [
'value' => [
'property_meta' => [
'id' => 'number_field',
'type' => 'number'
],
'operator' => 'equals',
'value' => 0
]
];
// Test zero equality
$formData = ['number_field' => 0];
expect(FormLogicConditionChecker::conditionsMet($condition, $formData))->toBeTrue();
$formData = ['number_field' => 1];
expect(FormLogicConditionChecker::conditionsMet($condition, $formData))->toBeFalse();
// Test less than with zero
$condition['value']['operator'] = 'less_than';
$condition['value']['value'] = 0;
$formData = ['number_field' => -1];
expect(FormLogicConditionChecker::conditionsMet($condition, $formData))->toBeTrue();
$formData = ['number_field' => 0];
expect(FormLogicConditionChecker::conditionsMet($condition, $formData))->toBeFalse();
// Test greater than with zero
$condition['value']['operator'] = 'greater_than';
$condition['value']['value'] = 0;
$formData = ['number_field' => 1];
expect(FormLogicConditionChecker::conditionsMet($condition, $formData))->toBeTrue();
$formData = ['number_field' => 0];
expect(FormLogicConditionChecker::conditionsMet($condition, $formData))->toBeFalse();
});
it('handles negative numbers correctly', function () {
$condition = [
'value' => [
'property_meta' => [
'id' => 'number_field',
'type' => 'number'
],
'operator' => 'equals',
'value' => -5
]
];
// Test negative number equality
$formData = ['number_field' => -5];
expect(FormLogicConditionChecker::conditionsMet($condition, $formData))->toBeTrue();
// Test less than with negative numbers
$condition['value']['operator'] = 'less_than';
$condition['value']['value'] = -5;
$formData = ['number_field' => -10];
expect(FormLogicConditionChecker::conditionsMet($condition, $formData))->toBeTrue();
$formData = ['number_field' => -5];
expect(FormLogicConditionChecker::conditionsMet($condition, $formData))->toBeFalse();
$formData = ['number_field' => 0];
expect(FormLogicConditionChecker::conditionsMet($condition, $formData))->toBeFalse();
// Test greater than with negative numbers
$condition['value']['operator'] = 'greater_than';
$condition['value']['value'] = -10;
$formData = ['number_field' => -5];
expect(FormLogicConditionChecker::conditionsMet($condition, $formData))->toBeTrue();
$formData = ['number_field' => -10];
expect(FormLogicConditionChecker::conditionsMet($condition, $formData))->toBeFalse();
});
it('handles empty checks correctly', function () {
$condition = [
'value' => [

48
client/lib/forms/FormLogicConditionChecker.js vendored
View File

@ -67,7 +67,25 @@ function propertyConditionMet(propertyCondition, value) {
return false
}
// Helper function to safely parse numeric values
function safeParseFloat(value) {
if (value === undefined || value === null) return null
const parsed = parseFloat(value)
return isNaN(parsed) ? null : parsed
}
// Helper function to check if values are valid for numeric comparison
function areValidNumbers(condition, fieldValue) {
const conditionValue = safeParseFloat(condition.value)
const parsedFieldValue = safeParseFloat(fieldValue)
return conditionValue !== null && parsedFieldValue !== null
}
function checkEquals(condition, fieldValue) {
// For numeric values, convert to numbers before comparison
if (areValidNumbers(condition, fieldValue)) {
return parseFloat(condition.value) === parseFloat(fieldValue)
}
return condition.value === fieldValue
}
@ -116,35 +134,23 @@ function checkIsEmpty(condition, fieldValue) {
}
function checkGreaterThan(condition, fieldValue) {
return (
condition.value &&
fieldValue &&
parseFloat(fieldValue) > parseFloat(condition.value)
)
if (!areValidNumbers(condition, fieldValue)) return false
return parseFloat(fieldValue) > parseFloat(condition.value)
}
function checkGreaterThanEqual(condition, fieldValue) {
return (
condition.value &&
fieldValue &&
parseFloat(fieldValue) >= parseFloat(condition.value)
)
if (!areValidNumbers(condition, fieldValue)) return false
return parseFloat(fieldValue) >= parseFloat(condition.value)
}
function checkLessThan(condition, fieldValue) {
return (
condition.value &&
fieldValue &&
parseFloat(fieldValue) < parseFloat(condition.value)
)
if (!areValidNumbers(condition, fieldValue)) return false
return parseFloat(fieldValue) < parseFloat(condition.value)
}
function checkLessThanEqual(condition, fieldValue) {
return (
condition.value &&
fieldValue &&
parseFloat(fieldValue) <= parseFloat(condition.value)
)
if (!areValidNumbers(condition, fieldValue)) return false
return parseFloat(fieldValue) <= parseFloat(condition.value)
}
function checkBefore(condition, fieldValue) {
@ -313,7 +319,7 @@ function numberConditionMet(propertyCondition, value) {
case "is_empty":
return checkIsEmpty(propertyCondition, value)
case "is_not_empty":
return checkIsEmpty(propertyCondition, value)
return !checkIsEmpty(propertyCondition, value)
case "content_length_equals":
return checkLength(propertyCondition, value, "===")
case "content_length_does_not_equal":