Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[#5024] Remove uppercase validation of Domain in ZGW registration backend #5075

Merged
merged 1 commit into from
Feb 5, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Generated by Django 4.2.18 on 2025-02-03 20:21

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
("objects_api", "0005_alter_objectsapigroupconfig_table"),
]

operations = [
migrations.AlterField(
model_name="objectsapigroupconfig",
name="catalogue_domain",
field=models.CharField(
blank=True,
help_text="The 'domein' attribute for the Catalogus resource in the Catalogi API.",
max_length=5,
verbose_name="catalogus domain",
),
),
]
3 changes: 1 addition & 2 deletions src/openforms/contrib/objects_api/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

from zgw_consumers.constants import APITypes

from openforms.utils.validators import RSINValidator, validate_rsin, validate_uppercase
from openforms.utils.validators import RSINValidator, validate_rsin

# no catalogus specified, requires both RSIN and domain to be unspecified
_CATALOGUE_NOT_SET = models.Q(catalogue_domain="", catalogue_rsin="")
Expand Down Expand Up @@ -75,7 +75,6 @@ class ObjectsAPIGroupConfig(models.Model):
help_text=_(
"The 'domein' attribute for the Catalogus resource in the Catalogi API."
),
validators=[validate_uppercase],
)
catalogue_rsin = models.CharField(
_("catalogus RSIN"),
Expand Down
3 changes: 1 addition & 2 deletions src/openforms/contrib/zgw/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from rest_framework import serializers

from openforms.api.validators import AllOrNoneTruthyFieldsValidator
from openforms.utils.validators import RSINValidator, validate_uppercase
from openforms.utils.validators import RSINValidator


class CatalogueSerializer(serializers.Serializer):
Expand All @@ -29,7 +29,6 @@ class CatalogueSerializer(serializers.Serializer):
"The 'domein' attribute for the Catalogus resource in the Catalogi API."
),
default="",
validators=[validate_uppercase],
allow_blank=True,
)
rsin = serializers.CharField(
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Generated by Django 4.2.18 on 2025-02-03 20:21

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
("zgw_apis", "0018_alter_zgwapigroupconfig_drc_service_and_more"),
]

operations = [
migrations.AlterField(
model_name="zgwapigroupconfig",
name="catalogue_domain",
field=models.CharField(
blank=True,
help_text="The 'domein' attribute for the Catalogus resource in the Catalogi API.",
max_length=5,
verbose_name="catalogus domain",
),
),
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Generated by Django 4.2.18 on 2025-02-04 11:09

from django.db import migrations


class Migration(migrations.Migration):

dependencies = [
("zgw_apis", "0019_alter_zgwapigroupconfig_auteur"),
("zgw_apis", "0019_alter_zgwapigroupconfig_catalogue_domain"),
]

operations = []
3 changes: 1 addition & 2 deletions src/openforms/registrations/contrib/zgw_apis/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from zgw_consumers.constants import APITypes

from openforms.template.validators import DjangoTemplateValidator
from openforms.utils.validators import RSINValidator, validate_rsin, validate_uppercase
from openforms.utils.validators import RSINValidator, validate_rsin


def get_content_text() -> str:
Expand Down Expand Up @@ -98,7 +98,6 @@ class ZGWApiGroupConfig(models.Model):
help_text=_(
"The 'domein' attribute for the Catalogus resource in the Catalogi API."
),
validators=[validate_uppercase],
)
catalogue_rsin = models.CharField(
_("catalogus RSIN"),
Expand Down
7 changes: 0 additions & 7 deletions src/openforms/utils/validators.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,6 @@
)


validate_uppercase = RegexValidator(
r"^[A-Z]*$",
message=_("Value must be all uppercase letters."),
code="invalid",
)


class Proef11ValidatorBase:
value_size = NotImplemented
error_messages = {
Expand Down
Loading