CR corrections

Author: Rafalkufel

alinka/schemas/document_schema.py

@@ -4,7 +4,7 @@
 from pydantic import BaseModel, Field, computed_field, model_validator
 
 from alinka.constants import ActivityForm, Issue, Reason
-from alinka.utils import pesel_to_date_of_birth
+from alinka.utils import extract_date_of_birth_from_pesel
 
 
 class AddressData(BaseModel):
@@ -47,7 +47,7 @@ def calculate_date_of_birth(self) -> "ChildData":
         if self.birth_date:
             return self
         pesel = self.pesel
-        self.birth_date = pesel_to_date_of_birth(pesel)
+        self.birth_date = extract_date_of_birth_from_pesel(pesel)
         return self
 
 

alinka/utils.py

@@ -1,14 +1,14 @@
 from datetime import date
 
 
-def pesel_to_date_of_birth(pesel: str) -> date:
+def extract_date_of_birth_from_pesel(pesel: str) -> date:
     year_part, month_part, day = int(pesel[0:2]), int(pesel[2:4]), int(pesel[4:6])
     year = 2000 + year_part if month_part > 20 else 1900 + year_part
     month = month_part - 20 if month_part > 20 else month_part
     return date(year, month, day)
 
 
-def validate_pesel(pesel: str) -> bool:
+def is_valid_pesel(pesel: str) -> bool:
     if len(pesel) != 11 or not pesel.isdigit():
         return False
     weights = [1, 3, 7, 9, 1, 3, 7, 9, 1, 3]

alinka/widget/validators.py

@@ -1,6 +1,6 @@
 from PySide6.QtGui import QValidator
 
-from alinka.utils import validate_pesel
+from alinka.utils import is_valid_pesel
 
 
 class RequiredValidator(QValidator):
@@ -24,7 +24,7 @@ def validate(self, input_str: str, pos: int) -> tuple[QValidator.State, str, int
             return QValidator.Invalid, input_str, pos
         if len(input_str) < 11:
             return QValidator.Intermediate, input_str, pos
-        if validate_pesel(input_str):
+        if is_valid_pesel(input_str):
             return QValidator.Acceptable, input_str, pos
         else:
             return QValidator.Intermediate, input_str, pos

tests/test_utils.py

@@ -2,7 +2,7 @@
 
 import pytest
 
-from alinka.utils import pesel_to_date_of_birth, validate_pesel
+from alinka.utils import extract_date_of_birth_from_pesel, is_valid_pesel
 
 
 class TestValidatePesel:
@@ -15,7 +15,7 @@ class TestValidatePesel:
         ],
     )
     def test_validate_pesel__valid_pesel(self, pesel):
-        assert validate_pesel(pesel)
+        assert is_valid_pesel(pesel)
 
     @pytest.mark.parametrize(
         "pesel",
@@ -31,7 +31,7 @@ def test_validate_pesel__valid_pesel(self, pesel):
         ],
     )
     def test_validate_pesel__invalid_pesel(self, pesel):
-        assert not validate_pesel(pesel)
+        assert not is_valid_pesel(pesel)
 
 
 class TestPeselToDateOfBirth:
@@ -46,6 +46,6 @@ class TestPeselToDateOfBirth:
             ("05212294647", date(2005, 1, 22)),
         ],
     )
-    def test_pesel_to_date_of_birth__success(self, pesel, expected_date):
-        assert validate_pesel(pesel)
-        assert pesel_to_date_of_birth(pesel) == expected_date
+    def test_extract_date_of_birth_from_pesel__success(self, pesel, expected_date):
+        assert is_valid_pesel(pesel)
+        assert extract_date_of_birth_from_pesel(pesel) == expected_date