Repository navigation
added validation when create #41
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,63 @@ | ||
| from datetime import datetime, timezone | ||
| from typing import Union | ||
|
|
||
| from requests import Session | ||
|
|
||
| from modal_backend.exceptions import AlreadyExists, ForbiddenAction, ObjectNotFound, ValueError | ||
| from modal_backend.models.db import Group, ModalStatus, Note, Service | ||
| from modal_backend.schemas.base import StatusResponseModel | ||
| from modal_backend.schemas.models import ( | ||
| GroupPost, | ||
| NoteChoicePost, | ||
| NoteImagePost, | ||
| NoteInfoPost, | ||
| NoteRatingPost, | ||
| NoteTextPost, | ||
| ServicePost, | ||
| ) | ||
|
|
||
|
|
||
| class NoteService: | ||
| """ | ||
| Сервис для работы с логикой Notifications и базой данных | ||
| """ | ||
|
|
||
| @classmethod | ||
| async def validate_note( | ||
| cls, db: Session, note: Union[NoteInfoPost, NoteRatingPost, NoteTextPost, NoteChoicePost, NoteImagePost] | ||
| ): | ||
| """Валидация полей при создании note""" | ||
| if note.is_always: | ||
| note.end_ts = None | ||
|
Member
Author
There was a problem hiding this comment. а зачем такая проверка если в схеме прописано что дефолт none
Member
Author
There was a problem hiding this comment. и тогда сразу вопрос почему start_ts не делал?) только для конца |
||
| elif note.end_ts is None or (note.start_ts is not None and note.start_ts >= note.end_ts): | ||
|
Member
Author
There was a problem hiding this comment. лучше просто or все сделать |
||
| raise ValueError("Invalid end_ts value") | ||
|
|
||
|
Member
Author
There was a problem hiding this comment. нужна кстати проверка что start и end_ts>now иначе я могу сейчас создать модалку которая просрочена |
||
| if note.frequency < 1: | ||
| raise ValueError("Frequency must be greater than 0") | ||
| if not note.group_ids: | ||
|
Member
Author
There was a problem hiding this comment. хочется для групп и сервисов сделать проверку на их существование реальное, надо в бд здесь будет обращаться |
||
| raise ValueError("Group ids must not be empty") | ||
| if not note.service_ids: | ||
| raise ValueError("Service ids must not be empty") | ||
|
|
||
| if isinstance(note, NoteRatingPost): | ||
| if note.rating_max is None or not (2 <= note.rating_max <= 10): | ||
|
Member
Author
There was a problem hiding this comment. https://github.com/profcomff/modal-service-api/blob/main/modal_backend/settings.py#L11 |
||
| raise ValueError("Rating max must be between 2 and 10") | ||
| elif isinstance(note, NoteChoicePost): | ||
| if note.choice_options is None or len(note.choice_options) < 2: | ||
| raise ValueError("Choice options must contain at least 2 options") | ||
| if len({opt.id for opt in note.choice_options}) != len(note.choice_options): | ||
| raise ValueError("Choice options must have unique ids") | ||
| if not all( | ||
| opt.text for opt in note.choice_options | ||
| ): # я так понял, что текст из пробелов это тоже текст. Поправьте если нет | ||
|
Member
Author
There was a problem hiding this comment. opt.text.strip()
Member
Author
There was a problem hiding this comment. пробелы в тексте лишние убрать |
||
| raise ValueError("Choice options must have non-empty text") | ||
| elif isinstance(note, NoteImagePost): | ||
| if not note.images: | ||
| raise ValueError("Images must not be empty") | ||
| elif isinstance(note, NoteTextPost): | ||
|
Member
Author
There was a problem hiding this comment. хочется в порядке следования type_id прописать валидацию каждого объекта |
||
| if note.max_length is None or not (1 <= note.max_length <= 5000): | ||
|
Member
Author
There was a problem hiding this comment. давай для 5000 тоже сделаем как с максимальным рейтингом |
||
| raise ValueError("Max length must be between 1 and 5000") | ||
|
|
||
| @classmethod | ||
| async def get_notes_by_filters( | ||
| cls, | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
коммент можно удалить
если для меня пр коммент нужен, то его лучше оставлять прям в гитхабе, как я оставляю текущий коммент тебе