fix: use regex to validate input digits

we want to keep input string and check if the string indeed contains only digits

Author: ThomasFaria

src/api/models/forms.py

@@ -1,3 +1,4 @@
+import re
 from typing import Optional
 
 from pydantic import BaseModel, model_validator, validator
@@ -16,31 +17,33 @@ class SingleForm(BaseModel):
     activity_permanence_status: Optional[str] = None
 
     @validator("type_form")
-    def validate_type_form(cls, v):
+    def validate_type_form(cls, v: str) -> str:
         if (v is not None) and (v not in VALID_TYPE_FORM):
             raise ValueError(f"Invalid type_form '{v}', must be one of {VALID_TYPE_FORM}")
         return v
 
     @validator("nature")
-    def validate_nature(cls, v):
-        if (v is not None) and (not v.isdigit() or len(v) != 2):
-            raise ValueError("nature must be a two-digit number (e.g., '01')")
+    def validate_nature(cls, v: str) -> str:
+        if v is not None:
+            if (not re.fullmatch(r"\d+", v)) or (len(v) != 2):
+                raise ValueError("nature must be a two-digit number (e.g., '01')")
         return v
 
     @validator("surface")
-    def validate_surface(cls, v):
+    def validate_surface(cls, v: str) -> str:
         if (v is not None) and (v not in VALID_SURFACE):
             raise ValueError(f"Invalid surface '{v}', must be one of {VALID_SURFACE}")
         return v
 
     @validator("cj")
-    def validate_cj(cls, v):
-        if (v is not None) and (not v.isdigit() or len(v) != 2):
-            raise ValueError("cj must be a 4-digit number (e.g., '5499')")
+    def validate_cj(cls, v: str) -> str:
+        if v is not None:
+            if (not re.fullmatch(r"\d+", v)) or (len(v) != 4):
+                raise ValueError("cj must be a 4-digit number (e.g., '5499')")
         return v
 
     @validator("activity_permanence_status")
-    def validate_activity_permanence_status(cls, v):
+    def validate_activity_permanence_status(cls, v: str) -> str:
         if (v is not None) and (v not in VALID_ACTIV_PERM):
             raise ValueError(f"Invalid surface '{v}', must be one of {VALID_ACTIV_PERM}")
         return v