From 2b173a2a18e34e5ac63ca1046d847e2c0b4fb55f Mon Sep 17 00:00:00 2001 From: Babouche Date: Tue, 3 Jun 2025 18:21:21 -0400 Subject: [PATCH] Move validators --- .../registration/factory/add_student_request_factory.py | 8 ++++---- .../factory/force_register_student_request_factory.py | 4 ++-- .../factory/force_unregister_student_request_factory.py | 2 +- .../factory/register_student_request_factory.py | 2 +- .../factory/unregister_student_request_factory.py | 2 +- bot/resource/cog/validators/__init__.py | 0 .../cog}/validators/discord_id_validator.py | 0 .../student => resource/cog}/validators/name_validator.py | 0 .../student => resource/cog}/validators/ni_validator.py | 0 .../cog}/validators/program_code_validator.py | 0 tests/application/validators/test_discord_id_validator.py | 2 +- tests/application/validators/test_name_validator.py | 2 +- tests/application/validators/test_ni_validator.py | 2 +- 13 files changed, 12 insertions(+), 12 deletions(-) create mode 100644 bot/resource/cog/validators/__init__.py rename bot/{application/student => resource/cog}/validators/discord_id_validator.py (100%) rename bot/{application/student => resource/cog}/validators/name_validator.py (100%) rename bot/{application/student => resource/cog}/validators/ni_validator.py (100%) rename bot/{application/student => resource/cog}/validators/program_code_validator.py (100%) diff --git a/bot/resource/cog/registration/factory/add_student_request_factory.py b/bot/resource/cog/registration/factory/add_student_request_factory.py index c760809..81c0dde 100644 --- a/bot/resource/cog/registration/factory/add_student_request_factory.py +++ b/bot/resource/cog/registration/factory/add_student_request_factory.py @@ -10,10 +10,10 @@ from bot.application.student.exceptions.missing_program_code_exception import ( MissingProgramCodeException, ) -from bot.application.student.validators.discord_id_validator import DiscordIdValidator -from bot.application.student.validators.name_validator import NameValidator -from bot.application.student.validators.ni_validator import NIValidator -from bot.application.student.validators.program_code_validator import ( +from bot.resource.cog.validators.discord_id_validator import DiscordIdValidator +from bot.resource.cog.validators.name_validator import NameValidator +from bot.resource.cog.validators.ni_validator import NIValidator +from bot.resource.cog.validators.program_code_validator import ( ProgramCodeValidator, ) from bot.domain.student.attribut.firstname import Firstname diff --git a/bot/resource/cog/registration/factory/force_register_student_request_factory.py b/bot/resource/cog/registration/factory/force_register_student_request_factory.py index ff193d7..ae19112 100644 --- a/bot/resource/cog/registration/factory/force_register_student_request_factory.py +++ b/bot/resource/cog/registration/factory/force_register_student_request_factory.py @@ -6,8 +6,8 @@ from bot.application.student.exceptions.invalid_ni_format_exception import ( InvalidNIFormatException, ) -from bot.application.student.validators.discord_id_validator import DiscordIdValidator -from bot.application.student.validators.ni_validator import NIValidator +from bot.resource.cog.validators.discord_id_validator import DiscordIdValidator +from bot.resource.cog.validators.ni_validator import NIValidator from bot.domain.student.attribut.discord_user_id import DiscordUserId from bot.domain.student.factory.ni_factory import NIFactory from bot.resource.cog.registration.factory.request_factory import RequestFactory diff --git a/bot/resource/cog/registration/factory/force_unregister_student_request_factory.py b/bot/resource/cog/registration/factory/force_unregister_student_request_factory.py index 037c703..660aff1 100644 --- a/bot/resource/cog/registration/factory/force_unregister_student_request_factory.py +++ b/bot/resource/cog/registration/factory/force_unregister_student_request_factory.py @@ -3,7 +3,7 @@ from bot.application.student.exceptions.invalid_ni_format_exception import ( InvalidNIFormatException, ) -from bot.application.student.validators.ni_validator import NIValidator +from bot.resource.cog.validators.ni_validator import NIValidator from bot.domain.student.factory.ni_factory import NIFactory from bot.resource.cog.registration.factory.request_factory import RequestFactory from bot.resource.cog.registration.request.force_unregister_student_request import ( diff --git a/bot/resource/cog/registration/factory/register_student_request_factory.py b/bot/resource/cog/registration/factory/register_student_request_factory.py index 4f8837d..3efbb74 100644 --- a/bot/resource/cog/registration/factory/register_student_request_factory.py +++ b/bot/resource/cog/registration/factory/register_student_request_factory.py @@ -3,7 +3,7 @@ from bot.application.student.exceptions.invalid_ni_format_exception import ( InvalidNIFormatException, ) -from bot.application.student.validators.ni_validator import NIValidator +from bot.resource.cog.validators.ni_validator import NIValidator from bot.domain.student.attribut.discord_user_id import DiscordUserId from bot.domain.student.factory.ni_factory import NIFactory from bot.resource.cog.registration.factory.request_factory import RequestFactory diff --git a/bot/resource/cog/registration/factory/unregister_student_request_factory.py b/bot/resource/cog/registration/factory/unregister_student_request_factory.py index 99f0e51..cd74b91 100644 --- a/bot/resource/cog/registration/factory/unregister_student_request_factory.py +++ b/bot/resource/cog/registration/factory/unregister_student_request_factory.py @@ -3,7 +3,7 @@ from bot.application.student.exceptions.invalid_discord_id_format_exception import ( InvalidDiscordIdFormatException, ) -from bot.application.student.validators.discord_id_validator import DiscordIdValidator +from bot.resource.cog.validators.discord_id_validator import DiscordIdValidator from bot.domain.student.attribut.discord_user_id import DiscordUserId from bot.resource.cog.registration.factory.request_factory import RequestFactory from bot.resource.cog.registration.request.unregister_student_request import ( diff --git a/bot/resource/cog/validators/__init__.py b/bot/resource/cog/validators/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/bot/application/student/validators/discord_id_validator.py b/bot/resource/cog/validators/discord_id_validator.py similarity index 100% rename from bot/application/student/validators/discord_id_validator.py rename to bot/resource/cog/validators/discord_id_validator.py diff --git a/bot/application/student/validators/name_validator.py b/bot/resource/cog/validators/name_validator.py similarity index 100% rename from bot/application/student/validators/name_validator.py rename to bot/resource/cog/validators/name_validator.py diff --git a/bot/application/student/validators/ni_validator.py b/bot/resource/cog/validators/ni_validator.py similarity index 100% rename from bot/application/student/validators/ni_validator.py rename to bot/resource/cog/validators/ni_validator.py diff --git a/bot/application/student/validators/program_code_validator.py b/bot/resource/cog/validators/program_code_validator.py similarity index 100% rename from bot/application/student/validators/program_code_validator.py rename to bot/resource/cog/validators/program_code_validator.py diff --git a/tests/application/validators/test_discord_id_validator.py b/tests/application/validators/test_discord_id_validator.py index b4dc3d1..944d522 100644 --- a/tests/application/validators/test_discord_id_validator.py +++ b/tests/application/validators/test_discord_id_validator.py @@ -1,6 +1,6 @@ import pytest -from bot.application.student.validators.discord_id_validator import DiscordIdValidator +from bot.resource.cog.validators.discord_id_validator import DiscordIdValidator DISCORD_ID: int = 123456789012749572 OLD_DISCORD_ID: int = 1234567891023567 diff --git a/tests/application/validators/test_name_validator.py b/tests/application/validators/test_name_validator.py index f450c4c..5344f29 100644 --- a/tests/application/validators/test_name_validator.py +++ b/tests/application/validators/test_name_validator.py @@ -1,6 +1,6 @@ import pytest -from bot.application.student.validators.name_validator import NameValidator +from bot.resource.cog.validators.name_validator import NameValidator NAME: str = "Clemou Delta" COMPOSED_NAME: str = "Clemou-Delta" diff --git a/tests/application/validators/test_ni_validator.py b/tests/application/validators/test_ni_validator.py index 4ec20b5..a2f1af4 100644 --- a/tests/application/validators/test_ni_validator.py +++ b/tests/application/validators/test_ni_validator.py @@ -1,6 +1,6 @@ import pytest -from bot.application.student.validators.ni_validator import NIValidator +from bot.resource.cog.validators.ni_validator import NIValidator NI: str = "111222333" INVALID_DIGIT_LEN_NI: str = "11122233"