Feature/add pre commit (#47)

* Добавлены миграции

* Добавлен pre-commit

* Обновлен список зависимостей

* добавил аннотацию

.github/workflows/mypy_flake.yml

@@ -11,12 +11,12 @@ jobs:
         uses: actions/setup-python@v4
         with:
           python-version: 3.11
-      
+
       - name: Установка Poetry
         uses: snok/install-poetry@v1
         with:
           poetry-version: 1.7.0
-      
+
       - name: Извлечение репозитория
         uses: actions/checkout@v4
 
@@ -35,12 +35,12 @@ jobs:
         uses: actions/setup-python@v4
         with:
           python-version: 3.11
-      
+
       - name: Установка Poetry
         uses: snok/install-poetry@v1
         with:
           poetry-version: 1.7.0
-      
+
       - name: Извлечение репозитория
         uses: actions/checkout@v4
 

.pre-commit-config.yaml

@@ -0,0 +1,44 @@
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.5.0
+    hooks:
+      - id: check-docstring-first
+      - id: check-merge-conflict
+      - id: end-of-file-fixer
+      - id: trailing-whitespace
+
+  - repo: https://github.com/PyCQA/isort
+    rev: 5.12.0
+    hooks:
+      - id: isort
+
+  - repo: https://github.com/PyCQA/flake8
+    rev: 6.1.0
+    hooks:
+      - id: flake8
+        exclude: migrations/|.*settings(\.py|/)?
+        additional_dependencies:
+          - flake8-isort
+          - flake8-django
+
+  - repo: https://github.com/pre-commit/mirrors-mypy
+    rev: v1.6.0
+    hooks:
+      - id: mypy
+        additional_dependencies:
+        - django-stubs
+
+  - repo: local
+    hooks:
+      - id: export-dev-dependencies
+        name: Export dev Dependencies
+        language: system
+        pass_filenames: false
+        entry: poetry export --without-hashes --dev --output requirements/develop.txt
+        files: ^(pyproject.toml|poetry.lock)$
+      - id: export-prod-dependencies
+        name: Export prod Dependencies
+        language: system
+        pass_filenames: false
+        entry: poetry export --without-hashes --output requirements/production.txt
+        files: ^(pyproject.toml|poetry.lock)$

README.md

@@ -1,7 +1,7 @@
 # Федерация Адаптивного Хоккея
 
 #### Описание
-Проект для [Федерации адаптивного хоккея](https://paraicehockey.ru/) 
+Проект для [Федерации адаптивного хоккея](https://paraicehockey.ru/)
 
 # Содержание
 

adaptive_hockey_federation/main/migrations/0001_initial.py

@@ -1,7 +1,7 @@
 # Generated by Django 4.2.6 on 2023-11-25 14:50
 
-from django.db import migrations, models
 import django.db.models.deletion
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

adaptive_hockey_federation/main/migrations/0002_alter_player_patronymic.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.7 on 2023-12-06 21:06
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('main', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='player',
+            name='patronymic',
+            field=models.CharField(blank=True, default='', max_length=256, verbose_name='Отчество'),
+        ),
+    ]

adaptive_hockey_federation/main/migrations/0003_alter_health_revision_alter_player_sex.py

@@ -0,0 +1,23 @@
+# Generated by Django 4.2.7 on 2023-12-08 22:05
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('main', '0002_alter_player_patronymic'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='health',
+            name='revision',
+            field=models.CharField(blank=True, max_length=256, verbose_name='Пересмотр класса ХДН'),
+        ),
+        migrations.AlterField(
+            model_name='player',
+            name='sex',
+            field=models.CharField(blank=True, choices=[('male', 'Мужской'), ('female', 'Женский')], max_length=6, verbose_name='Пол'),
+        ),
+    ]

adaptive_hockey_federation/main/models.py

@@ -1,3 +1,4 @@
+from django.db import models
 from django.db.models import (
     CASCADE,
     SET_NULL,
@@ -23,7 +24,7 @@ class BaseUniqueName(Model):
     """
     Абстрактный класс с уникальным полем "Название" и методом отображения
     """
-    name = CharField(
+    name: models.CharField = CharField(
         max_length=NAME_FIELD_LENGTH,
         verbose_name='Название',
         unique=True,
@@ -62,15 +63,15 @@ class Team(Model):
     """
     Модель команды.
     """
-    name = CharField(max_length=NAME_FIELD_LENGTH, )
-    location = ForeignKey(
+    name: models.CharField = CharField(max_length=NAME_FIELD_LENGTH, )
+    location: models.ForeignKey = ForeignKey(
         to=Location,
         on_delete=SET_NULL,
         blank=True,
         null=True,
         verbose_name='Локация команды',
     )
-    discipline = ForeignKey(
+    discipline: models.ForeignKey = ForeignKey(
         to=Discipline,
         on_delete=SET_NULL,
         blank=True,
@@ -139,15 +140,15 @@ class BasePerson(Model):
     """
     Абстрактная модель с базовой персональной информацией
     """
-    name = CharField(
+    name: models.CharField = CharField(
         max_length=BASE_PERSON_FIELD_LENGTH,
         verbose_name='Имя',
     )
-    surname = CharField(
+    surname: models.CharField = CharField(
         max_length=BASE_PERSON_FIELD_LENGTH,
         verbose_name='Фамилия',
     )
-    patronymic = CharField(
+    patronymic: models.CharField = CharField(
         max_length=BASE_PERSON_FIELD_LENGTH,
         blank=True,
         default='',
@@ -167,15 +168,14 @@ class Player(BasePerson):
     Модель игрока. Связь с командой "многие ко многим" на случай включения
     игрока в сборную, помимо основного состава.
     """
-    birth_date = DateField()
-    sex = CharField(
+    birth_date: models.DateField = DateField()
+    sex: models.CharField = CharField(
         max_length=max(len(sex) for sex, _ in SEX_CHOICES),
         choices=SEX_CHOICES,
         blank=True,
-        null=True,
         verbose_name='Пол'
     )
-    team = ManyToManyField(
+    team: models.ManyToManyField = ManyToManyField(
         to=Team,
         through='PlayerTeam',
         verbose_name='Команда'
@@ -197,36 +197,35 @@ class Health(Model):
     """
     Информация по хронической дыхательной недостаточности.
     """
-    player = ForeignKey(
+    player: models.ForeignKey = ForeignKey(
         to=Player,
         related_name='health',
         on_delete=CASCADE,
         verbose_name='Игрок',
     )
-    respiratory_failure = ForeignKey(
+    respiratory_failure: models.ForeignKey = ForeignKey(
         to=RespiratoryFailure,
         related_name='respiratory_failure_players',
         on_delete=CASCADE,
         verbose_name='Класс ХДН',
     )
-    is_permanent = BooleanField(
+    is_permanent: models.BooleanField = BooleanField(
         default=False,
         verbose_name='Класс ХДН подтверждён перманентно',
     )
-    revision = CharField(
+    revision: models.CharField = CharField(
         max_length=NAME_FIELD_LENGTH,
         blank=True,
-        null=True,
         verbose_name='Пересмотр класса ХДН',
     )
-    anamnesis = ForeignKey(
+    anamnesis: models.ForeignKey = ForeignKey(
         to=Anamnesis,
         on_delete=SET_NULL,
         blank=True,
         null=True,
         verbose_name='Диагноз',
     )
-    wheelchair = BooleanField(
+    wheelchair: models.BooleanField = BooleanField(
         default=False,
         verbose_name='На коляске'
     )
@@ -241,34 +240,34 @@ class PlayerTeam(Model):
     Связь "многие ко многим" игрока с командой с добавлением данных игрока
     в этой команде.
     """
-    player = ForeignKey(
+    player: models.ForeignKey = ForeignKey(
         to=Player,
         related_name='player_teams',
         on_delete=CASCADE,
         verbose_name='Игрок',
 
     )
-    team = ForeignKey(
+    team: models.ForeignKey = ForeignKey(
         to=Team,
         related_name='team_players',
         on_delete=CASCADE,
         verbose_name='Команда',
     )
-    position = ForeignKey(
+    position: models.ForeignKey = ForeignKey(
         to=Position,
         on_delete=SET_NULL,
         blank=True,
         null=True,
         verbose_name='Позиция игрока',
     )
-    role = ForeignKey(
+    role: models.ForeignKey = ForeignKey(
         to=Role,
         on_delete=SET_NULL,
         blank=True,
         null=True,
         verbose_name='Статус игрока',
     )
-    number = CharField(
+    number: models.CharField = CharField(
         max_length=NAME_FIELD_LENGTH,
         verbose_name='Игровой номер',
     )

adaptive_hockey_federation/main/views.py

@@ -1,6 +1,5 @@
 from django.shortcuts import render
 
-
 # пример рендера таблиц, удалить после реализации вьюх
 CONTEXT_EXAMPLE = {
     'table_head': {

adaptive_hockey_federation/parser/parser.py

@@ -82,9 +82,8 @@ def get_all_files(path: str) -> tuple[list[str], str | None]:
             if filename == NUMERIC_STATUSES:
                 numeric_statuses_filepath = os.path.join(dirpath, filename)
             file, extension = os.path.splitext(filename)
-            if (not file.startswith('~')
-                    and extension in FILES_EXTENSIONS
-                    and file not in FILES_BLACK_LIST):
+            if (not file.startswith('~') and extension
+                    in FILES_EXTENSIONS and file not in FILES_BLACK_LIST):
                 files.append(os.path.join(dirpath, filename))
     return files, numeric_statuses_filepath
 

adaptive_hockey_federation/templates/base.html

@@ -57,4 +57,4 @@
         </div>
     </div>
   </body>
-</html>
+</html>

adaptive_hockey_federation/templates/includes/button.html

@@ -4,4 +4,4 @@
     {% if current_url_name  == url_name %}bg-[#340061]{% else %}bg-[#64c2d1]{% endif %}">
       {{ name }}
   </a>
-{% endwith %}
+{% endwith %}

adaptive_hockey_federation/templates/includes/drawer.html

@@ -41,4 +41,4 @@
             </ul>
         </div>
     </div>
-</div>
+</div>

adaptive_hockey_federation/templates/includes/dropdown_button.html

@@ -1,7 +1,7 @@
 {% with request.resolver_match.view_name as view_name %}
 
   <li class="nav-item dropdown place-self-center p-0">
-    <a class="nav-link dropdown-toggle border border-primary bg-white w-44 text-slate-400 p-1.5 text-end" href="#" 
+    <a class="nav-link dropdown-toggle border border-primary bg-white w-44 text-slate-400 p-1.5 text-end" href="#"
     role="button" data-bs-toggle="dropdown" aria-expanded="false">
       {% if view_name  == 'main:users' %}Роль{% endif %}
       {% if view_name  == 'main:teams' %}Команда{% endif %}
@@ -16,4 +16,4 @@
       <li><a class="dropdown-item" href="#">...</a></li>
     </ul>
   </li>
-{% endwith %}
+{% endwith %}

adaptive_hockey_federation/templates/includes/header.html

@@ -21,4 +21,4 @@
       </li>
     </ul>
   </div>
-</nav>   
+</nav>

adaptive_hockey_federation/templates/includes/table.html

@@ -31,4 +31,4 @@
       </tr>
     {% endfor %}
   </tbody>
-</table>
+</table>

adaptive_hockey_federation/users/admin.py

@@ -1,5 +1,4 @@
 from django.contrib import admin
-
 from users.models import User
 
 

adaptive_hockey_federation/users/migrations/0001_initial.py

@@ -2,9 +2,9 @@
 
 import django.contrib.auth.models
 import django.contrib.auth.validators
-from django.db import migrations, models
 import django.db.models.deletion
 import django.utils.timezone
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):