Add missing type hints

Author: WhyNotHugo

django_afip/factories.py

@@ -23,7 +23,7 @@ def get_test_file(filename: str, mode: str = "r") -> Path:
     return Path(__file__).parent / "testing" / filename
 
 
-class UserFactory(DjangoModelFactory):
+class UserFactory(DjangoModelFactory[User]):
     class Meta:
         model = User
 
@@ -37,7 +37,7 @@ class SuperUserFactory(UserFactory):
     is_superuser = True
 
 
-class ConceptTypeFactory(DjangoModelFactory):
+class ConceptTypeFactory(DjangoModelFactory[models.ConceptType]):
     class Meta:
         model = models.ConceptType
         django_get_or_create = ("code",)
@@ -47,7 +47,7 @@ class Meta:
     valid_from = date(2010, 9, 17)
 
 
-class DocumentTypeFactory(DjangoModelFactory):
+class DocumentTypeFactory(DjangoModelFactory[models.DocumentType]):
     class Meta:
         model = models.DocumentType
 
@@ -56,7 +56,7 @@ class Meta:
     valid_from = date(2008, 7, 25)
 
 
-class CurrencyTypeFactory(DjangoModelFactory):
+class CurrencyTypeFactory(DjangoModelFactory[models.CurrencyType]):
     class Meta:
         model = models.CurrencyType
 
@@ -65,7 +65,7 @@ class Meta:
     valid_from = date(2009, 4, 3)
 
 
-class ReceiptTypeFactory(DjangoModelFactory):
+class ReceiptTypeFactory(DjangoModelFactory[models.ReceiptType]):
     class Meta:
         model = models.ReceiptType
         django_get_or_create = ("code",)
@@ -75,7 +75,7 @@ class Meta:
     valid_from = date(2011, 3, 30)
 
 
-class TaxPayerFactory(DjangoModelFactory):
+class TaxPayerFactory(DjangoModelFactory[models.TaxPayer]):
     class Meta:
         model = models.TaxPayer
         django_get_or_create = ("cuit",)
@@ -89,7 +89,7 @@ class Meta:
     logo = ImageField(from_path=get_test_file("tiny.png", "rb"))
 
 
-class AlternateTaxpayerFactory(DjangoModelFactory):
+class AlternateTaxpayerFactory(DjangoModelFactory[models.TaxPayer]):
     """A taxpayer with an alternate (valid) keypair."""
 
     class Meta:
@@ -103,7 +103,7 @@ class Meta:
     active_since = datetime(2011, 10, 3)
 
 
-class PointOfSalesFactory(DjangoModelFactory):
+class PointOfSalesFactory(DjangoModelFactory[models.PointOfSales]):
     class Meta:
         model = models.PointOfSales
         django_get_or_create = (
@@ -124,7 +124,7 @@ class Meta:
     sales_terms = "Credit Card"
 
 
-class ClientVatConditionFactory(DjangoModelFactory):
+class ClientVatConditionFactory(DjangoModelFactory[models.ClientVatCondition]):
     class Meta:
         model = models.ClientVatCondition
         django_get_or_create = ("code",)
@@ -134,7 +134,7 @@ class Meta:
     cmp_clase = "B,C"
 
 
-class ReceiptFactory(DjangoModelFactory):
+class ReceiptFactory(DjangoModelFactory[models.Receipt]):
     class Meta:
         model = models.Receipt
 
@@ -155,7 +155,7 @@ class Meta:
 class ReceiptWithVatAndTaxFactory(ReceiptFactory):
     """Receipt with a valid Vat and Tax, ready to validate."""
 
-    point_of_sales = LazyFunction(lambda: models.PointOfSales.objects.first())
+    point_of_sales = LazyFunction(lambda: models.PointOfSales.objects.first())  # type: ignore[assignment]
     client_vat_condition = SubFactory(ClientVatConditionFactory)
 
     @post_generation
@@ -222,7 +222,7 @@ def post(obj: models.Receipt, create: bool, extracted: None, **kwargs) -> None:
         ReceiptValidationFactory(receipt=obj)
 
 
-class ReceiptValidationFactory(DjangoModelFactory):
+class ReceiptValidationFactory(DjangoModelFactory[models.ReceiptValidation]):
     class Meta:
         model = models.ReceiptValidation
 
@@ -233,7 +233,7 @@ class Meta:
     receipt = SubFactory(ReceiptFactory, receipt_number=17)
 
 
-class ReceiptPDFFactory(DjangoModelFactory):
+class ReceiptPDFFactory(DjangoModelFactory[models.ReceiptPDF]):
     class Meta:
         model = models.ReceiptPDF
 
@@ -256,7 +256,7 @@ def post(obj: models.ReceiptPDF, create: bool, extracted: None, **kwargs) -> Non
         obj.save_pdf(save_model=True)
 
 
-class GenericAfipTypeFactory(DjangoModelFactory):
+class GenericAfipTypeFactory(DjangoModelFactory[models.GenericAfipType]):
     class Meta:
         model = models.GenericAfipType
 
@@ -265,28 +265,34 @@ class Meta:
     valid_from = datetime(2017, 8, 10)
 
 
-class VatTypeFactory(GenericAfipTypeFactory):
+class VatTypeFactory(DjangoModelFactory[models.VatType]):
     class Meta:
         model = models.VatType
 
     code = 5
     description = "21%"
+    valid_from = datetime(2017, 8, 10)
 
 
-class TaxTypeFactory(GenericAfipTypeFactory):
+class TaxTypeFactory(DjangoModelFactory[models.TaxType]):
     class Meta:
         model = models.TaxType
 
+    code = 80
+    description = "CUIT"
+    valid_from = datetime(2017, 8, 10)
+
 
-class OptionalTypeFactory(GenericAfipTypeFactory):
+class OptionalTypeFactory(DjangoModelFactory[models.OptionalType]):
     class Meta:
         model = models.OptionalType
 
     code = 2101
     description = "Excepcion computo IVA Credito Fiscal"
+    valid_from = datetime(2017, 8, 10)
 
 
-class VatFactory(DjangoModelFactory):
+class VatFactory(DjangoModelFactory[models.Vat]):
     class Meta:
         model = models.Vat
 
@@ -296,7 +302,7 @@ class Meta:
     vat_type = SubFactory(VatTypeFactory)
 
 
-class TaxFactory(DjangoModelFactory):
+class TaxFactory(DjangoModelFactory[models.Tax]):
     class Meta:
         model = models.Tax
 
@@ -308,7 +314,7 @@ class Meta:
     tax_type = SubFactory(TaxTypeFactory)
 
 
-class OptionalFactory(DjangoModelFactory):
+class OptionalFactory(DjangoModelFactory[models.Optional]):
     class Meta:
         model = models.Optional
 
@@ -318,7 +324,7 @@ class Meta:
     optional_type = SubFactory(OptionalTypeFactory)
 
 
-class ReceiptEntryFactory(DjangoModelFactory):
+class ReceiptEntryFactory(DjangoModelFactory[models.ReceiptEntry]):
     class Meta:
         model = models.ReceiptEntry
 

django_afip/migrations/0001_squashed_0036_receiptpdf__client_address__blank.py

@@ -1,5 +1,7 @@
 from __future__ import annotations
 
+from typing import ClassVar
+
 import django.db.models.deletion
 from django.db import migrations
 from django.db import models
@@ -49,7 +51,7 @@ class Migration(migrations.Migration):
 
     initial = True
 
-    dependencies: list = []
+    dependencies: ClassVar[list] = []
 
     operations = [
         migrations.CreateModel(

django_afip/models.py

@@ -1890,7 +1890,7 @@ class Meta:
         verbose_name_plural = _("receipt validations")
 
 
-class ClientVatConditionManager(models.Manager):
+class ClientVatConditionManager(models.Manager["ClientVatCondition"]):
     """Manager for ClientVatCondition.
 
     This class is only used to provide natural key support for the

tests/conftest.py

@@ -24,8 +24,7 @@
 def disable_durability_check() -> Generator[None, None, None]:
     with patch(
         "django_afip.models.ReceiptQuerySet._ensure_durability",
-        False,
-        spec=True,
+        new=False,
     ):
         yield
 
@@ -54,7 +53,7 @@ def expired_key() -> bytes:
 @pytest.fixture
 def live_taxpayer(db: None) -> models.TaxPayer:
     """Return a taxpayer usable with AFIP's test servers."""
-    return TaxPayerFactory(pk=1)
+    return TaxPayerFactory.create(pk=1)
 
 
 @pytest.fixture

tests/test_admin.py

@@ -84,7 +84,7 @@ def test_certificate_auth_error() -> None:
 
 
 def test_without_key(admin_client: Client) -> None:
-    taxpayer = factories.TaxPayerFactory(key=None)
+    taxpayer = factories.TaxPayerFactory.create(key=None)
 
     response = admin_client.post(
         "/admin/afip/taxpayer/",
@@ -101,7 +101,7 @@ def test_without_key(admin_client: Client) -> None:
 
 
 def test_with_key(admin_client: Client) -> None:
-    taxpayer = factories.TaxPayerFactory(key=FileField(data=b"Blah"))
+    taxpayer = factories.TaxPayerFactory.create(key=FileField(data=b"Blah"))
 
     response = admin_client.post(
         "/admin/afip/taxpayer/",
@@ -121,7 +121,7 @@ def test_with_key(admin_client: Client) -> None:
 
 
 def test_admin_taxpayer_request_generation_with_csr(admin_client: Client) -> None:
-    taxpayer = factories.TaxPayerFactory(key=None)
+    taxpayer = factories.TaxPayerFactory.create(key=None)
     taxpayer.generate_key()
 
     response = admin_client.post(
@@ -139,7 +139,7 @@ def test_admin_taxpayer_request_generation_with_csr(admin_client: Client) -> Non
 
 
 def test_admin_taxpayer_request_generation_without_key(admin_client: Client) -> None:
-    taxpayer = factories.TaxPayerFactory(key=None)
+    taxpayer = factories.TaxPayerFactory.create(key=None)
     taxpayer.generate_key()
 
     response = admin_client.post(
@@ -159,8 +159,8 @@ def test_admin_taxpayer_request_generation_without_key(admin_client: Client) ->
 def test_admin_taxpayer_request_generation_multiple_taxpayers(
     admin_client: Client,
 ) -> None:
-    taxpayer1 = factories.TaxPayerFactory(key__data=b"Blah")
-    taxpayer2 = factories.TaxPayerFactory(key__data=b"Blah", cuit="20401231230")
+    taxpayer1 = factories.TaxPayerFactory.create(key__data=b"Blah")
+    taxpayer2 = factories.TaxPayerFactory.create(key__data=b"Blah", cuit="20401231230")
 
     response = admin_client.post(
         "/admin/afip/taxpayer/",
@@ -181,12 +181,12 @@ def test_validation_filters(admin_client: Client) -> None:
 
     This filters receipts by the validation status.
     """
-    validated_receipt = factories.ReceiptFactory()
-    failed_validation_receipt = factories.ReceiptFactory()
-    not_validated_receipt = factories.ReceiptFactory()
+    validated_receipt = factories.ReceiptFactory.create()
+    failed_validation_receipt = factories.ReceiptFactory.create()
+    not_validated_receipt = factories.ReceiptFactory.create()
 
-    factories.ReceiptValidationFactory(receipt=validated_receipt)
-    factories.ReceiptValidationFactory(
+    factories.ReceiptValidationFactory.create(receipt=validated_receipt)
+    factories.ReceiptValidationFactory.create(
         result=models.ReceiptValidation.RESULT_REJECTED,
         receipt=failed_validation_receipt,
     )
@@ -258,15 +258,15 @@ def test_validation_filters(admin_client: Client) -> None:
 def test_receipt_admin_get_exclude() -> None:
     admin = ReceiptAdmin(models.Receipt, site)
     request = RequestFactory().get("/admin/afip/receipt")
-    request.user = factories.UserFactory()
+    request.user = factories.UserFactory.create()
 
     assert "related_receipts" in admin.get_fields(request)
 
 
 @pytest.mark.django_db
 def test_receipt_pdf_factories_and_files() -> None:
-    with_file = factories.ReceiptPDFWithFileFactory()
-    without_file = factories.ReceiptPDFFactory()
+    with_file = factories.ReceiptPDFWithFileFactory.create()
+    without_file = factories.ReceiptPDFFactory.create()
 
     assert not without_file.pdf_file
     assert with_file.pdf_file
@@ -279,8 +279,8 @@ def test_has_file_filter_all(admin_client: Client) -> None:
     object's change page is present, since no matter how we reformat the rows,
     this will always be present as long as the object is listed.
     """
-    with_file = factories.ReceiptPDFWithFileFactory()
-    without_file = factories.ReceiptPDFFactory()
+    with_file = factories.ReceiptPDFWithFileFactory.create()
+    without_file = factories.ReceiptPDFFactory.create()
 
     response = admin_client.get("/admin/afip/receiptpdf/")
     assert isinstance(response, HttpResponse)
@@ -289,8 +289,8 @@ def test_has_file_filter_all(admin_client: Client) -> None:
 
 
 def test_has_file_filter_with_file(admin_client: Client) -> None:
-    with_file = factories.ReceiptPDFWithFileFactory()
-    without_file = factories.ReceiptPDFFactory()
+    with_file = factories.ReceiptPDFWithFileFactory.create()
+    without_file = factories.ReceiptPDFFactory.create()
 
     response = admin_client.get("/admin/afip/receiptpdf/?has_file=yes")
     assert isinstance(response, HttpResponse)
@@ -299,8 +299,8 @@ def test_has_file_filter_with_file(admin_client: Client) -> None:
 
 
 def test_has_file_filter_without_file(admin_client: Client) -> None:
-    with_file = factories.ReceiptPDFWithFileFactory()
-    without_file = factories.ReceiptPDFFactory()
+    with_file = factories.ReceiptPDFWithFileFactory.create()
+    without_file = factories.ReceiptPDFFactory.create()
 
     response = admin_client.get("/admin/afip/receiptpdf/?has_file=no")
     assert isinstance(response, HttpResponse)
@@ -309,7 +309,7 @@ def test_has_file_filter_without_file(admin_client: Client) -> None:
 
 
 def test_validate_certs_action_success(admin_client: Client) -> None:
-    receipt = factories.ReceiptFactory()
+    receipt = factories.ReceiptFactory.create()
 
     with patch(
         "django_afip.models.ReceiptQuerySet.validate", spec=True, return_value=[]
@@ -326,7 +326,7 @@ def test_validate_certs_action_success(admin_client: Client) -> None:
 
 
 def test_validate_certs_action_errors(admin_client: Client) -> None:
-    receipt = factories.ReceiptFactory()
+    receipt = factories.ReceiptFactory.create()
 
     with patch(
         "django_afip.models.ReceiptQuerySet.validate",
@@ -350,8 +350,8 @@ def test_validate_certs_action_errors(admin_client: Client) -> None:
 
 
 def test_admin_fetch_points_of_sales(admin_client: Client) -> None:
-    taxpayer1 = factories.TaxPayerFactory()
-    taxpayer2 = factories.TaxPayerFactory(cuit="20401231230")
+    taxpayer1 = factories.TaxPayerFactory.create()
+    taxpayer2 = factories.TaxPayerFactory.create(cuit="20401231230")
     with patch(
         "django_afip.models.TaxPayer.fetch_points_of_sales",
         spec=True,

tests/test_gentestkey.py

@@ -18,14 +18,14 @@ def test_generate_test_csr() -> None:
     """
 
     # This one is used for most tests.
-    taxpayer = factories.TaxPayerFactory(is_sandboxed=True)
+    taxpayer = factories.TaxPayerFactory.create(is_sandboxed=True)
 
     csr = taxpayer.generate_csr("wsfe")
     with open("test.csr", "wb") as f:
         f.write(csr.read())
 
     # This one is used for the `test_authentication_with_bad` test.
-    taxpayer = factories.AlternateTaxpayerFactory(is_sandboxed=True)
+    taxpayer = factories.AlternateTaxpayerFactory.create(is_sandboxed=True)
 
     csr = taxpayer.generate_csr("wsfe")
     with open("test2.csr", "wb") as f: