From 4a245ee8d282fd55f59837d7368eeab3614d8a20 Mon Sep 17 00:00:00 2001 From: Anton Braun Date: Mon, 6 May 2024 22:50:37 +0300 Subject: [PATCH 1/2] Added AUTH_USER_MODEL in settings and few naming fixes --- src/admin_user/admin.py | 10 +++++----- src/admin_user/models.py | 4 ++-- src/core/config/settings_base.py | 2 ++ 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/admin_user/admin.py b/src/admin_user/admin.py index ac3497a..820bccb 100644 --- a/src/admin_user/admin.py +++ b/src/admin_user/admin.py @@ -1,11 +1,11 @@ from django.contrib import admin from django.contrib.auth.admin import UserAdmin -from admin_user.models import Administator +from admin_user.models import Administrator -@admin.register(Administator) -class AdministatorAdmin(UserAdmin): +@admin.register(Administrator) +class AdministratorAdmin(UserAdmin): """Admin panel for the Admin model in the Django admin area. Changes made: @@ -17,8 +17,8 @@ class AdministatorAdmin(UserAdmin): add_fieldsets = ( (None, { "fields": ( - Administator.USERNAME_FIELD, - *Administator.REQUIRED_FIELDS, + Administrator.USERNAME_FIELD, + *Administrator.REQUIRED_FIELDS, "password1", "password2", "is_staff", diff --git a/src/admin_user/models.py b/src/admin_user/models.py index 7a45862..e117801 100644 --- a/src/admin_user/models.py +++ b/src/admin_user/models.py @@ -6,8 +6,8 @@ EMAIL_LENGTH = 254 -class Administator(AbstractUser): - """Custom administator model.""" +class Administrator(AbstractUser): + """Custom Administrator model.""" first_name = models.CharField("Имя", max_length=DEFAULT_NAME_LENGTH) last_name = models.CharField("Фамилия", max_length=DEFAULT_NAME_LENGTH) diff --git a/src/core/config/settings_base.py b/src/core/config/settings_base.py index 33711fb..97603d1 100644 --- a/src/core/config/settings_base.py +++ b/src/core/config/settings_base.py @@ -71,6 +71,8 @@ WSGI_APPLICATION = "core.wsgi.application" +AUTH_USER_MODEL = "admin_user.Administrator" + AUTH_PASSWORD_VALIDATORS = [ { "NAME": "django.contrib.auth.password_validation.UserAttributeSimilarityValidator", From 83524c52b7ec4140b242582723a6fbd8fbee29f8 Mon Sep 17 00:00:00 2001 From: Anton Braun Date: Tue, 7 May 2024 00:10:11 +0300 Subject: [PATCH 2/2] Fix bot fakerun while migrations, install correct package for phonefield --- poetry.lock | 25 ++++++++++++++++++++++++- pyproject.toml | 2 +- src/bot/apps.py | 14 ++++++++------ src/core/config/settings_base.py | 2 +- src/potential_user/models.py | 2 +- 5 files changed, 35 insertions(+), 10 deletions(-) diff --git a/poetry.lock b/poetry.lock index eb65c6a..4b65d5d 100644 --- a/poetry.lock +++ b/poetry.lock @@ -429,6 +429,7 @@ files = [ [package.dependencies] Django = ">=3.2" +phonenumbers = {version = ">=7.0.2", optional = true, markers = "extra == \"phonenumbers\""} [package.extras] phonenumbers = ["phonenumbers (>=7.0.2)"] @@ -813,6 +814,17 @@ files = [ [package.dependencies] ptyprocess = ">=0.5" +[[package]] +name = "phonenumbers" +version = "8.13.36" +description = "Python version of Google's common library for parsing, formatting, storing and validating international phone numbers." +optional = false +python-versions = "*" +files = [ + {file = "phonenumbers-8.13.36-py2.py3-none-any.whl", hash = "sha256:68e06d20ae2f8fe5c7c7fd5b433f4257bc3cc747dc5196a029c7898ea449b012"}, + {file = "phonenumbers-8.13.36.tar.gz", hash = "sha256:b4e2371e35a1172aa2c91c9200b1e48e87b9355eb575768dd38058fc8d72c9ff"}, +] + [[package]] name = "pkginfo" version = "1.10.0" @@ -1003,6 +1015,7 @@ files = [ {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:69b023b2b4daa7548bcfbd4aa3da05b3a74b772db9e23b982788168117739938"}, {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:81e0b275a9ecc9c0c0c07b4b90ba548307583c125f54d5b6946cfee6360c733d"}, {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ba336e390cd8e4d1739f42dfe9bb83a3cc2e80f567d8805e11b46f4a943f5515"}, + {file = "PyYAML-6.0.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:326c013efe8048858a6d312ddd31d56e468118ad4cdeda36c719bf5bb6192290"}, {file = "PyYAML-6.0.1-cp310-cp310-win32.whl", hash = "sha256:bd4af7373a854424dabd882decdc5579653d7868b8fb26dc7d0e99f823aa5924"}, {file = "PyYAML-6.0.1-cp310-cp310-win_amd64.whl", hash = "sha256:fd1592b3fdf65fff2ad0004b5e363300ef59ced41c2e6b3a99d4089fa8c5435d"}, {file = "PyYAML-6.0.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:6965a7bc3cf88e5a1c3bd2e0b5c22f8d677dc88a455344035f03399034eb3007"}, @@ -1010,8 +1023,16 @@ files = [ {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:42f8152b8dbc4fe7d96729ec2b99c7097d656dc1213a3229ca5383f973a5ed6d"}, {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:062582fca9fabdd2c8b54a3ef1c978d786e0f6b3a1510e0ac93ef59e0ddae2bc"}, {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d2b04aac4d386b172d5b9692e2d2da8de7bfb6c387fa4f801fbf6fb2e6ba4673"}, + {file = "PyYAML-6.0.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:e7d73685e87afe9f3b36c799222440d6cf362062f78be1013661b00c5c6f678b"}, {file = "PyYAML-6.0.1-cp311-cp311-win32.whl", hash = "sha256:1635fd110e8d85d55237ab316b5b011de701ea0f29d07611174a1b42f1444741"}, {file = "PyYAML-6.0.1-cp311-cp311-win_amd64.whl", hash = "sha256:bf07ee2fef7014951eeb99f56f39c9bb4af143d8aa3c21b1677805985307da34"}, + {file = "PyYAML-6.0.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:855fb52b0dc35af121542a76b9a84f8d1cd886ea97c84703eaa6d88e37a2ad28"}, + {file = "PyYAML-6.0.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:40df9b996c2b73138957fe23a16a4f0ba614f4c0efce1e9406a184b6d07fa3a9"}, + {file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a08c6f0fe150303c1c6b71ebcd7213c2858041a7e01975da3a99aed1e7a378ef"}, + {file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6c22bec3fbe2524cde73d7ada88f6566758a8f7227bfbf93a408a9d86bcc12a0"}, + {file = "PyYAML-6.0.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8d4e9c88387b0f5c7d5f281e55304de64cf7f9c0021a3525bd3b1c542da3b0e4"}, + {file = "PyYAML-6.0.1-cp312-cp312-win32.whl", hash = "sha256:d483d2cdf104e7c9fa60c544d92981f12ad66a457afae824d146093b8c294c54"}, + {file = "PyYAML-6.0.1-cp312-cp312-win_amd64.whl", hash = "sha256:0d3304d8c0adc42be59c5f8a4d9e3d7379e6955ad754aa9d6ab7a398b59dd1df"}, {file = "PyYAML-6.0.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:50550eb667afee136e9a77d6dc71ae76a44df8b3e51e41b77f6de2932bfe0f47"}, {file = "PyYAML-6.0.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1fe35611261b29bd1de0070f0b2f47cb6ff71fa6595c077e42bd0c419fa27b98"}, {file = "PyYAML-6.0.1-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:704219a11b772aea0d8ecd7058d0082713c3562b4e271b849ad7dc4a5c90c13c"}, @@ -1028,6 +1049,7 @@ files = [ {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a0cd17c15d3bb3fa06978b4e8958dcdc6e0174ccea823003a106c7d4d7899ac5"}, {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:28c119d996beec18c05208a8bd78cbe4007878c6dd15091efb73a30e90539696"}, {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7e07cbde391ba96ab58e532ff4803f79c4129397514e1413a7dc761ccd755735"}, + {file = "PyYAML-6.0.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:49a183be227561de579b4a36efbb21b3eab9651dd81b1858589f796549873dd6"}, {file = "PyYAML-6.0.1-cp38-cp38-win32.whl", hash = "sha256:184c5108a2aca3c5b3d3bf9395d50893a7ab82a38004c8f61c258d4428e80206"}, {file = "PyYAML-6.0.1-cp38-cp38-win_amd64.whl", hash = "sha256:1e2722cc9fbb45d9b87631ac70924c11d3a401b2d7f410cc0e3bbf249f2dca62"}, {file = "PyYAML-6.0.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:9eb6caa9a297fc2c2fb8862bc5370d0303ddba53ba97e71f08023b6cd73d16a8"}, @@ -1035,6 +1057,7 @@ files = [ {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5773183b6446b2c99bb77e77595dd486303b4faab2b086e7b17bc6bef28865f6"}, {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b786eecbdf8499b9ca1d697215862083bd6d2a99965554781d0d8d1ad31e13a0"}, {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bc1bf2925a1ecd43da378f4db9e4f799775d6367bdb94671027b73b393a7c42c"}, + {file = "PyYAML-6.0.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:04ac92ad1925b2cff1db0cfebffb6ffc43457495c9b3c39d3fcae417d7125dc5"}, {file = "PyYAML-6.0.1-cp39-cp39-win32.whl", hash = "sha256:faca3bdcf85b2fc05d06ff3fbc1f83e1391b3e724afa3feba7d13eeab355484c"}, {file = "PyYAML-6.0.1-cp39-cp39-win_amd64.whl", hash = "sha256:510c9deebc5c0225e8c96813043e62b680ba2f9c50a08d3724c7f28a747d1486"}, {file = "PyYAML-6.0.1.tar.gz", hash = "sha256:bfdf460b1736c775f2ba9f6a92bca30bc2095067b8a9d77876d1fad6cc3b4a43"}, @@ -1417,4 +1440,4 @@ test = ["pytest"] [metadata] lock-version = "2.0" python-versions = "^3.12" -content-hash = "95811ee1f3ed47f48cd5d70cd57618565a4eaf04a4dbf47a794dc385b5b21492" +content-hash = "c3ddd0193957b1fb29870d090b10f64b3c3f18f1270bd68549ef09c8da8b24d5" diff --git a/pyproject.toml b/pyproject.toml index 5a35326..61b43cf 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -13,7 +13,7 @@ python-telegram-bot = "^21.1.1" poetry-plugin-export = "^1.7.1" django-environ= "^0.11.2" django-asgi-lifespan = "^0.3.1" -django-phonenumber-field = "^7.3.0" +django-phonenumber-field = {extras = ["phonenumbers"], version = "^7.3.0"} [tool.poetry.group.dev.dependencies] ruff = "^0.4.2" diff --git a/src/bot/apps.py b/src/bot/apps.py index 9beff77..5a62727 100644 --- a/src/bot/apps.py +++ b/src/bot/apps.py @@ -15,12 +15,14 @@ def stop_bot(self, **kwargs): def ready(self) -> None: """Perform actions when the application is ready.""" import os + + # TODO: временное решение, необходимо продумать улучшение. + if os.environ.get("DJANGO_MIGRATE", False): + if os.environ.get("RUN_MAIN", None) != "true": + from bot.bot_interface import Bot - if os.environ.get("RUN_MAIN", None) != "true": - from bot.bot_interface import Bot + self.bot = Bot() - self.bot = Bot() + asgi_shutdown.connect(self.stop_bot) - asgi_shutdown.connect(self.stop_bot) - - self.bot.start() + self.bot.start() \ No newline at end of file diff --git a/src/core/config/settings_base.py b/src/core/config/settings_base.py index 97603d1..a88501f 100644 --- a/src/core/config/settings_base.py +++ b/src/core/config/settings_base.py @@ -37,7 +37,7 @@ "schooling.apps.SchoolingConfig", ] -EXTERNAL_APPS = [] +EXTERNAL_APPS = ["phonenumber_field",] INSTALLED_APPS = DEFAULT_APPS + EXTERNAL_APPS + LOCAL_APPS diff --git a/src/potential_user/models.py b/src/potential_user/models.py index d3c4012..63ff607 100644 --- a/src/potential_user/models.py +++ b/src/potential_user/models.py @@ -11,7 +11,7 @@ class ApplicationForm(models.Model): ) telegram_id = models.IntegerField("Telegram ID", unique=True) - role = models.CharField(choices=ROLE_CHOICES) + role = models.CharField(choices=ROLE_CHOICES, max_length=20) name = models.CharField(max_length=20) surname = models.CharField(max_length=20) city = models.CharField(max_length=20)