kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-02 19:16:39 +00:00
Code Issues Projects Releases Wiki Activity

fix: migrate action expression validation to separate rule class

Browse Source
This commit is contained in:
Michael Thomas
2024-03-09 12:57:34 -05:00
parent 69ca88d9f8
commit c4bf2aae7d
7 changed files with 83 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/Api/V1/Controllers/Models/Rule/ExpressionController.php
View File

@@ -25,7 +25,6 @@ namespace FireflyIII\Api\V1\Controllers\Models\Rule;
use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Api\V1\Requests\Models\Rule\ValidateExpressionRequest;
use FireflyIII\TransactionRules\Expressions\ActionExpression;
use Illuminate\Http\JsonResponse;
/**
@@ -43,18 +42,8 @@ class ExpressionController extends Controller
*/
public function validateExpression(ValidateExpressionRequest $request): JsonResponse
{
$value = $request->getExpression();
$expr = new ActionExpression($value);
if ($expr->isValid()) {
return response()->json([
"valid" => true,
]);
} else {
return response()->json([
"valid" => false,
"error" => $expr->getValidationError()->getMessage()
]);
}
return response()->json([
"valid" => true,
]);
}
}