[#3607] Switch to a validator mixin

open-formulieren · Jan 9, 2024 · becb03f · becb03f
1 parent 0817624
commit becb03f
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/src/openforms/contrib/kvk/validators.py b/src/openforms/contrib/kvk/validators.py
@@ -48,7 +48,7 @@ class KVKBranchNumberValidator(NumericBaseValidator):
 validate_branchNumber = KVKBranchNumberValidator()
 
 
-class KVKRemoteBaseValidator:
+class KVKRemoteValidatorMixin:
     query_param: Literal["kvkNummer", "rsin", "vestigingsnummer"]
     value_label: str
 
@@ -57,7 +57,7 @@ class KVKRemoteBaseValidator:
         "too_short": _("%(type)s should have %(size)i characters."),
     }
 
-    def __call__(self, value: str) -> bool:
+    def validate(self, value: str) -> bool:
         assert self.query_param
         query = cast(
             SearchParams, {self.query_param: value}
@@ -85,7 +85,7 @@ def __call__(self, value: str) -> bool:
 
 @register("kvk-kvkNumber")
 @deconstructible
-class KVKNumberRemoteValidator(BasePlugin[str], KVKRemoteBaseValidator):
+class KVKNumberRemoteValidator(BasePlugin[str], KVKRemoteValidatorMixin):
     query_param = "kvkNummer"
     value_label = _("KvK number")
 
@@ -94,12 +94,12 @@ class KVKNumberRemoteValidator(BasePlugin[str], KVKRemoteBaseValidator):
 
     def __call__(self, value: str, submission):
         validate_kvk(value)
-        KVKRemoteBaseValidator.__call__(self, value)
+        super().validate(value)
 
 
 @register("kvk-rsin")
 @deconstructible
-class KVKRSINRemoteValidator(BasePlugin[str], KVKRemoteBaseValidator):
+class KVKRSINRemoteValidator(BasePlugin[str], KVKRemoteValidatorMixin):
     query_param = "rsin"
     value_label = _("RSIN")
 
@@ -108,12 +108,12 @@ class KVKRSINRemoteValidator(BasePlugin[str], KVKRemoteBaseValidator):
 
     def __call__(self, value: str, submission):
         validate_rsin(value)
-        KVKRemoteBaseValidator.__call__(self, value)
+        super().validate(value)
 
 
 @register("kvk-branchNumber")
 @deconstructible
-class KVKBranchNumberRemoteValidator(BasePlugin[str], KVKRemoteBaseValidator):
+class KVKBranchNumberRemoteValidator(BasePlugin[str], KVKRemoteValidatorMixin):
     query_param = "vestigingsnummer"
     value_label = _("Branch number")
 
@@ -122,4 +122,4 @@ class KVKBranchNumberRemoteValidator(BasePlugin[str], KVKRemoteBaseValidator):
 
     def __call__(self, value: str, submission):
         validate_branchNumber(value)
-        KVKRemoteBaseValidator.__call__(self, value)
+        super().validate(value)