Ajustes gerais

* Correção ddo check com JSONArray
dliocode · Oct 7, 2021 · a6eb02e · a6eb02e
1 parent 9c0abc8
commit a6eb02e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/src/core/DataValidator.JSON.pas b/src/core/DataValidator.JSON.pas
@@ -263,6 +263,7 @@ function TDataValidatorJSON.CheckValueArray(const ACheckAll: Boolean): IDataVali
           Continue;
         end;
 
+        LValidatorItem.SetName(LName);
         LValidatorItem.SetValue(LValueSanitizer);
 
         LValidatorResult := LValidatorItem.Check;
@@ -275,12 +276,15 @@ function TDataValidatorJSON.CheckValueArray(const ACheckAll: Boolean): IDataVali
           LOK := False;
           LInfo.Add(LValidatorResult.Informations as IDataValidatorInformations);
 
+          if (LValidatorItem is TDataValidatorJSONKeyIsRequired) then
+            Break;
+
           if not ACheckAll then
             Break;
         end
         else
           if (LValidatorItem is TDataValidatorJSONKeyIsOptional) or (LValidatorItem is TValidatorIsOptional) then
-            Break
+            Break;
       end;
 
       LValues := Concat(LValues, [TValueToString(LValueSanitizer)]);

diff --git a/src/validators/Validator.JSON.Key.IsOptional.pas b/src/validators/Validator.JSON.Key.IsOptional.pas
@@ -76,7 +76,6 @@ function TDataValidatorJSONKeyIsOptional.Check: IDataValidatorResult;
     if FValue.IsType<TJSONPair> then
     begin
       LJSONPair := FValue.AsType<TJSONPair>;
-
       R := not Assigned(LJSONPair);
     end;
 

diff --git a/src/validators/Validator.JSON.Key.IsRequired.pas b/src/validators/Validator.JSON.Key.IsRequired.pas
@@ -76,7 +76,6 @@ function TDataValidatorJSONKeyIsRequired.Check: IDataValidatorResult;
     if FValue.IsType<TJSONPair> then
     begin
       LJSONPair := FValue.AsType<TJSONPair>;
-
       R := Assigned(LJSONPair);
     end;