This commit is contained in:
parent
c52dcd9bf0
commit
16203eae42
20
README.md
20
README.md
|
|
@ -2,6 +2,13 @@
|
|||
|
||||
Backend ITIL/HelpDesk-системы WANITIL на Django и PostgreSQL.
|
||||
|
||||
Интерактивная документация доступна после запуска сервера по адресу
|
||||
`/api/v1/docs/`. Дополнительные руководства:
|
||||
|
||||
- [API задач](wanitil/doc/api_tasks.md);
|
||||
- [API изменений и бизнес-процессов](wanitil/doc/api_change_workflows.md);
|
||||
- [API напоминаний](wanitil/doc/api_reminders.md).
|
||||
|
||||
## Первоначальная установка
|
||||
|
||||
Инициализация разделена на независимые этапы:
|
||||
|
|
@ -153,6 +160,19 @@ docker run --name wanitilserver \
|
|||
Swagger UI доступен по адресу `/api/v1/docs/`, OpenAPI-схема —
|
||||
`/api/v1/schema/`.
|
||||
|
||||
### Поиск и фильтрация списков
|
||||
|
||||
Параметр `searchstr` выполняет общий поиск только по полям основной таблицы
|
||||
ресурса. Поля связанных моделей не включаются в общий поиск: это исключает JOIN
|
||||
по связям и размножение строк при пагинации, особенно при нескольких связях
|
||||
many-to-many.
|
||||
|
||||
Фильтрация по связанным объектам остаётся доступна через явно объявленные
|
||||
параметры endpoint, например `departments__id__exact=1`. Такой фильтр применяется
|
||||
только по явному запросу клиента. Если endpoint должен поддерживать поиск по
|
||||
связанному значению в `searchstr`, реализация должна использовать `Exists` или
|
||||
подзапрос по идентификаторам, не добавляя JOIN к основному queryset.
|
||||
|
||||
Получить состояние установки:
|
||||
|
||||
```http
|
||||
|
|
|
|||
|
|
@ -15,6 +15,10 @@
|
|||
"filter_name": "crm_type__description",
|
||||
"filter_type": "string"
|
||||
},
|
||||
{
|
||||
"filter_name": "crm_type__color",
|
||||
"filter_type": "string"
|
||||
},
|
||||
{
|
||||
"filter_name": "crm_category__id",
|
||||
"filter_type": "integer"
|
||||
|
|
@ -27,6 +31,22 @@
|
|||
"filter_name": "crm_category__description",
|
||||
"filter_type": "string"
|
||||
},
|
||||
{
|
||||
"filter_name": "crm_category__color",
|
||||
"filter_type": "string"
|
||||
},
|
||||
{
|
||||
"filter_name": "assigned__id",
|
||||
"filter_type": "integer"
|
||||
},
|
||||
{
|
||||
"filter_name": "assigned__name",
|
||||
"filter_type": "string"
|
||||
},
|
||||
{
|
||||
"filter_name": "assigned__sys_user__username",
|
||||
"filter_type": "string"
|
||||
},
|
||||
{
|
||||
"filter_name": "name",
|
||||
"filter_type": "string"
|
||||
|
|
|
|||
|
|
@ -10,5 +10,9 @@
|
|||
{
|
||||
"filter_name": "description",
|
||||
"filter_type": "string"
|
||||
},
|
||||
{
|
||||
"filter_name": "color",
|
||||
"filter_type": "string"
|
||||
}
|
||||
]
|
||||
]
|
||||
|
|
@ -10,5 +10,9 @@
|
|||
{
|
||||
"filter_name": "description",
|
||||
"filter_type": "string"
|
||||
},
|
||||
{
|
||||
"filter_name": "color",
|
||||
"filter_type": "string"
|
||||
}
|
||||
]
|
||||
]
|
||||
|
|
@ -6,9 +6,9 @@
|
|||
{"filter_name": "budget", "filter_type": "float"},
|
||||
{"filter_name": "need", "filter_type": "string"},
|
||||
{"filter_name": "comment", "filter_type": "string"},
|
||||
{"filter_name": "responsible__id", "filter_type": "integer"},
|
||||
{"filter_name": "responsible__name", "filter_type": "string"},
|
||||
{"filter_name": "responsible__sys_user__username", "filter_type": "string"},
|
||||
{"filter_name": "assigned__id", "filter_type": "integer"},
|
||||
{"filter_name": "assigned__name", "filter_type": "string"},
|
||||
{"filter_name": "assigned__sys_user__username", "filter_type": "string"},
|
||||
{"filter_name": "con_person__id", "filter_type": "integer"},
|
||||
{"filter_name": "con_person__display_name", "filter_type": "string"},
|
||||
{"filter_name": "con_contact__id", "filter_type": "integer"},
|
||||
|
|
|
|||
|
|
@ -11,10 +11,6 @@
|
|||
"filter_name": "sys_object__id",
|
||||
"filter_type": "integer"
|
||||
},
|
||||
{
|
||||
"filter_name": "sys_object__name",
|
||||
"filter_type": "string"
|
||||
},
|
||||
{
|
||||
"filter_name": "is_active",
|
||||
"filter_type": "boolean"
|
||||
|
|
|
|||
|
|
@ -23,10 +23,6 @@
|
|||
"filter_name": "rep_collection__sys_object__id",
|
||||
"filter_type": "integer"
|
||||
},
|
||||
{
|
||||
"filter_name": "rep_collection__sys_object__name",
|
||||
"filter_type": "string"
|
||||
},
|
||||
{
|
||||
"filter_name": "rep_collection__is_active",
|
||||
"filter_type": "boolean"
|
||||
|
|
|
|||
|
|
@ -15,10 +15,6 @@
|
|||
"filter_name": "sys_object__id",
|
||||
"filter_type": "integer"
|
||||
},
|
||||
{
|
||||
"filter_name": "sys_object__name",
|
||||
"filter_type": "string"
|
||||
},
|
||||
{
|
||||
"filter_name": "rel_object__id",
|
||||
"filter_type": "integer"
|
||||
|
|
|
|||
|
|
@ -11,10 +11,6 @@
|
|||
"filter_name": "sys_object__id",
|
||||
"filter_type": "integer"
|
||||
},
|
||||
{
|
||||
"filter_name": "sys_object__name",
|
||||
"filter_type": "string"
|
||||
},
|
||||
{
|
||||
"filter_name": "type",
|
||||
"filter_type": "string"
|
||||
|
|
|
|||
|
|
@ -1,10 +1,6 @@
|
|||
[
|
||||
{
|
||||
"filter_name": "id",
|
||||
"filter_type": "integer"
|
||||
},
|
||||
{
|
||||
"filter_name": "name",
|
||||
"filter_type": "string"
|
||||
},
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,10 +1,6 @@
|
|||
[
|
||||
{
|
||||
"filter_name": "id",
|
||||
"filter_type": "integer"
|
||||
},
|
||||
{
|
||||
"filter_name": "name",
|
||||
"filter_type": "string"
|
||||
},
|
||||
{
|
||||
|
|
@ -26,9 +22,5 @@
|
|||
{
|
||||
"filter_name": "sys_managment__id",
|
||||
"filter_type": "integer"
|
||||
},
|
||||
{
|
||||
"filter_name": "sys_managment__name",
|
||||
"filter_type": "string"
|
||||
}
|
||||
]
|
||||
|
|
@ -51,10 +51,6 @@
|
|||
"filter_name": "sys_employee__lang",
|
||||
"filter_type": "string"
|
||||
},
|
||||
{
|
||||
"filter_name": "sys_employee__status",
|
||||
"filter_type": "integer"
|
||||
},
|
||||
{
|
||||
"filter_name": "sys_employee__theme_is_light",
|
||||
"filter_type": "boolean"
|
||||
|
|
|
|||
|
|
@ -11,10 +11,6 @@
|
|||
"filter_name": "sys_object__id",
|
||||
"filter_type": "integer"
|
||||
},
|
||||
{
|
||||
"filter_name": "sys_object__name",
|
||||
"filter_type": "string"
|
||||
},
|
||||
{
|
||||
"filter_name": "sys_user__id",
|
||||
"filter_type": "integer"
|
||||
|
|
|
|||
21757
schema.yaml
21757
schema.yaml
File diff suppressed because it is too large
Load Diff
|
|
@ -74,13 +74,7 @@ ACTION_REQUESTS = {
|
|||
}
|
||||
|
||||
|
||||
FILE_ACTIONS = {
|
||||
"ReqRequestViewSet.addattachment",
|
||||
"ReqCommentViewSet.addattachment",
|
||||
"ReqRequestClientViewSet.addattachment",
|
||||
"IncIncidentViewSet.addattachment",
|
||||
"IncCommentViewSet.addattachment",
|
||||
}
|
||||
FILE_ACTIONS = set()
|
||||
|
||||
URL_ID_EMPTY_ACTIONS = {
|
||||
"AdrStreetViewSet.zone",
|
||||
|
|
|
|||
|
|
@ -1,11 +1 @@
|
|||
from django.contrib import admin
|
||||
|
||||
from .models.modelSys import SysClientModuleMembership
|
||||
|
||||
|
||||
@admin.register(SysClientModuleMembership)
|
||||
class SysClientModuleMembershipAdmin(admin.ModelAdmin):
|
||||
list_display = ("client", "module", "is_active", "valid_from", "valid_until")
|
||||
list_filter = ("module", "is_active")
|
||||
search_fields = ("client__name", "client__sys_user__username")
|
||||
filter_horizontal = ("profiles",)
|
||||
|
|
|
|||
|
|
@ -66,9 +66,6 @@ def add_error_contracts(result, generator, request, public):
|
|||
|
||||
|
||||
ACTION_SUMMARIES = {
|
||||
"addattachment": "Загрузить вложение",
|
||||
"getattachment": "Скачать вложение",
|
||||
"deleteattachment": "Удалить вложение",
|
||||
"addzone": "Добавить зону",
|
||||
"deletezone": "Удалить зону",
|
||||
"addcollection": "Добавить коллекцию",
|
||||
|
|
@ -116,18 +113,6 @@ ACTION_SUMMARIES = {
|
|||
|
||||
|
||||
ACTION_DESCRIPTIONS = {
|
||||
"addattachment": (
|
||||
"Загружает файл и связывает его с объектом. Операция изменяет состояние и "
|
||||
"не является идемпотентной: повторная отправка создаёт новое вложение."
|
||||
),
|
||||
"getattachment": (
|
||||
"Возвращает содержимое указанного вложения как бинарный поток. "
|
||||
"Операция не изменяет состояние."
|
||||
),
|
||||
"deleteattachment": (
|
||||
"Удаляет запись вложения и связанный файл. Повторный вызов для удалённого "
|
||||
"вложения возвращает ошибку 404."
|
||||
),
|
||||
"setparams": (
|
||||
"Обновляет переданные динамические поля конфигурационной единицы. "
|
||||
"Непереданные параметры сохраняют прежние значения."
|
||||
|
|
@ -246,6 +231,8 @@ RESOURCE_TITLES = {
|
|||
"request-types": "типы заявок",
|
||||
"services": "услуги",
|
||||
"solutions": "решения",
|
||||
"tasks": "задачи",
|
||||
"reminders": "напоминания",
|
||||
"requesthistcalcs": "расчёты SLA",
|
||||
"requesthistcalctotals": "итоговые расчёты SLA",
|
||||
"users": "пользователи",
|
||||
|
|
|
|||
|
|
@ -1,9 +1,16 @@
|
|||
from django.apps import AppConfig
|
||||
|
||||
|
||||
class WanitilConfig(AppConfig):
|
||||
class WanitilConfig(AppConfig):
|
||||
default_auto_field = 'django.db.models.BigAutoField'
|
||||
name = 'wanitil'
|
||||
name = 'wanitil'
|
||||
|
||||
def import_models(self):
|
||||
super().import_models()
|
||||
# The legacy project keeps models in domain files instead of models.py.
|
||||
# DSK is not imported by the historical signal modules, so register it
|
||||
# explicitly before migrations and test database synchronization run.
|
||||
from .models import modelDsk # noqa: F401
|
||||
# def ready(self):
|
||||
# from .init.init_data import system_all_create
|
||||
# from .models.modelSys import SysInit
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ from .models.modelSys import SysObject
|
|||
|
||||
|
||||
def get_prefix_object(objectname):
|
||||
el_prefix = SysObject.objects.filter(name=objectname).first()
|
||||
el_prefix = SysObject.objects.filter(pk=objectname).first()
|
||||
if el_prefix is None:
|
||||
return ""
|
||||
else:
|
||||
|
|
|
|||
|
|
@ -1,112 +0,0 @@
|
|||
import logging
|
||||
from pathlib import Path
|
||||
|
||||
from django.conf import settings
|
||||
from django.db import transaction
|
||||
from rest_framework import serializers
|
||||
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class AttachmentUploadSerializer(serializers.Serializer):
|
||||
files = serializers.ListField(
|
||||
child=serializers.FileField(allow_empty_file=False),
|
||||
allow_empty=False,
|
||||
)
|
||||
|
||||
def validate_files(self, files):
|
||||
max_files = getattr(settings, "ATTACHMENT_MAX_FILES", 10)
|
||||
max_size = getattr(
|
||||
settings, "ATTACHMENT_MAX_FILE_SIZE", 20 * 1024 * 1024
|
||||
)
|
||||
allowed_extensions = getattr(
|
||||
settings, "ATTACHMENT_ALLOWED_EXTENSIONS", None
|
||||
)
|
||||
blocked_extensions = set(getattr(
|
||||
settings,
|
||||
"ATTACHMENT_BLOCKED_EXTENSIONS",
|
||||
{"exe", "dll", "com", "bat", "cmd", "msi", "scr", "ps1", "js"},
|
||||
))
|
||||
|
||||
if len(files) > max_files:
|
||||
raise serializers.ValidationError(
|
||||
f"Можно загрузить не более {max_files} файлов за один запрос."
|
||||
)
|
||||
|
||||
errors = {}
|
||||
for index, uploaded_file in enumerate(files):
|
||||
extension = Path(uploaded_file.name).suffix.lower().lstrip(".")
|
||||
if uploaded_file.size > max_size:
|
||||
errors[index] = (
|
||||
f"Размер файла превышает допустимые {max_size} байт."
|
||||
)
|
||||
elif extension in blocked_extensions:
|
||||
errors[index] = "Файлы этого типа запрещены."
|
||||
elif allowed_extensions is not None and extension not in set(
|
||||
allowed_extensions
|
||||
):
|
||||
errors[index] = "Файлы этого типа не поддерживаются."
|
||||
if errors:
|
||||
raise serializers.ValidationError(errors)
|
||||
return files
|
||||
|
||||
|
||||
class AttachmentReadSerializer(serializers.Serializer):
|
||||
id = serializers.IntegerField()
|
||||
name = serializers.CharField()
|
||||
size = serializers.IntegerField(allow_null=True)
|
||||
modified_at = serializers.DateTimeField()
|
||||
download_url = serializers.URLField(required=False)
|
||||
|
||||
|
||||
class AttachmentBatchResponseSerializer(serializers.Serializer):
|
||||
attachments = AttachmentReadSerializer(many=True)
|
||||
|
||||
|
||||
def uploaded_files(request):
|
||||
"""Return every multipart file, including repeated fields named ``files``."""
|
||||
return [uploaded for _, values in request.FILES.lists() for uploaded in values]
|
||||
|
||||
|
||||
def attachment_data(attachment, download_url=None):
|
||||
data = {
|
||||
"id": attachment.id,
|
||||
"name": attachment.name,
|
||||
"size": attachment.file.size if attachment.file else None,
|
||||
"modified_at": attachment.sysdatemod,
|
||||
}
|
||||
if download_url is not None:
|
||||
data["download_url"] = download_url
|
||||
return data
|
||||
|
||||
|
||||
def create_attachments(*, model, parent_field, parent, files, user):
|
||||
created = []
|
||||
try:
|
||||
with transaction.atomic():
|
||||
for uploaded_file in files:
|
||||
attachment = model.objects.create(
|
||||
**{
|
||||
parent_field: parent,
|
||||
"name": uploaded_file.name,
|
||||
"file": uploaded_file,
|
||||
"sys_user": user,
|
||||
}
|
||||
)
|
||||
created.append(attachment)
|
||||
except Exception:
|
||||
logger.exception("Attachment batch upload failed")
|
||||
# Database rollback does not roll back writes made to file storage.
|
||||
for attachment in created:
|
||||
if attachment.file:
|
||||
attachment.file.delete(save=False)
|
||||
raise
|
||||
return created
|
||||
|
||||
|
||||
def delete_attachment(attachment):
|
||||
file_field = attachment.file
|
||||
if file_field:
|
||||
file_field.delete(save=False)
|
||||
attachment.delete()
|
||||
|
|
@ -0,0 +1,281 @@
|
|||
# API изменений и бизнес-процессов
|
||||
|
||||
Базовый префикс API: `/api/v1/main/chn/`. Для защищённых методов используется
|
||||
Knox-токен:
|
||||
|
||||
```http
|
||||
Authorization: Token <token>
|
||||
Content-Type: application/json
|
||||
```
|
||||
|
||||
Swagger доступен по `/api/v1/docs/`, OpenAPI-схема — по `/api/v1/schema/`.
|
||||
|
||||
## Жизненный цикл изменения
|
||||
|
||||
Статусы изменений являются фиксированными системными значениями и доступны
|
||||
только для чтения через `/change-statuses/`:
|
||||
|
||||
| `code` | Название |
|
||||
| --- | --- |
|
||||
| `new` | Создан |
|
||||
| `assessment` | На оценке |
|
||||
| `assessment_completed` | Оценка предоставлена |
|
||||
| `pending_approval` | На согласовании |
|
||||
| `rejected` | Отклонен |
|
||||
| `approved` | Авторизован / Запланирован |
|
||||
| `in_progress` | В работе |
|
||||
| `review` | Проверка |
|
||||
| `review_completed` | Проверка проведена |
|
||||
| `closed` | Закрыт |
|
||||
| `cancelled` | Отменен |
|
||||
|
||||
Тип изменения содержит настройки этапов:
|
||||
|
||||
```http
|
||||
PATCH /api/v1/main/chn/change-types/3/
|
||||
|
||||
{
|
||||
"requires_assessment": true,
|
||||
"requires_approval": true,
|
||||
"requires_testing": true,
|
||||
"requires_planning": true,
|
||||
"assessment_task_type": 5,
|
||||
"testing_task_type": 6,
|
||||
"approvers": [21, 22]
|
||||
}
|
||||
```
|
||||
|
||||
`assessment_task_type` обязателен при `requires_assessment=true`, а
|
||||
`testing_task_type` — при `requires_testing=true`.
|
||||
|
||||
Следующий допустимый статус рассчитывается сервером:
|
||||
|
||||
```http
|
||||
POST /api/v1/main/chn/changes/45/transition/
|
||||
{}
|
||||
```
|
||||
|
||||
Отмена разрешена из любого состояния:
|
||||
|
||||
```http
|
||||
POST /api/v1/main/chn/changes/45/transition/
|
||||
{"target": "cancelled"}
|
||||
```
|
||||
|
||||
Маршрут переходов:
|
||||
|
||||
- `new` → `assessment`, если нужна оценка, иначе к первому из обязательных
|
||||
этапов `pending_approval`, `approved`, `in_progress`;
|
||||
- `assessment` → `assessment_completed` после закрытия задачи оценки;
|
||||
- `assessment_completed` → `pending_approval`, `approved` или `in_progress`;
|
||||
- `pending_approval` → `approved` после всех согласований либо `rejected` при отказе;
|
||||
- если планирование не требуется, после согласований сразу назначается `in_progress`;
|
||||
- `approved` → `in_progress`, при входе в который запускается бизнес-процесс;
|
||||
- положительный выход процесса → `review` при обязательной проверке, иначе `closed`;
|
||||
- `review` → `review_completed` после закрытия задачи проверки;
|
||||
- `review_completed` → `closed`;
|
||||
- из любого статуса разрешён переход в `cancelled`.
|
||||
|
||||
Настройки статусов задач остаются общими и доступны через `/settings/`:
|
||||
|
||||
| Поле | Назначение |
|
||||
| --- | --- |
|
||||
| `task_status_create` | новая активированная задача |
|
||||
| `task_status_close` | успешное выполнение блока задачи |
|
||||
| `task_status_not_done` | неуспешное выполнение блока задачи |
|
||||
|
||||
## Создание изменения
|
||||
|
||||
```http
|
||||
POST /api/v1/main/chn/changes/
|
||||
|
||||
{
|
||||
"title": "Обновление серверов",
|
||||
"description": "Установить обновления безопасности",
|
||||
"change_type": 3,
|
||||
"responsible": 12
|
||||
}
|
||||
```
|
||||
|
||||
Передавать `status` не требуется: сервер назначает статус `new`. Если тип требует
|
||||
согласования, одновременно создаются персональные записи решений. Для начала
|
||||
согласования изменение переводят в `pending_approval`; после всех положительных
|
||||
решений сервер назначает `approved`.
|
||||
|
||||
`initiator` заполняется автоматически сотрудником `SysEmployee`, связанным с
|
||||
авторизованным пользователем. Поле доступно только для чтения и не изменяется
|
||||
после создания.
|
||||
|
||||
`responsible` — необязательный ID сотрудника `SysEmployee`, ответственного за
|
||||
изменение. Ответственного можно назначить при создании и заменить позже через
|
||||
`PUT` или `PATCH`.
|
||||
|
||||
`parent_change` доступно только для чтения. Для дочернего изменения, созданного
|
||||
блоком бизнес-процесса, поле содержит ID исходного изменения.
|
||||
|
||||
## Согласование
|
||||
|
||||
Текущий сотрудник получает собственную очередь:
|
||||
|
||||
```http
|
||||
GET /api/v1/main/chn/changes/pending-approval/
|
||||
```
|
||||
|
||||
Очередь содержит только изменения с ещё не принятым решением этого сотрудника.
|
||||
Для неё не требуется разрешение на редактирование всех изменений.
|
||||
|
||||
Положительное решение:
|
||||
|
||||
```http
|
||||
POST /api/v1/main/chn/changes/45/approve/
|
||||
|
||||
{
|
||||
"comment": "Риски проверены, согласовано"
|
||||
}
|
||||
```
|
||||
|
||||
Отрицательное решение:
|
||||
|
||||
```http
|
||||
POST /api/v1/main/chn/changes/45/reject/
|
||||
|
||||
{
|
||||
"comment": "Нет подтверждённой резервной копии"
|
||||
}
|
||||
```
|
||||
|
||||
Решение доступно только в статусе `pending_approval`. Повторное решение возвращает
|
||||
`409 Conflict`. После последнего положительного решения изменение получает
|
||||
`approved`. Любой отказ переводит его в `rejected`.
|
||||
|
||||
## Блоки графа
|
||||
|
||||
Шаблон графа хранится у типа изменения и не связан с конкретным экземпляром.
|
||||
Блок имеет координаты `x`, `y` и один из видов:
|
||||
|
||||
- `task` — при активации создаёт задачу;
|
||||
- `change` — при активации создаёт дочернее изменение другого типа.
|
||||
- `input` — единственный общий вход процесса;
|
||||
- `positive_output` — единственный выход успешного завершения;
|
||||
- `negative_output` — единственный выход неуспешного завершения.
|
||||
|
||||
Для каждого типа изменения допускается не более одного системного блока каждого
|
||||
вида. При создании нового типа изменения API автоматически создаёт все три
|
||||
системных блока. Их идентификаторы возвращает запрос списка блоков:
|
||||
|
||||
```http
|
||||
GET /api/v1/main/chn/workflow-nodes/?change_type=3
|
||||
```
|
||||
|
||||
Удалять системные блоки или изменять их настройки нельзя. Через `PATCH` у них
|
||||
можно менять только координаты `x` и `y`.
|
||||
|
||||
Создание блока задачи:
|
||||
|
||||
```http
|
||||
POST /api/v1/main/chn/workflow-nodes/
|
||||
|
||||
{
|
||||
"change_type": 3,
|
||||
"kind": "task",
|
||||
"title": "Проверить резервную копию",
|
||||
"description": "Убедиться, что копия создана и доступна",
|
||||
"x": 120,
|
||||
"y": 80,
|
||||
"task_type": 5,
|
||||
"priority": 2,
|
||||
"department": 4,
|
||||
"assignees": [21, 22]
|
||||
}
|
||||
```
|
||||
|
||||
Для `kind=task` обязательно поле `task_type`. Подразделение типа задачи имеет
|
||||
приоритет над `department` блока.
|
||||
|
||||
Создание блока дочернего изменения:
|
||||
|
||||
```http
|
||||
POST /api/v1/main/chn/workflow-nodes/
|
||||
|
||||
{
|
||||
"change_type": 3,
|
||||
"kind": "change",
|
||||
"title": "Обновить сетевое оборудование",
|
||||
"x": 420,
|
||||
"y": 80,
|
||||
"child_change_type": 8
|
||||
}
|
||||
```
|
||||
|
||||
Тип дочернего изменения не может совпадать с типом-владельцем блока.
|
||||
|
||||
Получение схемы типа:
|
||||
|
||||
```http
|
||||
GET /api/v1/main/chn/workflow-nodes/?change_type=3
|
||||
GET /api/v1/main/chn/workflow-edges/?change_type=3
|
||||
```
|
||||
|
||||
## Связи и ветвление
|
||||
|
||||
Связь направлена от `source` к `target`. Значение `decision` определяет выход:
|
||||
|
||||
- `always` — безусловная связь от общего входа к первым блокам;
|
||||
- `positive` — исходный блок завершён успешно;
|
||||
- `negative` — исходный блок завершён неуспешно.
|
||||
|
||||
```http
|
||||
POST /api/v1/main/chn/workflow-edges/
|
||||
|
||||
{
|
||||
"source": 10,
|
||||
"target": 11,
|
||||
"decision": "positive"
|
||||
}
|
||||
```
|
||||
|
||||
Для одного выхода можно создать несколько связей — целевые блоки запустятся
|
||||
параллельно. Один блок также может иметь несколько входящих связей. Блоки связи
|
||||
должны принадлежать одному типу изменения, связь блока с самим собой запрещена.
|
||||
Если в схеме есть блок `input`, при переходе изменения в `in_progress`
|
||||
запускаются блоки, соединённые с ним связями `always`. У входа не может быть
|
||||
входящих связей, а у терминальных выходов — исходящих. Если явного входа нет,
|
||||
для обратной совместимости запускаются блоки без входящих связей.
|
||||
|
||||
Связь `positive` с `positive_output` выставляет `closed`, либо `review`, если у
|
||||
типа включён `requires_testing`. Связь `negative` с `negative_output` выставляет
|
||||
`cancelled`. При наличии терминальных выходов процесс не завершается
|
||||
автоматически из-за отсутствия активных блоков: он должен достичь одного из них.
|
||||
|
||||
При нескольких положительных входах целевой блок ждёт успешного завершения всех
|
||||
положительных предшественников. Отрицательная ветка активируется после
|
||||
неуспешного завершения соответствующего блока.
|
||||
|
||||
## Выполнение процесса
|
||||
|
||||
Состояния созданных экземпляров блоков доступны только для чтения:
|
||||
|
||||
```http
|
||||
GET /api/v1/main/chn/workflow-runs/?change=45
|
||||
```
|
||||
|
||||
| Состояние | Значение |
|
||||
| --- | --- |
|
||||
| `pending` | экземпляр подготовлен, но ещё не активирован |
|
||||
| `active` | задача или дочернее изменение выполняется |
|
||||
| `succeeded` | блок завершён положительно |
|
||||
| `failed` | блок завершён отрицательно |
|
||||
|
||||
Поля `task` и `child_change` указывают созданный объект соответствующего блока.
|
||||
Завершение задачи определяется глобальными настройками статусов задач.
|
||||
Дочерний блок завершается положительно при статусе дочернего изменения `closed`
|
||||
и отрицательно при `rejected` или `cancelled`. После этого родительский процесс
|
||||
продолжает соответствующую ветку.
|
||||
|
||||
## Основные ответы с ошибками
|
||||
|
||||
- `400` — поля запроса или сочетание типов блоков неверны;
|
||||
- `401` — токен отсутствует или недействителен;
|
||||
- `403` — недостаточно разрешений;
|
||||
- `404` — объект не найден;
|
||||
- `409` — сотрудник уже принял решение или согласование ему не назначено.
|
||||
|
|
@ -0,0 +1,123 @@
|
|||
# API напоминаний
|
||||
|
||||
API работает с системными напоминаниями и позволяет связывать их с активностями
|
||||
CRM. Все методы требуют Knox-токен:
|
||||
|
||||
```http
|
||||
Authorization: Token <token>
|
||||
Content-Type: application/json
|
||||
```
|
||||
|
||||
Интерактивная OpenAPI-документация доступна по `/api/v1/docs/`, исходная схема —
|
||||
по `/api/v1/schema/`.
|
||||
|
||||
## Модель
|
||||
|
||||
| Поле | Тип | Запись | Описание |
|
||||
| --- | --- | --- | --- |
|
||||
| `id` | integer | нет | Идентификатор |
|
||||
| `title` | string, до 256 символов | да | Заголовок |
|
||||
| `text` | string | да | Дополнительный текст, может быть пустым |
|
||||
| `remind_at` | datetime | да | Дата и время в ISO 8601 с часовым поясом |
|
||||
| `recipient` | employee ID | да | Получатель; при создании можно не указывать текущему сотруднику |
|
||||
| `created_by` | employee ID | нет | Автор, определяется по токену |
|
||||
| `status` | enum | да | `pending`, `completed` или `cancelled`; по умолчанию `pending` |
|
||||
| `is_read` | boolean | да | Признак прочтения; по умолчанию `false` |
|
||||
| `completed_at` | datetime/null | нет | Устанавливается сервером для статуса `completed` |
|
||||
| `created_at` | datetime | нет | Время создания |
|
||||
| `updated_at` | datetime | нет | Время последнего изменения |
|
||||
|
||||
## CRUD
|
||||
|
||||
Базовый префикс: `/api/v1/main/sys/`.
|
||||
|
||||
| Метод | Путь | Назначение | Разрешение |
|
||||
| --- | --- | --- | --- |
|
||||
| `GET` | `/reminders/` | Список | `sys:reminder:view` |
|
||||
| `POST` | `/reminders/` | Создание | `sys:reminder:add` |
|
||||
| `GET` | `/reminders/{id}/` | Получение | `sys:reminder:view` |
|
||||
| `PUT`, `PATCH` | `/reminders/{id}/` | Изменение | `sys:reminder:change` |
|
||||
| `DELETE` | `/reminders/{id}/` | Удаление | `sys:reminder:delete` |
|
||||
|
||||
В таблице пути сокращены; перед ними используется базовый префикс выше.
|
||||
|
||||
Пример создания напоминания для текущего сотрудника:
|
||||
|
||||
```http
|
||||
POST /api/v1/main/sys/reminders/
|
||||
|
||||
{
|
||||
"title": "Позвонить клиенту",
|
||||
"text": "Уточнить условия договора",
|
||||
"remind_at": "2026-09-14T10:00:00+05:00"
|
||||
}
|
||||
```
|
||||
|
||||
Чтобы назначить другого сотрудника, передайте `"recipient": 42`.
|
||||
|
||||
Завершение:
|
||||
|
||||
```http
|
||||
PATCH /api/v1/main/sys/reminders/15/
|
||||
|
||||
{
|
||||
"status": "completed",
|
||||
"is_read": true
|
||||
}
|
||||
```
|
||||
|
||||
Сервер установит `completed_at`. При смене статуса с `completed` на `pending`
|
||||
или `cancelled` поле `completed_at` будет очищено.
|
||||
|
||||
## Список, поиск и фильтры
|
||||
|
||||
Ответ списка пагинирован и содержит `count`, ссылки на соседние страницы и
|
||||
`results`. Поддерживаются `page` и `page_size`.
|
||||
|
||||
`search` и `searchstr` выполняют регистронезависимый поиск по `title` и `text`:
|
||||
|
||||
```http
|
||||
GET /api/v1/main/sys/reminders/?page=1&page_size=25&searchstr=клиент
|
||||
```
|
||||
|
||||
Также доступны фильтры по `id`, `title`, `text`, `remind_at`, `recipient__id`,
|
||||
`created_by__id`, `status`, `is_read`, `completed_at`, `created_at` и
|
||||
`updated_at`. Точный перечень операций сравнения опубликован в OpenAPI-схеме.
|
||||
|
||||
Пример получения непрочитанных ожидающих напоминаний сотрудника:
|
||||
|
||||
```http
|
||||
GET /api/v1/main/sys/reminders/?recipient__id__exact=42&status__exact=pending&is_read__exact=false
|
||||
```
|
||||
|
||||
## Связь с CRM-активностью
|
||||
|
||||
Создать напоминание и привязать его к существующей активности можно одним
|
||||
атомарным запросом:
|
||||
|
||||
```http
|
||||
POST /api/v1/main/crm/activities/100/create-reminder/
|
||||
|
||||
{
|
||||
"title": "Вернуться к сделке",
|
||||
"text": "Проверить ответ клиента",
|
||||
"remind_at": "2026-09-14T15:30:00+05:00",
|
||||
"recipient": 42
|
||||
}
|
||||
```
|
||||
|
||||
В ответ возвращается созданное напоминание со статусом `201 Created`. Активность
|
||||
получает `type: "reminder"`, `reference_type: "reminder"` и `reference_id`,
|
||||
равный `id` напоминания. Если создание или обновление активности завершается
|
||||
ошибкой, вся операция откатывается.
|
||||
|
||||
Напоминание также можно связать вручную при создании или изменении активности,
|
||||
передав `type: "reminder"`, `reference_type: "reminder"` и существующий
|
||||
`reference_id`. Несуществующий идентификатор не проходит валидацию.
|
||||
|
||||
## Ошибки
|
||||
|
||||
- `400` — тело запроса или значения полей некорректны;
|
||||
- `401` — токен отсутствует, неверен или истёк;
|
||||
- `403` — отсутствует необходимое разрешение;
|
||||
- `404` — напоминание или CRM-активность не найдены.
|
||||
|
|
@ -0,0 +1,174 @@
|
|||
# API задач
|
||||
|
||||
API управляет задачами модуля изменений и позволяет создавать задачу из
|
||||
CRM-активности. Тип задачи и плановые даты не обязательны, если назначение задано
|
||||
исполнителями или подразделением. Для защищённых методов используется Knox-токен:
|
||||
|
||||
```http
|
||||
Authorization: Token <token>
|
||||
Content-Type: application/json
|
||||
```
|
||||
|
||||
Swagger доступен по `/api/v1/docs/`, исходная OpenAPI-схема — по
|
||||
`/api/v1/schema/`.
|
||||
|
||||
## Поля задачи
|
||||
|
||||
| Поле | Тип | Создание | Описание |
|
||||
| --- | --- | --- | --- |
|
||||
| `id` | integer | нет | Идентификатор |
|
||||
| `title` | string, до 256 символов | обязательно | Заголовок |
|
||||
| `description` | string | необязательно | Описание |
|
||||
| `result` | string | необязательно | Результат выполнения |
|
||||
| `task_type` | task type ID/null | необязательно | Тип задачи; может определять подразделение |
|
||||
| `status` | task status ID | нет | При создании автоматически назначается `new`; при изменении действуют правила переходов |
|
||||
| `priority` | task priority ID/null | необязательно | Приоритет; может отсутствовать |
|
||||
| `category` | task category ID/null | необязательно | Категория |
|
||||
| `change` | change ID/null | необязательно | Связанное изменение |
|
||||
| `parent_change` | change ID/null | нет | Изменение, автоматически породившее задачу |
|
||||
| `department` | department ID/null | условно | Подразделение-исполнитель |
|
||||
| `assignees` | employee ID[] | условно | Несколько исполнителей |
|
||||
| `assignee` | employee ID/null | устаревшее | Совместимый одиночный исполнитель; нельзя передавать вместе с `assignees` |
|
||||
| `initiator` | employee ID | обязательно | Инициатор; в CRM-сценарии определяется сервером |
|
||||
| `planned_start_at` | datetime/null | необязательно | Плановое начало в ISO 8601 |
|
||||
| `planned_finish_at` | datetime/null | необязательно | Плановое завершение в ISO 8601 |
|
||||
| `actual_start_at` | datetime/null | необязательно | Фактическое начало |
|
||||
| `actual_finish_at` | datetime/null | необязательно | Фактическое завершение |
|
||||
| `progress` | integer 0–100 | необязательно | Прогресс, по умолчанию `0` |
|
||||
| `process_state` | enum | нет | `active`, `pending`, `completed` или `not_done` |
|
||||
| `external_id` | string, до 64 символов | необязательно | Внешний идентификатор |
|
||||
| `created_at`, `updated_at` | datetime | нет | Системные даты |
|
||||
|
||||
Плановое и фактическое завершение не может быть раньше соответствующего начала.
|
||||
|
||||
## CRUD
|
||||
|
||||
Базовый префикс: `/api/v1/main/chn/`.
|
||||
|
||||
| Метод | Путь | Назначение | Разрешение |
|
||||
| --- | --- | --- | --- |
|
||||
| `GET` | `/tasks/` | Список | `chn:task:view` |
|
||||
| `POST` | `/tasks/` | Создание | `chn:task:add` |
|
||||
| `GET` | `/tasks/{id}/` | Получение | `chn:task:view` |
|
||||
| `PUT`, `PATCH` | `/tasks/{id}/` | Изменение | `chn:task:change` |
|
||||
| `DELETE` | `/tasks/{id}/` | Удаление | `chn:task:delete` |
|
||||
|
||||
## Статусы и переходы
|
||||
|
||||
Справочник `/task-statuses/` фиксирован и доступен только для чтения:
|
||||
|
||||
- `new` — новое;
|
||||
- `in_progress` — в работе;
|
||||
- `pending` — ожидание;
|
||||
- `resolved` — решено;
|
||||
- `closed` — закрыто;
|
||||
- `cancelled` — отменено.
|
||||
|
||||
Исполнитель задачи или сотрудник назначенного подразделения может выполнить
|
||||
переходы `new → in_progress`, `in_progress → pending`, `pending → in_progress`
|
||||
и `in_progress → resolved`.
|
||||
|
||||
Только инициатор задачи может выполнить `resolved → closed` и переход из любого
|
||||
статуса в `cancelled`.
|
||||
|
||||
## Выбор исполнителя
|
||||
|
||||
При создании поддерживаются три варианта:
|
||||
|
||||
Подразделение определяется в следующем порядке:
|
||||
|
||||
1. Подразделение, настроенное у переданного `task_type`.
|
||||
2. Поле `department`, переданное непосредственно в запросе.
|
||||
3. Если подразделение не определено, задача может быть назначена через
|
||||
`assignees`, когда `task_type` не передан.
|
||||
|
||||
Если у переданного типа есть подразделение, оно имеет приоритет даже при наличии
|
||||
другого `department` в запросе. Если у типа подразделение не настроено, API
|
||||
использует явно переданный `department`. Если оба значения отсутствуют, запрос
|
||||
отклоняется с ошибкой поля `task_type`.
|
||||
|
||||
При создании хотя бы одно из полей `task_type`, `department` или `assignees`
|
||||
должно быть непустым.
|
||||
Если одновременно переданы исполнители и подразделение, все исполнители должны
|
||||
состоять в выбранном подразделении.
|
||||
|
||||
### Несколько исполнителей без приоритета
|
||||
|
||||
```http
|
||||
POST /api/v1/main/chn/tasks/
|
||||
|
||||
{
|
||||
"title": "Подготовить рабочие места",
|
||||
"assignees": [42, 43],
|
||||
"initiator": 7
|
||||
}
|
||||
```
|
||||
|
||||
`priority` не передан, поэтому в ответе он будет равен `null`.
|
||||
|
||||
### Явное подразделение
|
||||
|
||||
```json
|
||||
{
|
||||
"title": "Проверить оборудование",
|
||||
"task_type": 3,
|
||||
"department": 5,
|
||||
"initiator": 7,
|
||||
"planned_start_at": "2026-09-14T09:00:00+05:00",
|
||||
"planned_finish_at": "2026-09-15T18:00:00+05:00"
|
||||
}
|
||||
```
|
||||
|
||||
### Подразделение из типа задачи
|
||||
|
||||
Передайте `task_type`, но не передавайте `assignees` и `department`. У выбранного
|
||||
типа задачи должно быть заполнено поле `department`.
|
||||
|
||||
## Список и фильтры
|
||||
|
||||
Список поддерживает `page`, `page_size`, а также `search` и `searchstr` по
|
||||
`title`, `description` и `external_id`:
|
||||
|
||||
```http
|
||||
GET /api/v1/main/chn/tasks/?page=1&page_size=25&searchstr=рабочее
|
||||
```
|
||||
|
||||
Основные точные фильтры:
|
||||
|
||||
- `task_type__id__exact`;
|
||||
- `status__id__exact`;
|
||||
- `priority__id__exact` и `priority__id__isnull`;
|
||||
- `department__id__exact`;
|
||||
- `assignees__id__exact`;
|
||||
- `assignee__id` — совместимый псевдоним для одного исполнителя;
|
||||
- `initiator__id__exact`, `change__id__exact`, `process_state__exact`.
|
||||
|
||||
Для дат, прогресса и идентификаторов доступны дополнительные операции сравнения;
|
||||
полный перечень публикуется в OpenAPI query-параметрах. Результат упорядочен по
|
||||
плановому завершению, затем по весу приоритета и `id`.
|
||||
|
||||
## Создание задачи из CRM
|
||||
|
||||
```http
|
||||
POST /api/v1/main/crm/activities/100/create-task/
|
||||
|
||||
{
|
||||
"title": "Связаться с клиентом",
|
||||
"task_type": 3,
|
||||
"assignees": [42, 43],
|
||||
"planned_start_at": "2026-09-14T09:00:00+05:00",
|
||||
"planned_finish_at": "2026-09-15T18:00:00+05:00"
|
||||
}
|
||||
```
|
||||
|
||||
Инициатором становится текущий сотрудник. В ответ возвращается задача со
|
||||
статусом `201 Created`, а CRM-активность получает `type: "task"`,
|
||||
`reference_type: "task"` и `reference_id`, равный идентификатору задачи.
|
||||
Операция атомарна: при ошибке создания или привязки изменения откатываются.
|
||||
|
||||
## Ошибки
|
||||
|
||||
- `400` — неверные поля, даты, назначение или исполнитель из другого подразделения;
|
||||
- `401` — токен отсутствует, неверен или истёк;
|
||||
- `403` — отсутствует необходимое разрешение;
|
||||
- `404` — задача или CRM-активность не найдены.
|
||||
|
|
@ -1,65 +1,410 @@
|
|||
"""Transactional state-changing use cases for the CHN domain."""
|
||||
"""Transactional state-changing use cases for changes and their workflows."""
|
||||
|
||||
from django.db import transaction
|
||||
from django.utils import timezone
|
||||
|
||||
from ...models.modelChn import ChnSettings, Task, TaskTransition
|
||||
from ...models.modelChn import (
|
||||
Change, ChangeApproval, ChangeStatus, ChnSettings, Task, TaskStatus,
|
||||
TaskTransition, WorkflowEdge, WorkflowNode, WorkflowRun,
|
||||
)
|
||||
from ..sys.tags import copy_business_context
|
||||
|
||||
|
||||
def _status_id(code):
|
||||
return ChangeStatus.objects.only("id").get(code=code).id
|
||||
|
||||
|
||||
def _set_status(change, code):
|
||||
status_id = _status_id(code)
|
||||
Change.objects.filter(pk=change.pk).update(status_id=status_id)
|
||||
change.status_id = status_id
|
||||
|
||||
|
||||
def _next_pre_work_status(change_type):
|
||||
if change_type.requires_approval:
|
||||
return ChangeStatus.Code.PENDING_APPROVAL
|
||||
if change_type.requires_planning:
|
||||
return ChangeStatus.Code.APPROVED
|
||||
return ChangeStatus.Code.IN_PROGRESS
|
||||
|
||||
|
||||
def _ensure_stage_task(change):
|
||||
if not change.status_id:
|
||||
return
|
||||
stage_config = {
|
||||
ChangeStatus.Code.ASSESSMENT: (
|
||||
Task.ChangeStage.ASSESSMENT, change.change_type.assessment_task_type,
|
||||
"Провести оценку изменения",
|
||||
),
|
||||
ChangeStatus.Code.REVIEW: (
|
||||
Task.ChangeStage.TESTING, change.change_type.testing_task_type,
|
||||
"Провести проверку изменения",
|
||||
),
|
||||
}
|
||||
config = stage_config.get(change.status.code)
|
||||
settings = ChnSettings.objects.filter(pk=1).first()
|
||||
if not config or not config[1] or not settings or not settings.task_status_create_id:
|
||||
return
|
||||
stage, task_type, title = config
|
||||
task, _ = Task.objects.get_or_create(
|
||||
change=change, change_stage=stage,
|
||||
defaults={
|
||||
"title": title, "task_type": task_type,
|
||||
"status_id": settings.task_status_create_id,
|
||||
"department": task_type.department, "initiator": change.initiator,
|
||||
"parent_change": change,
|
||||
"process_state": Task.ProcessState.ACTIVE,
|
||||
},
|
||||
)
|
||||
if task.parent_change_id != change.id:
|
||||
task.parent_change = change
|
||||
task.save(update_fields=("parent_change",))
|
||||
copy_business_context(change, task, user=change.initiator.sys_user)
|
||||
|
||||
|
||||
@transaction.atomic
|
||||
def advance_change_status(change, target_code=None):
|
||||
"""Move a change through the fixed lifecycle and run entry side effects."""
|
||||
change = Change.objects.select_for_update(of=("self",)).select_related(
|
||||
"status", "change_type__assessment_task_type", "change_type__testing_task_type",
|
||||
).get(pk=change.pk)
|
||||
if target_code == ChangeStatus.Code.CANCELLED:
|
||||
next_code = ChangeStatus.Code.CANCELLED
|
||||
else:
|
||||
routes = {
|
||||
ChangeStatus.Code.NEW: (
|
||||
ChangeStatus.Code.ASSESSMENT
|
||||
if change.change_type.requires_assessment
|
||||
else _next_pre_work_status(change.change_type)
|
||||
),
|
||||
ChangeStatus.Code.ASSESSMENT: ChangeStatus.Code.ASSESSMENT_COMPLETED,
|
||||
ChangeStatus.Code.ASSESSMENT_COMPLETED: _next_pre_work_status(change.change_type),
|
||||
ChangeStatus.Code.APPROVED: ChangeStatus.Code.IN_PROGRESS,
|
||||
ChangeStatus.Code.REVIEW: ChangeStatus.Code.REVIEW_COMPLETED,
|
||||
ChangeStatus.Code.REVIEW_COMPLETED: ChangeStatus.Code.CLOSED,
|
||||
}
|
||||
next_code = routes.get(change.status.code)
|
||||
if target_code and target_code != next_code:
|
||||
raise ValueError("Недопустимый переход статуса.")
|
||||
if next_code is None:
|
||||
raise ValueError("Для текущего статуса нет автоматического перехода.")
|
||||
_set_status(change, next_code)
|
||||
change.status = ChangeStatus.objects.get(pk=change.status_id)
|
||||
handle_change_status(change)
|
||||
return change
|
||||
|
||||
|
||||
@transaction.atomic
|
||||
def initialize_change(change):
|
||||
"""Set the initial fixed status and prepare required approvals."""
|
||||
change_type = change.change_type
|
||||
approvers = list(change_type.approvers.all()) if change_type.requires_approval else []
|
||||
if change_type.requires_approval:
|
||||
ChangeApproval.objects.bulk_create([
|
||||
ChangeApproval(change=change, employee=employee) for employee in approvers
|
||||
], ignore_conflicts=True)
|
||||
status_id = _status_id(ChangeStatus.Code.NEW)
|
||||
if status_id and change.status_id != status_id:
|
||||
Change.objects.filter(pk=change.pk).update(status_id=status_id)
|
||||
change.status_id = status_id
|
||||
|
||||
|
||||
@transaction.atomic
|
||||
def decide_approval(approval, decision, comment=""):
|
||||
"""Record one employee decision and advance/reject the change."""
|
||||
Change.objects.select_for_update().get(pk=approval.change_id)
|
||||
approval = ChangeApproval.objects.select_for_update().select_related(
|
||||
"change__change_type",
|
||||
).get(pk=approval.pk)
|
||||
if approval.decision != ChangeApproval.Decision.PENDING:
|
||||
return approval
|
||||
approval.decision = decision
|
||||
approval.comment = comment
|
||||
approval.decided_at = timezone.now()
|
||||
approval.save(update_fields=("decision", "comment", "decided_at"))
|
||||
change = approval.change
|
||||
change_type = change.change_type
|
||||
if decision == ChangeApproval.Decision.REJECTED:
|
||||
status_id = _status_id(ChangeStatus.Code.REJECTED)
|
||||
Change.objects.filter(pk=change.pk).update(status_id=status_id)
|
||||
change.status_id = status_id
|
||||
return approval
|
||||
pending = change.approvals.filter(decision=ChangeApproval.Decision.PENDING).exists()
|
||||
if not pending:
|
||||
next_code = (
|
||||
ChangeStatus.Code.APPROVED
|
||||
if change_type.requires_planning else ChangeStatus.Code.IN_PROGRESS
|
||||
)
|
||||
_set_status(change, next_code)
|
||||
change.status = ChangeStatus.objects.get(pk=change.status_id)
|
||||
handle_change_status(change)
|
||||
return approval
|
||||
|
||||
|
||||
@transaction.atomic
|
||||
def start_change_process_if_needed(change):
|
||||
"""Instantiate root blocks once the change reaches its configured work status."""
|
||||
if change.status_id != _status_id(ChangeStatus.Code.IN_PROGRESS):
|
||||
return
|
||||
process_input = change.change_type.workflow_nodes.filter(
|
||||
kind=WorkflowNode.Kind.INPUT,
|
||||
).first()
|
||||
if process_input:
|
||||
nodes = WorkflowNode.objects.filter(
|
||||
incoming_edges__source=process_input,
|
||||
incoming_edges__decision=WorkflowEdge.Decision.ALWAYS,
|
||||
).distinct()
|
||||
else:
|
||||
# Compatibility with diagrams created before explicit process ports existed.
|
||||
nodes = change.change_type.workflow_nodes.filter(
|
||||
incoming_edges__isnull=True,
|
||||
).exclude(kind__in=(
|
||||
WorkflowNode.Kind.POSITIVE_OUTPUT, WorkflowNode.Kind.NEGATIVE_OUTPUT,
|
||||
)).distinct()
|
||||
for node in nodes:
|
||||
_activate_node(change, node, context_sources=(change,))
|
||||
_finish_empty_process(change)
|
||||
|
||||
|
||||
def _activate_node(change, node, context_sources=None):
|
||||
if node.kind == WorkflowNode.Kind.POSITIVE_OUTPUT:
|
||||
_set_change_result(change, True)
|
||||
return None
|
||||
if node.kind == WorkflowNode.Kind.NEGATIVE_OUTPUT:
|
||||
_set_change_result(change, False)
|
||||
return None
|
||||
if node.kind == WorkflowNode.Kind.INPUT:
|
||||
return None
|
||||
run, created = WorkflowRun.objects.get_or_create(change=change, node=node)
|
||||
if not created or run.state != WorkflowRun.State.PENDING:
|
||||
return run
|
||||
settings = ChnSettings.objects.filter(pk=1).first()
|
||||
sources = tuple(context_sources or (change,))
|
||||
if node.kind == WorkflowNode.Kind.TASK:
|
||||
if not settings or not settings.task_status_create_id:
|
||||
return run
|
||||
department = node.task_type.department or node.department
|
||||
task = Task.objects.create(
|
||||
title=node.title, description=node.description, task_type=node.task_type,
|
||||
status_id=settings.task_status_create_id, priority=node.priority,
|
||||
change=change, parent_change=change, department=department,
|
||||
initiator=change.initiator,
|
||||
process_state=Task.ProcessState.ACTIVE,
|
||||
)
|
||||
task.assignees.set(node.assignees.all())
|
||||
for source in sources:
|
||||
copy_business_context(source, task, user=change.initiator.sys_user)
|
||||
run.task = task
|
||||
else:
|
||||
child = Change.objects.create(
|
||||
title=node.title, description=node.description,
|
||||
change_type=node.child_change_type, initiator=change.initiator,
|
||||
parent_change=change,
|
||||
)
|
||||
for source in sources:
|
||||
copy_business_context(source, child, user=change.initiator.sys_user)
|
||||
run.child_change = child
|
||||
run.state = WorkflowRun.State.ACTIVE
|
||||
run.save(update_fields=("task", "child_change", "state"))
|
||||
if run.child_change_id:
|
||||
initialize_change(run.child_change)
|
||||
return run
|
||||
|
||||
|
||||
def _advance_run(run, succeeded):
|
||||
run.state = WorkflowRun.State.SUCCEEDED if succeeded else WorkflowRun.State.FAILED
|
||||
run.save(update_fields=("state",))
|
||||
decision = WorkflowEdge.Decision.POSITIVE if succeeded else WorkflowEdge.Decision.NEGATIVE
|
||||
for edge in run.node.outgoing_edges.filter(decision=decision).select_related("target"):
|
||||
target = edge.target
|
||||
if decision == WorkflowEdge.Decision.POSITIVE:
|
||||
required_node_ids = WorkflowEdge.objects.filter(
|
||||
target=target, decision=WorkflowEdge.Decision.POSITIVE,
|
||||
).values_list("source_id", flat=True)
|
||||
completed_node_ids = WorkflowRun.objects.filter(
|
||||
change=run.change, node_id__in=required_node_ids,
|
||||
state=WorkflowRun.State.SUCCEEDED,
|
||||
).values_list("node_id", flat=True)
|
||||
if set(required_node_ids) - set(completed_node_ids):
|
||||
continue
|
||||
predecessor_runs = WorkflowRun.objects.filter(
|
||||
change=run.change,
|
||||
node__outgoing_edges__target=target,
|
||||
state=(
|
||||
WorkflowRun.State.SUCCEEDED
|
||||
if succeeded else WorkflowRun.State.FAILED
|
||||
),
|
||||
).select_related("task", "child_change").order_by("id")
|
||||
context_sources = [
|
||||
predecessor.task or predecessor.child_change
|
||||
for predecessor in predecessor_runs
|
||||
if predecessor.task_id or predecessor.child_change_id
|
||||
]
|
||||
_activate_node(run.change, target, context_sources=context_sources)
|
||||
_finish_process_if_terminal(run.change, failed=not succeeded)
|
||||
|
||||
|
||||
def _finish_empty_process(change):
|
||||
if not change.change_type.workflow_nodes.exists():
|
||||
_set_change_result(change, True)
|
||||
|
||||
|
||||
def _finish_process_if_terminal(change, failed=False):
|
||||
if change.change_type.workflow_nodes.filter(kind__in=(
|
||||
WorkflowNode.Kind.POSITIVE_OUTPUT, WorkflowNode.Kind.NEGATIVE_OUTPUT,
|
||||
)).exists():
|
||||
# An explicit output, rather than the absence of active blocks, completes it.
|
||||
return
|
||||
if change.workflow_runs.filter(state=WorkflowRun.State.ACTIVE).exists():
|
||||
return
|
||||
if failed:
|
||||
failed_with_branch = change.workflow_runs.filter(
|
||||
state=WorkflowRun.State.FAILED,
|
||||
node__outgoing_edges__decision=WorkflowEdge.Decision.NEGATIVE,
|
||||
).exists()
|
||||
if failed_with_branch:
|
||||
return
|
||||
_set_change_result(change, not failed)
|
||||
|
||||
|
||||
def _set_change_result(change, succeeded):
|
||||
change_type = change.change_type
|
||||
if succeeded:
|
||||
code = ChangeStatus.Code.REVIEW if change_type.requires_testing else ChangeStatus.Code.CLOSED
|
||||
else:
|
||||
code = ChangeStatus.Code.CANCELLED
|
||||
status_id = _status_id(code)
|
||||
Change.objects.filter(pk=change.pk).update(status_id=status_id)
|
||||
change.status_id = status_id
|
||||
change.status = ChangeStatus.objects.get(pk=status_id)
|
||||
_ensure_stage_task(change)
|
||||
parent_run = WorkflowRun.objects.filter(child_change=change).first()
|
||||
if parent_run:
|
||||
_advance_run(parent_run, succeeded)
|
||||
|
||||
|
||||
@transaction.atomic
|
||||
def handle_change_status(change):
|
||||
"""React when an API update moves a change into the work or terminal status."""
|
||||
if not hasattr(change, "status") or change.status_id != getattr(change.status, "id", None):
|
||||
change.status = ChangeStatus.objects.get(pk=change.status_id)
|
||||
_ensure_stage_task(change)
|
||||
start_change_process_if_needed(change)
|
||||
if change.status_id == _status_id(ChangeStatus.Code.CLOSED):
|
||||
parent_run = WorkflowRun.objects.filter(child_change=change).first()
|
||||
if parent_run and parent_run.state == WorkflowRun.State.ACTIVE:
|
||||
_advance_run(parent_run, True)
|
||||
elif change.status_id in (
|
||||
_status_id(ChangeStatus.Code.REJECTED),
|
||||
_status_id(ChangeStatus.Code.CANCELLED),
|
||||
):
|
||||
parent_run = WorkflowRun.objects.filter(child_change=change).first()
|
||||
if parent_run and parent_run.state == WorkflowRun.State.ACTIVE:
|
||||
_advance_run(parent_run, False)
|
||||
|
||||
|
||||
def _resume_waiting_parent_if_children_closed(task):
|
||||
"""Resume a waiting parent after all child work reaches a terminal status."""
|
||||
terminal_task_status_ids = set(TaskStatus.objects.filter(code__in=(
|
||||
TaskStatus.Code.CLOSED, TaskStatus.Code.CANCELLED,
|
||||
)).values_list("id", flat=True))
|
||||
settings = ChnSettings.objects.filter(pk=1).only(
|
||||
"task_status_not_done_id",
|
||||
).first()
|
||||
if settings and settings.task_status_not_done_id:
|
||||
terminal_task_status_ids.add(settings.task_status_not_done_id)
|
||||
if task.status_id not in terminal_task_status_ids:
|
||||
return
|
||||
|
||||
if task.parent_task_id:
|
||||
parent_task = Task.objects.select_for_update().select_related("status").get(
|
||||
pk=task.parent_task_id,
|
||||
)
|
||||
has_open_children = parent_task.child_tasks.exclude(
|
||||
status_id__in=terminal_task_status_ids,
|
||||
).exists()
|
||||
if (
|
||||
parent_task.status_id
|
||||
and parent_task.status.code == TaskStatus.Code.PENDING
|
||||
and not has_open_children
|
||||
):
|
||||
in_progress_id = TaskStatus.objects.only("id").get(
|
||||
code=TaskStatus.Code.IN_PROGRESS,
|
||||
).id
|
||||
Task.objects.filter(pk=parent_task.pk).update(status_id=in_progress_id)
|
||||
|
||||
if task.parent_change_id:
|
||||
parent_change = Change.objects.select_for_update().select_related(
|
||||
"status", "change_type",
|
||||
).get(pk=task.parent_change_id)
|
||||
has_open_tasks = parent_change.child_tasks.exclude(
|
||||
status_id__in=terminal_task_status_ids,
|
||||
).exists()
|
||||
has_open_changes = parent_change.child_changes.exclude(
|
||||
status__code__in=(
|
||||
ChangeStatus.Code.CLOSED,
|
||||
ChangeStatus.Code.CANCELLED,
|
||||
ChangeStatus.Code.REJECTED,
|
||||
),
|
||||
).exists()
|
||||
if (
|
||||
parent_change.status_id
|
||||
and parent_change.status.code == ChangeStatus.Code.PENDING
|
||||
and not has_open_tasks
|
||||
and not has_open_changes
|
||||
):
|
||||
_set_status(parent_change, ChangeStatus.Code.IN_PROGRESS)
|
||||
|
||||
|
||||
@transaction.atomic
|
||||
def advance_change_process(task):
|
||||
"""Advance tasks connected to ``task`` according to configured terminal statuses."""
|
||||
"""Advance a template workflow; retain support for legacy task transitions."""
|
||||
_resume_waiting_parent_if_children_closed(task)
|
||||
if task.change_id is None:
|
||||
return
|
||||
settings = ChnSettings.objects.filter(pk=1).first()
|
||||
if settings is None:
|
||||
return
|
||||
|
||||
condition = None
|
||||
state = None
|
||||
if settings.task_status_close_id == task.status_id:
|
||||
condition = TaskTransition.Condition.SUCCESS
|
||||
state = Task.ProcessState.COMPLETED
|
||||
elif settings.task_status_not_done_id == task.status_id:
|
||||
condition = TaskTransition.Condition.NOT_DONE
|
||||
state = Task.ProcessState.NOT_DONE
|
||||
if condition is None:
|
||||
succeeded = settings.task_status_close_id == task.status_id
|
||||
failed = settings.task_status_not_done_id == task.status_id
|
||||
if not succeeded and not failed:
|
||||
return
|
||||
|
||||
state = Task.ProcessState.COMPLETED if succeeded else Task.ProcessState.NOT_DONE
|
||||
if task.process_state != state:
|
||||
Task.objects.filter(pk=task.pk).update(process_state=state)
|
||||
task.process_state = state
|
||||
if task.change_stage:
|
||||
if succeeded:
|
||||
advance_change_status(task.change)
|
||||
return
|
||||
run = WorkflowRun.objects.filter(task=task).first()
|
||||
if run:
|
||||
_advance_run(run, succeeded)
|
||||
return
|
||||
# Explicit child tasks only unblock their waiting parent. They are not
|
||||
# terminal nodes of the legacy change transition graph.
|
||||
if task.parent_change_id:
|
||||
return
|
||||
|
||||
condition = TaskTransition.Condition.SUCCESS if succeeded else TaskTransition.Condition.NOT_DONE
|
||||
transitions = TaskTransition.objects.filter(
|
||||
change_id=task.change_id, from_task=task, condition=condition,
|
||||
).select_related("to_task")
|
||||
for transition in transitions:
|
||||
target = transition.to_task
|
||||
can_activate = condition == TaskTransition.Condition.NOT_DONE
|
||||
if condition == TaskTransition.Condition.SUCCESS:
|
||||
required = TaskTransition.objects.filter(
|
||||
change_id=task.change_id,
|
||||
to_task=target,
|
||||
can_activate = failed
|
||||
if succeeded:
|
||||
can_activate = not TaskTransition.objects.filter(
|
||||
change_id=task.change_id, to_task=target,
|
||||
condition=TaskTransition.Condition.SUCCESS,
|
||||
).exclude(from_task__process_state=Task.ProcessState.COMPLETED)
|
||||
can_activate = not required.exists()
|
||||
).exclude(from_task__process_state=Task.ProcessState.COMPLETED).exists()
|
||||
if can_activate:
|
||||
copy_business_context(task, target, user=task.initiator.sys_user)
|
||||
Task.objects.filter(pk=target.pk).update(
|
||||
process_state=Task.ProcessState.ACTIVE,
|
||||
status_id=settings.task_status_create_id,
|
||||
)
|
||||
|
||||
active_exists = Task.objects.filter(
|
||||
change_id=task.change_id, process_state=Task.ProcessState.ACTIVE,
|
||||
).exists()
|
||||
is_success_terminal = (
|
||||
condition == TaskTransition.Condition.SUCCESS
|
||||
and not TaskTransition.objects.filter(
|
||||
change_id=task.change_id,
|
||||
from_task=task,
|
||||
condition=TaskTransition.Condition.SUCCESS,
|
||||
).exists()
|
||||
)
|
||||
if is_success_terminal and not active_exists and settings.change_status_on_check_id:
|
||||
task.change.__class__.objects.filter(pk=task.change_id).update(
|
||||
status_id=settings.change_status_on_check_id,
|
||||
if succeeded and not transitions.exists():
|
||||
Change.objects.filter(pk=task.change_id).update(
|
||||
status_id=_status_id(ChangeStatus.Code.REVIEW),
|
||||
)
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
"""Private disk domain."""
|
||||
|
|
@ -0,0 +1,57 @@
|
|||
from django.db.models import Q
|
||||
|
||||
from wanitil.models.modelDsk import DskAccessLevel, DskFile
|
||||
|
||||
|
||||
ACCESS_RANK = {
|
||||
DskAccessLevel.READ: 1,
|
||||
DskAccessLevel.EDIT: 2,
|
||||
DskAccessLevel.MANAGE: 3,
|
||||
}
|
||||
|
||||
|
||||
def accessible_files(user):
|
||||
if not user or not user.is_authenticated:
|
||||
return DskFile.objects.none()
|
||||
if user.is_superuser:
|
||||
return DskFile.objects.all()
|
||||
|
||||
query = Q()
|
||||
employee = getattr(user, "sys_employee", None)
|
||||
client = getattr(user, "crm_client", None)
|
||||
if employee is not None and employee.is_active:
|
||||
query |= Q(employee_accesses__employee=employee)
|
||||
if client is not None:
|
||||
query |= Q(client_accesses__client=client)
|
||||
if not query:
|
||||
return DskFile.objects.none()
|
||||
return DskFile.objects.filter(query).distinct()
|
||||
|
||||
|
||||
def user_access_level(user, dsk_file):
|
||||
if not user or not user.is_authenticated:
|
||||
return None
|
||||
if user.is_superuser:
|
||||
return DskAccessLevel.MANAGE
|
||||
|
||||
levels = []
|
||||
employee = getattr(user, "sys_employee", None)
|
||||
client = getattr(user, "crm_client", None)
|
||||
if employee is not None and employee.is_active:
|
||||
value = dsk_file.employee_accesses.filter(
|
||||
employee=employee,
|
||||
).values_list("access_level", flat=True).first()
|
||||
if value:
|
||||
levels.append(value)
|
||||
if client is not None:
|
||||
value = dsk_file.client_accesses.filter(
|
||||
client=client,
|
||||
).values_list("access_level", flat=True).first()
|
||||
if value:
|
||||
levels.append(value)
|
||||
return max(levels, key=ACCESS_RANK.get) if levels else None
|
||||
|
||||
|
||||
def user_can(user, dsk_file, required_level):
|
||||
actual = user_access_level(user, dsk_file)
|
||||
return actual is not None and ACCESS_RANK[actual] >= ACCESS_RANK[required_level]
|
||||
|
|
@ -0,0 +1,149 @@
|
|||
import hashlib
|
||||
|
||||
from django.conf import settings
|
||||
from django.apps import apps
|
||||
from django.contrib.contenttypes.models import ContentType
|
||||
from django.core.exceptions import ObjectDoesNotExist
|
||||
from django.db import transaction
|
||||
from rest_framework.exceptions import ValidationError
|
||||
|
||||
from wanitil.models.modelDsk import (
|
||||
DskAccessLevel,
|
||||
DskAttachment,
|
||||
DskFile,
|
||||
DskFileClientAccess,
|
||||
DskFileEmployeeAccess,
|
||||
)
|
||||
|
||||
|
||||
DEFAULT_TARGETS = {
|
||||
"adr.country": "wanitil.AdrCountry",
|
||||
"adr.region": "wanitil.AdrRegion",
|
||||
"adr.area": "wanitil.AdrArea",
|
||||
"adr.town-type": "wanitil.AdrTownType",
|
||||
"adr.town": "wanitil.AdrTown",
|
||||
"adr.street-type": "wanitil.AdrStreetType",
|
||||
"adr.street": "wanitil.AdrStreet",
|
||||
"adr.house-type": "wanitil.AdrHouseType",
|
||||
"adr.house": "wanitil.AdrHouse",
|
||||
"adr.zone-type": "wanitil.AdrZoneType",
|
||||
"adr.zone": "wanitil.AdrZone",
|
||||
"req.request": "wanitil.ReqRequest",
|
||||
"inc.incident": "wanitil.IncIncident",
|
||||
"cim.ci": "wanitil.CimCi",
|
||||
"dev.manufacturer": "wanitil.DevManufacturer",
|
||||
"dev.model": "wanitil.DevModel",
|
||||
"dev.software-version": "wanitil.DevSoftwareVersion",
|
||||
"dev.hardware-version": "wanitil.DevHardwareVersion",
|
||||
"srv.service": "wanitil.SrvService",
|
||||
"crm.client": "wanitil.CrmClient",
|
||||
"crm.lead": "wanitil.CrmLead",
|
||||
"crm.contract": "wanitil.CrmContract",
|
||||
"chn.task": "wanitil.Task",
|
||||
"chn.change": "wanitil.Change",
|
||||
}
|
||||
|
||||
|
||||
def target_registry():
|
||||
configured = getattr(settings, "DSK_ATTACHMENT_TARGETS", DEFAULT_TARGETS)
|
||||
return dict(configured)
|
||||
|
||||
|
||||
def resolve_target(label, object_id):
|
||||
normalized = str(label).strip().lower()
|
||||
model_label = target_registry().get(normalized)
|
||||
if model_label is None:
|
||||
raise ValidationError({"target_type": "Этот тип объекта не поддерживается."})
|
||||
try:
|
||||
model_class = apps.get_model(model_label)
|
||||
content_type = ContentType.objects.get_for_model(model_class)
|
||||
except (ValueError, LookupError):
|
||||
raise ValidationError({"target_type": "Неизвестный тип объекта."})
|
||||
try:
|
||||
target = content_type.get_object_for_this_type(pk=object_id)
|
||||
except ObjectDoesNotExist:
|
||||
raise ValidationError({"target_id": "Объект не найден."})
|
||||
return content_type, target
|
||||
|
||||
|
||||
def public_target_label(content_type):
|
||||
natural_label = f"{content_type.app_label}.{content_type.model}"
|
||||
for public_label, model_label in target_registry().items():
|
||||
try:
|
||||
model_class = apps.get_model(model_label)
|
||||
except (ValueError, LookupError):
|
||||
continue
|
||||
if (
|
||||
model_class._meta.app_label == content_type.app_label
|
||||
and model_class._meta.model_name == content_type.model
|
||||
):
|
||||
return public_label
|
||||
return natural_label
|
||||
|
||||
|
||||
def file_checksum(uploaded_file):
|
||||
digest = hashlib.sha256()
|
||||
for chunk in uploaded_file.chunks():
|
||||
digest.update(chunk)
|
||||
uploaded_file.seek(0)
|
||||
return digest.hexdigest()
|
||||
|
||||
|
||||
@transaction.atomic
|
||||
def create_file(*, uploaded_file, user):
|
||||
dsk_file = DskFile.objects.create(
|
||||
file=uploaded_file,
|
||||
original_name=uploaded_file.name,
|
||||
content_type=getattr(uploaded_file, "content_type", "") or "",
|
||||
size=uploaded_file.size,
|
||||
checksum=file_checksum(uploaded_file),
|
||||
uploaded_by=user,
|
||||
)
|
||||
employee = getattr(user, "sys_employee", None)
|
||||
client = getattr(user, "crm_client", None)
|
||||
if employee is not None and employee.is_active:
|
||||
DskFileEmployeeAccess.objects.create(
|
||||
dsk_file=dsk_file, employee=employee,
|
||||
access_level=DskAccessLevel.MANAGE, granted_by=user,
|
||||
)
|
||||
elif client is not None:
|
||||
DskFileClientAccess.objects.create(
|
||||
dsk_file=dsk_file, client=client,
|
||||
access_level=DskAccessLevel.MANAGE, granted_by=user,
|
||||
)
|
||||
elif not user.is_superuser:
|
||||
raise ValidationError("Для загрузки нужен профиль сотрудника или клиента.")
|
||||
return dsk_file
|
||||
|
||||
|
||||
@transaction.atomic
|
||||
def replace_accesses(*, dsk_file, employee_accesses, client_accesses, user):
|
||||
if not any(
|
||||
item["access_level"] == DskAccessLevel.MANAGE
|
||||
for item in [*employee_accesses, *client_accesses]
|
||||
) and not user.is_superuser:
|
||||
raise ValidationError("У файла должен оставаться хотя бы один управляющий.")
|
||||
|
||||
DskFileEmployeeAccess.objects.filter(dsk_file=dsk_file).delete()
|
||||
DskFileClientAccess.objects.filter(dsk_file=dsk_file).delete()
|
||||
DskFileEmployeeAccess.objects.bulk_create([
|
||||
DskFileEmployeeAccess(
|
||||
dsk_file=dsk_file, employee=item["employee"],
|
||||
access_level=item["access_level"], granted_by=user,
|
||||
) for item in employee_accesses
|
||||
])
|
||||
DskFileClientAccess.objects.bulk_create([
|
||||
DskFileClientAccess(
|
||||
dsk_file=dsk_file, client=item["client"],
|
||||
access_level=item["access_level"], granted_by=user,
|
||||
) for item in client_accesses
|
||||
])
|
||||
|
||||
|
||||
def attach_file(*, dsk_file, target_type, target_id, user):
|
||||
content_type, _ = resolve_target(target_type, target_id)
|
||||
attachment, _ = DskAttachment.objects.get_or_create(
|
||||
dsk_file=dsk_file, target_type=content_type, target_id=target_id,
|
||||
defaults={"created_by": user},
|
||||
)
|
||||
return attachment
|
||||
|
|
@ -1,15 +1,19 @@
|
|||
"""Read-only, optimized ORM queries for the SYS domain."""
|
||||
|
||||
from wanitil.funcs.funcSysEmployee import (
|
||||
get_client_navigation_codes,
|
||||
get_client_permission_codes,
|
||||
get_user_navigation_codes,
|
||||
get_user_module_membership,
|
||||
get_user_permission_codes,
|
||||
user_has_module_profile,
|
||||
)
|
||||
|
||||
__all__ = [
|
||||
"get_client_navigation_codes",
|
||||
"get_client_permission_codes",
|
||||
"get_user_module_membership",
|
||||
"get_user_navigation_codes",
|
||||
"get_user_permission_codes",
|
||||
"user_has_module_profile",
|
||||
]
|
||||
|
|
|
|||
|
|
@ -1,12 +1,11 @@
|
|||
"""Canonical module/object catalog used by navigation capabilities."""
|
||||
|
||||
from wanitil.init_data import sys_object_data
|
||||
|
||||
|
||||
MODULE_CODES = {
|
||||
1000: "sys", 1100: "con", 1500: "rep", 2100: "adr",
|
||||
1: "def", 1000: "sys", 1100: "con", 1200: "emp",
|
||||
1500: "rep", 2100: "adr",
|
||||
3100: "crm", 3200: "srv", 4100: "dev", 4200: "cim",
|
||||
11100: "req", 11200: "inc", 21100: "sla", 21200: "chn",
|
||||
21300: "dsk",
|
||||
}
|
||||
|
||||
# IDs are retained for objects referenced by legacy SysField data.
|
||||
|
|
@ -47,7 +46,7 @@ OBJECT_CODES = {
|
|||
# Keep this aligned with the atomic permission catalog. Capabilities are built
|
||||
# from SysObject, so every navigable permission resource needs an object row.
|
||||
MODULE_RESOURCES = {
|
||||
"sys": ("module", "object", "field", "field-search", "contact-type", "user", "holiday-group", "holiday", "view", "module-settings", "auth", "settings", "employee-access", "permission", "access-profile", "department"),
|
||||
"sys": ("module", "object", "field", "field-search", "contact-type", "user", "holiday-group", "holiday", "view", "module-settings", "auth", "settings", "employee-access", "permission", "access-profile", "department", "reminder", "tag"),
|
||||
"con": ("person", "contact", "call", "app-delivery", "telegram-delivery", "settings"),
|
||||
"rep": ("collection", "collection-field", "collection-data", "chart"),
|
||||
"adr": ("country", "region", "area", "town", "town-type", "street", "street-type", "house", "house-type", "zone", "zone-type"),
|
||||
|
|
@ -59,22 +58,93 @@ MODULE_RESOURCES = {
|
|||
"inc": ("group", "source-type", "status", "impact", "priority", "category", "subcategory", "solution", "incident", "incident-history", "ci", "comment", "settings", "notification"),
|
||||
"sla": ("schedule-week", "schedule-period", "request-status", "request-agreement", "request-calculation", "request-calculation-total", "incident-status", "incident-agreement", "incident-calculation", "incident-calculation-total"),
|
||||
"chn": ("task", "task-type", "task-status", "task-priority", "task-category", "change", "change-type", "change-status", "task-transition", "settings"),
|
||||
"dsk": ("file",),
|
||||
}
|
||||
|
||||
RESOURCE_DEFAULTS = {
|
||||
("sys", "tag"): {
|
||||
"description": "Теги",
|
||||
"prefix": "SYSTAG",
|
||||
"url": "sys/tags",
|
||||
"spec_field": "",
|
||||
"sys_name": "SysTag",
|
||||
},
|
||||
("dsk", "file"): {
|
||||
"description": "Файлы",
|
||||
"prefix": "DSK",
|
||||
"url": "dsk/files",
|
||||
"spec_field": "",
|
||||
"sys_name": "DskFile",
|
||||
},
|
||||
("sys", "reminder"): {
|
||||
"description": "Напоминания",
|
||||
"prefix": "SYSREM",
|
||||
"url": "sys/reminders",
|
||||
"spec_field": "",
|
||||
"sys_name": "SysReminder",
|
||||
},
|
||||
}
|
||||
|
||||
|
||||
def synchronize_system_catalog(Module=None, Object=None):
|
||||
def synchronize_system_catalog(Module=None, Object=None, Navigate=None):
|
||||
if Module is None or Object is None:
|
||||
from wanitil.models.modelSys import SysManagment, SysObject
|
||||
from wanitil.models.modelSys import SysManagment, SysNavigate, SysObject
|
||||
Module, Object = SysManagment, SysObject
|
||||
Navigate = SysNavigate
|
||||
|
||||
from wanitil.init_data import sys_object_data
|
||||
|
||||
# Historical migrations call this function with their versioned models.
|
||||
# Keep that path compatible with the former numeric PK + code schema.
|
||||
module_field_names = {field.name for field in Module._meta.get_fields()}
|
||||
if "code" in module_field_names:
|
||||
modules = {}
|
||||
for module_id, code in MODULE_CODES.items():
|
||||
module = Module.objects.filter(pk=module_id).first()
|
||||
if module is None:
|
||||
continue
|
||||
if module.code != code:
|
||||
module.code = code
|
||||
module.save(update_fields=("code",))
|
||||
modules[code] = module
|
||||
|
||||
legacy = {item["id"]: item for item in sys_object_data}
|
||||
for object_id, code in OBJECT_CODES.items():
|
||||
item = legacy.get(object_id)
|
||||
if item is None or item["sys_managment_id"] not in MODULE_CODES:
|
||||
continue
|
||||
defaults = {
|
||||
"name": item["name"], "description": item["description"],
|
||||
"prefix": item["prefix"], "url": item["url"],
|
||||
"spec_field": item["spec_field"], "sys_name": item["sys_name"],
|
||||
"sys_managment_id": item["sys_managment_id"], "code": code,
|
||||
}
|
||||
Object.objects.update_or_create(pk=object_id, defaults=defaults)
|
||||
|
||||
created = 0
|
||||
for module_code, resources in MODULE_RESOURCES.items():
|
||||
module = modules.get(module_code)
|
||||
if module is None:
|
||||
continue
|
||||
for resource in resources:
|
||||
_, was_created = Object.objects.get_or_create(
|
||||
sys_managment=module, code=resource,
|
||||
defaults={
|
||||
"name": f"{module_code}.{resource}",
|
||||
"description": f"{module_code.upper()} {resource}",
|
||||
"prefix": "", "url": "", "spec_field": "",
|
||||
"sys_name": "",
|
||||
},
|
||||
)
|
||||
created += int(was_created)
|
||||
return created
|
||||
|
||||
modules = {}
|
||||
for module_id, code in MODULE_CODES.items():
|
||||
module = Module.objects.filter(pk=module_id).first()
|
||||
if module is None:
|
||||
continue
|
||||
if module.code != code:
|
||||
module.code = code
|
||||
module.save(update_fields=("code",))
|
||||
for _legacy_id, code in MODULE_CODES.items():
|
||||
module, _ = Module.objects.get_or_create(
|
||||
pk=code,
|
||||
defaults={"description": code.upper(), "preference": {}},
|
||||
)
|
||||
modules[code] = module
|
||||
|
||||
legacy = {item["id"]: item for item in sys_object_data}
|
||||
|
|
@ -82,13 +152,16 @@ def synchronize_system_catalog(Module=None, Object=None):
|
|||
item = legacy.get(object_id)
|
||||
if item is None or item["sys_managment_id"] not in MODULE_CODES:
|
||||
continue
|
||||
module_code = MODULE_CODES[item["sys_managment_id"]]
|
||||
defaults = {
|
||||
"name": item["name"], "description": item["description"],
|
||||
"description": item["description"],
|
||||
"prefix": item["prefix"], "url": item["url"],
|
||||
"spec_field": item["spec_field"], "sys_name": item["sys_name"],
|
||||
"sys_managment_id": item["sys_managment_id"], "code": code,
|
||||
"sys_managment_id": module_code,
|
||||
}
|
||||
Object.objects.update_or_create(pk=object_id, defaults=defaults)
|
||||
Object.objects.update_or_create(
|
||||
pk=f"{module_code}.{code}", defaults=defaults,
|
||||
)
|
||||
|
||||
created = 0
|
||||
for module_code, resources in MODULE_RESOURCES.items():
|
||||
|
|
@ -96,17 +169,27 @@ def synchronize_system_catalog(Module=None, Object=None):
|
|||
if module is None:
|
||||
continue
|
||||
for resource in resources:
|
||||
_, was_created = Object.objects.get_or_create(
|
||||
sys_managment=module,
|
||||
code=resource,
|
||||
defaults={
|
||||
"name": f"{module_code}.{resource}",
|
||||
"description": f"{module_code.upper()} {resource}",
|
||||
"prefix": "",
|
||||
"url": "",
|
||||
"spec_field": "",
|
||||
"sys_name": "",
|
||||
},
|
||||
)
|
||||
resource_defaults = RESOURCE_DEFAULTS.get((module_code, resource))
|
||||
defaults = resource_defaults or {
|
||||
"description": f"{module_code.upper()} {resource}",
|
||||
"prefix": "",
|
||||
"url": "",
|
||||
"spec_field": "",
|
||||
"sys_name": "",
|
||||
}
|
||||
lookup = {
|
||||
"sys_managment": module,
|
||||
"pk": f"{module_code}.{resource}",
|
||||
"defaults": defaults,
|
||||
}
|
||||
if resource_defaults is not None:
|
||||
_, was_created = Object.objects.update_or_create(**lookup)
|
||||
else:
|
||||
_, was_created = Object.objects.get_or_create(**lookup)
|
||||
if Navigate is not None:
|
||||
Navigate.objects.update_or_create(
|
||||
pk=f"{module_code}:{resource}",
|
||||
defaults={"description": defaults["description"]},
|
||||
)
|
||||
created += int(was_created)
|
||||
return created
|
||||
|
|
|
|||
|
|
@ -0,0 +1,57 @@
|
|||
from django.contrib.contenttypes.models import ContentType
|
||||
from django.db import transaction
|
||||
|
||||
from wanitil.domains.dsk.services import resolve_target
|
||||
from wanitil.models.modelDsk import DskAttachment
|
||||
from wanitil.models.modelSys import SysTag, SysTagAssignment
|
||||
|
||||
|
||||
@transaction.atomic
|
||||
def create_tag(*, name, description="", color="", user=None):
|
||||
tag, created = SysTag.objects.get_or_create(
|
||||
name=name.strip(),
|
||||
defaults={
|
||||
"description": description, "color": color, "created_by": user,
|
||||
},
|
||||
)
|
||||
return tag, created
|
||||
|
||||
|
||||
def assign_tag(*, tag, target_type, target_id, user=None):
|
||||
content_type, target = resolve_target(target_type, target_id)
|
||||
assignment, created = SysTagAssignment.objects.get_or_create(
|
||||
tag=tag, target_type=content_type, target_id=target.pk,
|
||||
defaults={"created_by": user},
|
||||
)
|
||||
return assignment, created
|
||||
|
||||
|
||||
def copy_business_context(source, target, *, user=None):
|
||||
"""Copy text, DSK links and tags between workflow tasks/changes."""
|
||||
update_fields = []
|
||||
for field_name in ("title", "description"):
|
||||
if hasattr(source, field_name) and hasattr(target, field_name):
|
||||
value = getattr(source, field_name)
|
||||
if getattr(target, field_name) != value:
|
||||
setattr(target, field_name, value)
|
||||
update_fields.append(field_name)
|
||||
if update_fields:
|
||||
target.save(update_fields=tuple(update_fields))
|
||||
|
||||
source_type = ContentType.objects.get_for_model(source)
|
||||
target_type = ContentType.objects.get_for_model(target)
|
||||
for attachment in DskAttachment.objects.filter(
|
||||
target_type=source_type, target_id=source.pk,
|
||||
):
|
||||
DskAttachment.objects.get_or_create(
|
||||
dsk_file=attachment.dsk_file, target_type=target_type,
|
||||
target_id=target.pk, defaults={"created_by": user},
|
||||
)
|
||||
for assignment in SysTagAssignment.objects.filter(
|
||||
target_type=source_type, target_id=source.pk,
|
||||
):
|
||||
SysTagAssignment.objects.get_or_create(
|
||||
tag=assignment.tag, target_type=target_type,
|
||||
target_id=target.pk, defaults={"created_by": user},
|
||||
)
|
||||
return target
|
||||
|
|
@ -1,3 +1,5 @@
|
|||
import django_filters
|
||||
|
||||
from .filterUtils import BaseFilterSet, boolLookUp, datetimeLookUp, intLookUp, strLookUp
|
||||
from ..models.modelChn import Change, ChangeStatus, ChangeType, Task, TaskCategory, TaskPriority, TaskStatus, TaskTransition, TaskType
|
||||
|
||||
|
|
@ -14,7 +16,10 @@ class TaskTypeFilter(ChnReferenceFilter):
|
|||
class TaskStatusFilter(ChnReferenceFilter):
|
||||
class Meta(ChnReferenceFilter.Meta):
|
||||
model = TaskStatus
|
||||
fields = {**ChnReferenceFilter.Meta.fields, "is_closed": boolLookUp}
|
||||
fields = {
|
||||
**ChnReferenceFilter.Meta.fields, "code": strLookUp,
|
||||
"is_closed": boolLookUp,
|
||||
}
|
||||
|
||||
|
||||
class TaskPriorityFilter(ChnReferenceFilter):
|
||||
|
|
@ -28,7 +33,18 @@ class TaskCategoryFilter(ChnReferenceFilter):
|
|||
|
||||
|
||||
class ChangeStatusFilter(ChnReferenceFilter):
|
||||
class Meta(ChnReferenceFilter.Meta): model = ChangeStatus
|
||||
# Deprecated compatibility parameter. Change statuses are now global, but
|
||||
# older clients still scope this request by change type.
|
||||
change_type__id__exact = django_filters.NumberFilter(
|
||||
method="filter_legacy_change_type",
|
||||
)
|
||||
|
||||
def filter_legacy_change_type(self, queryset, name, value):
|
||||
return queryset
|
||||
|
||||
class Meta(ChnReferenceFilter.Meta):
|
||||
model = ChangeStatus
|
||||
fields = {**ChnReferenceFilter.Meta.fields, "code": strLookUp}
|
||||
|
||||
|
||||
class ChangeTypeFilter(ChnReferenceFilter):
|
||||
|
|
@ -41,6 +57,7 @@ class ChangeFilter(BaseFilterSet):
|
|||
fields = {
|
||||
"id": intLookUp, "change_type__id": intLookUp,
|
||||
"status__id": intLookUp, "initiator__id": intLookUp,
|
||||
"responsible__id": intLookUp,
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -57,14 +74,18 @@ class TaskTransitionFilter(BaseFilterSet):
|
|||
|
||||
|
||||
class TaskFilter(BaseFilterSet):
|
||||
assignee__id = django_filters.NumberFilter(field_name="assignees__id")
|
||||
|
||||
class Meta:
|
||||
model = Task
|
||||
fields = {
|
||||
"id": intLookUp, "title": strLookUp, "external_id": strLookUp,
|
||||
"task_type__id": intLookUp, "status__id": intLookUp,
|
||||
"priority__id": intLookUp, "category__id": intLookUp,
|
||||
"department__id": intLookUp, "assignee__id": intLookUp,
|
||||
"department__id": intLookUp, "assignees__id": intLookUp,
|
||||
"initiator__id": intLookUp, "change__id": intLookUp,
|
||||
"parent_change__id": intLookUp,
|
||||
"parent_task__id": intLookUp,
|
||||
"process_state": strLookUp,
|
||||
"planned_start_at": datetimeLookUp, "planned_finish_at": datetimeLookUp,
|
||||
"actual_start_at": datetimeLookUp, "actual_finish_at": datetimeLookUp,
|
||||
|
|
|
|||
|
|
@ -1,22 +1,24 @@
|
|||
import django_filters
|
||||
from .filterUtils import strLookUp, intLookUp, datetimeLookUp, boolLookUp, floatLookUp, BaseFilterSet
|
||||
|
||||
from ..models.modelCrm import CrmActivity, CrmClient, CrmContract, CrmLead, CrmType, CrmCategory
|
||||
from ..models.modelCrm import CrmActivity, CrmClient, CrmContract, CrmLead, CrmClientType, CrmClientCategory
|
||||
|
||||
|
||||
class CrmTypeFilter(BaseFilterSet):
|
||||
class CrmClientTypeFilter(BaseFilterSet):
|
||||
class Meta:
|
||||
model = CrmType
|
||||
model = CrmClientType
|
||||
fields = {
|
||||
"id": intLookUp, "name": strLookUp, "description": strLookUp
|
||||
"id": intLookUp, "name": strLookUp,
|
||||
"description": strLookUp, "color": strLookUp,
|
||||
}
|
||||
|
||||
|
||||
class CrmCategoryFilter(BaseFilterSet):
|
||||
class CrmClientCategoryFilter(BaseFilterSet):
|
||||
class Meta:
|
||||
model = CrmCategory
|
||||
model = CrmClientCategory
|
||||
fields = {
|
||||
"id": intLookUp, "name": strLookUp, "description": strLookUp
|
||||
"id": intLookUp, "name": strLookUp,
|
||||
"description": strLookUp, "color": strLookUp,
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -29,9 +31,9 @@ class CrmLeadFilter(BaseFilterSet):
|
|||
"status": strLookUp,
|
||||
"source": strLookUp, "budget": floatLookUp,
|
||||
"need": strLookUp, "comment": strLookUp,
|
||||
"responsible__id": intLookUp,
|
||||
"responsible__employee__name": strLookUp,
|
||||
"responsible__employee__sys_user__username": strLookUp,
|
||||
"assigned__id": intLookUp,
|
||||
"assigned__name": strLookUp,
|
||||
"assigned__sys_user__username": strLookUp,
|
||||
"con_person__id": intLookUp,
|
||||
"con_person__name": strLookUp,
|
||||
"created_at": datetimeLookUp, "updated_at": datetimeLookUp,
|
||||
|
|
@ -54,11 +56,13 @@ class CrmClientFilter(BaseFilterSet):
|
|||
class Meta:
|
||||
model = CrmClient
|
||||
fields = {
|
||||
"id": intLookUp, "crm_type__id": intLookUp, "crm_type__name": strLookUp, "crm_type__description": strLookUp, "crm_category__id": intLookUp,
|
||||
"crm_category__name": strLookUp, "crm_category__description": strLookUp,
|
||||
"id": intLookUp, "crm_type__id": intLookUp, "crm_type__name": strLookUp, "crm_type__description": strLookUp, "crm_type__color": strLookUp, "crm_category__id": intLookUp,
|
||||
"crm_category__name": strLookUp, "crm_category__description": strLookUp, "crm_category__color": strLookUp,
|
||||
"name": strLookUp, "fullname": strLookUp, "firstname": strLookUp, "secondname": strLookUp, "surname": strLookUp,
|
||||
"email": strLookUp, "phone": strLookUp,
|
||||
"sys_user__id": intLookUp, "sys_user__username": strLookUp,
|
||||
"assigned__id": intLookUp, "assigned__name": strLookUp,
|
||||
"assigned__sys_user__username": strLookUp,
|
||||
"con_person__id": intLookUp, "con_person__name": strLookUp,
|
||||
"house_id": intLookUp, "house_extid": strLookUp, "house_name": strLookUp, "flat": strLookUp, "lat": floatLookUp, "lon": floatLookUp
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ import django_filters
|
|||
from .filterUtils import strLookUp, intLookUp, datetimeLookUp, boolLookUp, floatLookUp, BaseFilterSet
|
||||
|
||||
from ..models.modelInc import IncGroup, IncImpact, IncPriority, IncStatus, IncStatusTransit, IncCategory, IncSubcategory, IncSolution, IncSourceType
|
||||
from ..models.modelInc import IncIncident, IncIncidentHistorical, IncCi, IncComment, IncCommentFile, IncIncidentFile, IncGetPreferenceValue
|
||||
from ..models.modelInc import IncIncident, IncIncidentHistorical, IncCi, IncComment, IncGetPreferenceValue
|
||||
from ..models.modelInc import IncIncidentNotify, IncIncidentNotifyField, IncCommentNotify, IncCommentNotifyField
|
||||
|
||||
|
||||
|
|
@ -113,22 +113,6 @@ class IncCommentFilter(BaseFilterSet):
|
|||
}
|
||||
|
||||
|
||||
class IncIncidentFileFilter(BaseFilterSet):
|
||||
class Meta:
|
||||
model = IncIncidentFile
|
||||
fields = {
|
||||
"id": intLookUp, "name": strLookUp, "inc_incident__id": intLookUp, "sys_user__id": intLookUp, "sys_user__username": strLookUp
|
||||
}
|
||||
|
||||
|
||||
class IncCommentFileFilter(BaseFilterSet):
|
||||
class Meta:
|
||||
model = IncCommentFile
|
||||
fields = {
|
||||
"id": intLookUp, "name": strLookUp, "inc_comment__id": intLookUp, "sys_user__id": intLookUp, "sys_user__username": strLookUp
|
||||
}
|
||||
|
||||
|
||||
class IncCiFilter(BaseFilterSet):
|
||||
class Meta:
|
||||
model = IncCi
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ class RepCollectionFilter(BaseFilterSet):
|
|||
class Meta:
|
||||
model = RepCollection
|
||||
fields = {
|
||||
"id": intLookUp, "name": strLookUp, "sys_object__id": intLookUp, "sys_object__name": strLookUp, "is_active": boolLookUp, "rep_chart_online__id": intLookUp, "rep_chart_online__name": strLookUp
|
||||
"id": intLookUp, "name": strLookUp, "sys_object__id": strLookUp, "is_active": boolLookUp, "rep_chart_online__id": intLookUp, "rep_chart_online__name": strLookUp
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -24,7 +24,7 @@ class RepCollectionDataFilter(BaseFilterSet):
|
|||
class Meta:
|
||||
model = RepCollectionData
|
||||
fields = {
|
||||
"id": intLookUp, "sysdatecreate": datetimeLookUp, "value": intLookUp, "rep_collection__id": intLookUp, "rep_collection__name": strLookUp, "rep_collection__sys_object__id": intLookUp, "rep_collection__sys_object__name": strLookUp, "rep_collection__is_active": boolLookUp
|
||||
"id": intLookUp, "sysdatecreate": datetimeLookUp, "value": intLookUp, "rep_collection__id": intLookUp, "rep_collection__name": strLookUp, "rep_collection__sys_object__id": strLookUp, "rep_collection__is_active": boolLookUp
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
import django_filters
|
||||
|
||||
from ..models.modelReq import ReqComment, ReqRequestFile, ReqCommentFile, ReqSourceType, ReqDepend, ReqGetPreferenceValue
|
||||
from ..models.modelReq import ReqComment, ReqSourceType, ReqDepend, ReqGetPreferenceValue
|
||||
from ..models.modelReq import ReqStatus, ReqStatusTransit, ReqCriticality, ReqRequest, ReqRequestHistorical
|
||||
from ..models.modelReq import ReqCommentNotify, ReqCommentNotifyField, ReqRequestNotify, ReqRequestNotifyField
|
||||
from ..models.modelReq import ReqReportRequestStampActiveM, ReqReportRequestStampCreateCloseM, ReqReportRequestStampSlaM
|
||||
|
|
@ -116,22 +116,6 @@ class ReqCommentFilter(BaseFilterSet):
|
|||
}
|
||||
|
||||
|
||||
class ReqRequestFileFilter(BaseFilterSet):
|
||||
class Meta:
|
||||
model = ReqRequestFile
|
||||
fields = {
|
||||
"id": intLookUp, "name": strLookUp, "req_request__id": intLookUp, "sys_user__id": intLookUp, "sys_user__username": strLookUp
|
||||
}
|
||||
|
||||
|
||||
class ReqCommentFileFilter(BaseFilterSet):
|
||||
class Meta:
|
||||
model = ReqCommentFile
|
||||
fields = {
|
||||
"id": intLookUp, "name": strLookUp, "req_comment__id": intLookUp, "sys_user__id": intLookUp, "sys_user__username": strLookUp
|
||||
}
|
||||
|
||||
|
||||
class ReqDependFilter(BaseFilterSet):
|
||||
class Meta:
|
||||
model = ReqDepend
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@ from .filterUtils import strLookUp, intLookUp, datetimeLookUp, boolLookUp, float
|
|||
|
||||
|
||||
from ..models.modelSys import (
|
||||
SysDepartment, SysEmployee, SysGetPreferenceValue, SysModuleAccessProfile,
|
||||
SysModuleMembership, SysPermission, SysSetting,
|
||||
SysDepartment, SysEmployee, SysGetPreferenceValue, SysProfile,
|
||||
SysProfileEmployee, SysNavigate, SysPermission, SysReminder, SysSetting,
|
||||
)
|
||||
from ..models.modelSys import SysManagment, SysObject, SysContactType, SysFieldSearch, SysField, SysHolidayElement, SysHolidayGroup
|
||||
from ..models.modelSys import SysView, SysViewField
|
||||
|
|
@ -25,7 +25,7 @@ class SysManagmentFilter(BaseFilterSet):
|
|||
class Meta:
|
||||
model = SysManagment
|
||||
fields = {
|
||||
"id": intLookUp, "name": strLookUp, "description": strLookUp, "isext": boolLookUp, "urldomain": strLookUp, "urlport": strLookUp, "urlapi": strLookUp
|
||||
"id": strLookUp, "description": strLookUp, "isext": boolLookUp, "urldomain": strLookUp, "urlport": strLookUp, "urlapi": strLookUp
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -39,10 +39,23 @@ class SysEmployeeFilter(BaseFilterSet):
|
|||
"name": strLookUp, "firstname": strLookUp,
|
||||
"secondname": strLookUp, "surname": strLookUp,
|
||||
"departments__id": intLookUp, "departments__name": strLookUp,
|
||||
"permissions__id": strLookUp, "navigations__id": strLookUp,
|
||||
"is_active": boolLookUp,
|
||||
}
|
||||
|
||||
|
||||
class SysReminderFilter(BaseFilterSet):
|
||||
class Meta:
|
||||
model = SysReminder
|
||||
fields = {
|
||||
"id": intLookUp, "title": strLookUp, "text": strLookUp,
|
||||
"remind_at": datetimeLookUp, "recipient__id": intLookUp,
|
||||
"created_by__id": intLookUp, "status": strLookUp,
|
||||
"is_read": boolLookUp, "completed_at": datetimeLookUp,
|
||||
"created_at": datetimeLookUp, "updated_at": datetimeLookUp,
|
||||
}
|
||||
|
||||
|
||||
class SysDepartmentFilter(BaseFilterSet):
|
||||
class Meta:
|
||||
model = SysDepartment
|
||||
|
|
@ -54,14 +67,13 @@ class SysDepartmentFilter(BaseFilterSet):
|
|||
}
|
||||
|
||||
|
||||
class SysModuleAccessProfileFilter(BaseFilterSet):
|
||||
class SysProfileFilter(BaseFilterSet):
|
||||
class Meta:
|
||||
model = SysModuleAccessProfile
|
||||
model = SysProfile
|
||||
fields = {
|
||||
"id": intLookUp, "module__id": intLookUp,
|
||||
"module__name": strLookUp, "code": strLookUp,
|
||||
"id": intLookUp, "module__id": strLookUp, "code": strLookUp,
|
||||
"name": strLookUp, "scope": strLookUp,
|
||||
"permissions__id": intLookUp,
|
||||
"permissions__id": strLookUp, "navigations__id": strLookUp,
|
||||
"permissions__module": strLookUp,
|
||||
"permissions__action": strLookUp,
|
||||
"permissions__resource": strLookUp, "is_system": boolLookUp,
|
||||
|
|
@ -73,31 +85,40 @@ class SysPermissionFilter(BaseFilterSet):
|
|||
class Meta:
|
||||
model = SysPermission
|
||||
fields = {
|
||||
"id": intLookUp, "module": strLookUp,
|
||||
"id": strLookUp, "module": strLookUp,
|
||||
"action": strLookUp, "resource": strLookUp,
|
||||
}
|
||||
|
||||
|
||||
class SysModuleMembershipFilter(BaseFilterSet):
|
||||
class SysProfileEmployeeFilter(BaseFilterSet):
|
||||
class Meta:
|
||||
model = SysModuleMembership
|
||||
model = SysProfileEmployee
|
||||
fields = {
|
||||
"id": intLookUp, "employee__id": intLookUp,
|
||||
"employee__sys_user__id": intLookUp,
|
||||
"employee__name": strLookUp, "module__id": intLookUp,
|
||||
"module__name": strLookUp, "profiles__id": intLookUp,
|
||||
"employee__name": strLookUp, "module__id": strLookUp,
|
||||
"profiles__id": intLookUp,
|
||||
"profiles__code": strLookUp, "profiles__scope": strLookUp,
|
||||
"profiles__permissions__id": intLookUp,
|
||||
"profiles__permissions__id": strLookUp,
|
||||
"is_active": boolLookUp, "valid_from": datetimeLookUp,
|
||||
"valid_until": datetimeLookUp,
|
||||
}
|
||||
|
||||
|
||||
class SysNavigateFilter(BaseFilterSet):
|
||||
class Meta:
|
||||
model = SysNavigate
|
||||
fields = {
|
||||
"id": strLookUp, "description": strLookUp,
|
||||
"is_active": boolLookUp,
|
||||
}
|
||||
|
||||
|
||||
class SysObjectFilter(BaseFilterSet):
|
||||
class Meta:
|
||||
model = SysObject
|
||||
fields = {
|
||||
"id": intLookUp, "name": strLookUp, "description": strLookUp, "prefix": strLookUp, "url": strLookUp, "spec_field": strLookUp, "sys_managment__id": intLookUp, "sys_managment__name": strLookUp
|
||||
"id": strLookUp, "description": strLookUp, "prefix": strLookUp, "url": strLookUp, "spec_field": strLookUp, "sys_managment__id": strLookUp
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -105,7 +126,7 @@ class SysFieldFilter(BaseFilterSet):
|
|||
class Meta:
|
||||
model = SysField
|
||||
fields = {
|
||||
"id": intLookUp, "name": strLookUp, "sysname": strLookUp, "sys_object__id": intLookUp, "sys_object__name": strLookUp, "rel_object__id": intLookUp, "rel_object__name": strLookUp, "type": strLookUp, "searchtype": strLookUp, "searchname": strLookUp, "searchlist": strLookUp, "searchlistname": strLookUp
|
||||
"id": intLookUp, "name": strLookUp, "sysname": strLookUp, "sys_object__id": strLookUp, "rel_object__id": strLookUp, "type": strLookUp, "searchtype": strLookUp, "searchname": strLookUp, "searchlist": strLookUp, "searchlistname": strLookUp
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -113,7 +134,7 @@ class SysFieldSearchFilter(BaseFilterSet):
|
|||
class Meta:
|
||||
model = SysFieldSearch
|
||||
fields = {
|
||||
"id": intLookUp, "name": strLookUp, "sys_object__id": intLookUp, "sys_object__name": strLookUp, "type": strLookUp, "val": strLookUp
|
||||
"id": intLookUp, "name": strLookUp, "sys_object__id": strLookUp, "type": strLookUp, "val": strLookUp
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -148,7 +169,7 @@ class SysViewFilter(BaseFilterSet):
|
|||
class Meta:
|
||||
model = SysView
|
||||
fields = {
|
||||
"id": intLookUp, "name": strLookUp, "sys_object__id": intLookUp, "sys_object__name": strLookUp, "sys_user__id": intLookUp, "sys_user__username": strLookUp, "is_all": boolLookUp, "is_main_menu": boolLookUp
|
||||
"id": intLookUp, "name": strLookUp, "sys_object__id": strLookUp, "sys_user__id": intLookUp, "sys_user__username": strLookUp, "is_all": boolLookUp, "is_main_menu": boolLookUp
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -176,7 +197,6 @@ class SysUserFilter(BaseFilterSet):
|
|||
"crm_client__con_person__con_contact__is_active": boolLookUp,
|
||||
|
||||
"sys_employee__lang": strLookUp,
|
||||
"sys_employee__status": intLookUp,
|
||||
"sys_employee__theme_is_light": boolLookUp,
|
||||
"sys_employee__theme_color": strLookUp,
|
||||
"sys_employee__timezone": intLookUp,
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ import datetime
|
|||
import re
|
||||
|
||||
import django_filters
|
||||
from django.core.exceptions import FieldDoesNotExist
|
||||
from django.db import models
|
||||
from django.db.models import Q
|
||||
from django.utils import timezone
|
||||
|
|
@ -29,7 +30,7 @@ CONTROL_QUERY_PARAMS = frozenset({
|
|||
"active_on", "area_id", "assigned_to", "category_id", "ci_id", "ciid",
|
||||
"client_id", "contract_number", "country_id", "depth", "direction",
|
||||
"group_id", "group_scope", "isall", "lang", "manufacturer_id",
|
||||
"model_id", "region_id", "request_type_id", "responsible_id",
|
||||
"model_id", "region_id", "request_type_id", "assigned_id",
|
||||
"serviceid", "source_ci_id", "state", "street_id", "target_ci_id",
|
||||
"town_id", "type_id", "user_id", "zone_id", "zone_type_id",
|
||||
})
|
||||
|
|
@ -73,13 +74,21 @@ class BaseFilterSet(django_filters.FilterSet):
|
|||
return self._relative_datetime(queryset, name, value, "lte")
|
||||
|
||||
def _search_fields(self):
|
||||
"""Derive safe search fields from this FilterSet's public fields."""
|
||||
"""Derive search fields that belong to the endpoint's base table.
|
||||
|
||||
Related fields remain available as explicit filters, but are deliberately
|
||||
excluded from ``searchstr``. Adding every declared relation to one OR
|
||||
expression creates JOINs (and, for multiple M2M fields, a cartesian
|
||||
product) before pagination.
|
||||
"""
|
||||
result = []
|
||||
seen = set()
|
||||
for filter_field in self.filters.values():
|
||||
field_name = filter_field.field_name
|
||||
if not field_name or field_name == "searchstr" or field_name in seen:
|
||||
continue
|
||||
if "__" in field_name:
|
||||
continue
|
||||
terminal_name = field_name.rsplit("__", 1)[-1]
|
||||
if (
|
||||
terminal_name not in SEARCHABLE_FIELD_NAMES
|
||||
|
|
@ -93,7 +102,7 @@ class BaseFilterSet(django_filters.FilterSet):
|
|||
model_field = model_field._meta.get_field(part)
|
||||
if getattr(model_field, "related_model", None) is not None:
|
||||
model_field = model_field.related_model
|
||||
except (AttributeError, models.FieldDoesNotExist):
|
||||
except (AttributeError, FieldDoesNotExist):
|
||||
continue
|
||||
seen.add(field_name)
|
||||
result.append((field_name, model_field))
|
||||
|
|
@ -159,6 +168,40 @@ class BaseFilterSet(django_filters.FilterSet):
|
|||
if errors:
|
||||
raise ValidationError({"code": "invalid_filter", "errors": errors})
|
||||
|
||||
def _filter_uses_to_many_relation(self, parameter):
|
||||
filter_field = self.filters.get(parameter)
|
||||
model = self._meta.model
|
||||
if filter_field is None or model is None:
|
||||
return False
|
||||
|
||||
current_model = model
|
||||
try:
|
||||
for part in filter_field.field_name.split("__"):
|
||||
model_field = current_model._meta.get_field(part)
|
||||
if model_field.many_to_many or model_field.one_to_many:
|
||||
return True
|
||||
if model_field.related_model is not None:
|
||||
current_model = model_field.related_model
|
||||
except (AttributeError, FieldDoesNotExist):
|
||||
return False
|
||||
return False
|
||||
|
||||
def _needs_distinct(self):
|
||||
if self.data is None:
|
||||
return False
|
||||
for parameter in self.data.keys():
|
||||
if parameter not in self.filters:
|
||||
continue
|
||||
values = (
|
||||
self.data.getlist(parameter)
|
||||
if hasattr(self.data, "getlist")
|
||||
else [self.data.get(parameter)]
|
||||
)
|
||||
if any(value not in (None, "") for value in values):
|
||||
if self._filter_uses_to_many_relation(parameter):
|
||||
return True
|
||||
return False
|
||||
|
||||
@property
|
||||
def qs(self):
|
||||
if not self.is_valid():
|
||||
|
|
@ -167,4 +210,5 @@ class BaseFilterSet(django_filters.FilterSet):
|
|||
for field, messages in self.errors.items()
|
||||
}
|
||||
raise ValidationError({"code": "invalid_filter", "errors": errors})
|
||||
return super().qs
|
||||
queryset = super().qs
|
||||
return queryset.distinct() if self._needs_distinct() else queryset
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ import pytz
|
|||
|
||||
from ..models.modelInc import IncIncident, IncCi, IncComment
|
||||
from ..models.modelInc import IncStatus, IncSubcategory, IncImpact, IncPriority, IncGroup, IncSourceType, IncGetPreferenceValue
|
||||
from ..models.modelSys import SysModuleMembership
|
||||
from ..models.modelSys import SysProfileEmployee
|
||||
from ..models.modelInc import IncIncidentNotify, IncIncidentNotifyField, IncCommentNotify, IncCommentNotifyField
|
||||
|
||||
from ..filters.filterInc import IncIncidentFilter, IncCommentFilter
|
||||
|
|
@ -267,7 +267,7 @@ def IncIncidentSendNotify(idInc_, iscreate):
|
|||
if (notify_el['is_group'] == True):
|
||||
grp_list_id = []
|
||||
try:
|
||||
grp_list_id = list(SysModuleMembership.objects.filter(module_id=MANAGMENT_INC,
|
||||
grp_list_id = list(SysProfileEmployee.objects.filter(module_id=MANAGMENT_INC,
|
||||
inc_group__id=inst.inc_group.id).values_list('employee__sys_user__id', flat=True))
|
||||
except Exception as e:
|
||||
None
|
||||
|
|
@ -283,7 +283,7 @@ def IncIncidentSendNotify(idInc_, iscreate):
|
|||
if (notify_el['is_leader'] == True):
|
||||
man_list_id = []
|
||||
try:
|
||||
man_list_id = list(SysModuleMembership.objects.filter(module_id=MANAGMENT_INC,
|
||||
man_list_id = list(SysProfileEmployee.objects.filter(module_id=MANAGMENT_INC,
|
||||
profiles__code="manager").values_list('employee__sys_user__id', flat=True))
|
||||
except Exception as e:
|
||||
None
|
||||
|
|
@ -443,7 +443,7 @@ def IncCommentSendNotify(idCom_, iscreate):
|
|||
if (notify_el['is_group'] == True):
|
||||
grp_list_id = []
|
||||
try:
|
||||
grp_list_id = list(SysModuleMembership.objects.filter(module_id=MANAGMENT_INC,
|
||||
grp_list_id = list(SysProfileEmployee.objects.filter(module_id=MANAGMENT_INC,
|
||||
inc_group__id=inst.inc_incident.inc_group.id).values_list('employee__sys_user__id', flat=True))
|
||||
except Exception as e:
|
||||
None
|
||||
|
|
@ -459,7 +459,7 @@ def IncCommentSendNotify(idCom_, iscreate):
|
|||
if (notify_el['is_leader'] == True):
|
||||
man_list_id = []
|
||||
try:
|
||||
man_list_id = list(SysModuleMembership.objects.filter(module_id=MANAGMENT_INC,
|
||||
man_list_id = list(SysProfileEmployee.objects.filter(module_id=MANAGMENT_INC,
|
||||
profiles__code="manager").values_list('employee__sys_user__id', flat=True))
|
||||
except Exception as e:
|
||||
None
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ from ..cast import safeCast
|
|||
from ..apps_preference import get_prefix_object
|
||||
|
||||
from ..models.modelReq import ReqDepend, ReqRequest, ReqRequestSla, ReqStatus, ReqSourceType, ReqCriticality, ReqComment, ReqGetPreferenceValue
|
||||
from ..models.modelSys import SysModuleMembership
|
||||
from ..models.modelSys import SysProfileEmployee
|
||||
from ..models.modelReq import ReqRequestNotify, ReqRequestNotifyField, ReqCommentNotify, ReqCommentNotifyField
|
||||
from ..filters.filterReq import ReqRequestNotifyFilter, ReqRequestNotifyFieldFilter, ReqRequestFilter, ReqCommentFilter
|
||||
|
||||
|
|
@ -101,7 +101,7 @@ def ReqCreateFromEmail(senderid, title, text, user):
|
|||
if client_obj is not None:
|
||||
# find request by id from title
|
||||
try:
|
||||
prefix_ = get_prefix_object('reqrequest')
|
||||
prefix_ = get_prefix_object("req.request")
|
||||
result = re.search(r'.*\['+prefix_+'-(\d+)\].*', title)
|
||||
if (result):
|
||||
request_id = result.group(1)
|
||||
|
|
@ -366,7 +366,7 @@ def ReqRequestSendNotify(idReq_, iscreate):
|
|||
if (notify_el['is_leader'] == True):
|
||||
man_list_id = []
|
||||
try:
|
||||
man_list_id = list(SysModuleMembership.objects.filter(module_id=MANAGMENT_REQ,
|
||||
man_list_id = list(SysProfileEmployee.objects.filter(module_id=MANAGMENT_REQ,
|
||||
profiles__code="manager").values_list('employee__sys_user__id', flat=True))
|
||||
except Exception as e:
|
||||
None
|
||||
|
|
@ -511,7 +511,7 @@ def ReqCommentSendNotify(idCom_, iscreate):
|
|||
if (notify_el['is_leader'] == True):
|
||||
man_list_id = []
|
||||
try:
|
||||
man_list_id = list(SysModuleMembership.objects.filter(module_id=MANAGMENT_REQ,
|
||||
man_list_id = list(SysProfileEmployee.objects.filter(module_id=MANAGMENT_REQ,
|
||||
profiles__code="manager").values_list('employee__sys_user__id', flat=True))
|
||||
except Exception as e:
|
||||
None
|
||||
|
|
|
|||
|
|
@ -4,12 +4,12 @@ from wanitil.cast import safeCast
|
|||
from wanitil.global_constants import USER_SYSTEM_MAX_ID
|
||||
from wanitil.models.modelAdr import AdrArea, AdrCountry, AdrHouse, AdrHouseType, AdrRegion, AdrStreet, AdrStreetType, AdrTown, AdrTownType
|
||||
from wanitil.models.modelCim import CimCi, CimField, CimRelation, CimType
|
||||
from wanitil.models.modelCrm import CrmCategory, CrmClient, CrmContract, CrmType
|
||||
from wanitil.models.modelCrm import CrmClientCategory, CrmClient, CrmContract, CrmClientType
|
||||
from wanitil.models.modelDev import DevHardwareVersion, DevManufacturer, DevModel, DevSoftwareVersion
|
||||
from wanitil.models.modelSla import SlaRequestAgreement, SlaRequestStatus
|
||||
from ..models.modelSys import SysModuleSettings, SysGetPreferenceValue, SysSetting
|
||||
from django.contrib.auth.models import User
|
||||
from wanitil.models.modelSys import SysEmployee, SysModuleMembership, SysView, SysViewField
|
||||
from wanitil.models.modelSys import SysEmployee, SysProfileEmployee, SysView, SysViewField
|
||||
from wanitil.models.modelReq import ReqStatus, ReqStatusTransit, ReqCriticality, ReqSourceType, ReqSettings
|
||||
from wanitil.models.modelInc import IncStatus, IncStatusTransit, IncSourceType, IncSettings, IncImpact, IncPriority
|
||||
from wanitil.models.modelCon import ConSettings
|
||||
|
|
@ -71,8 +71,8 @@ def clearSystem():
|
|||
del_cnt, _ = SlaAgreementStatus.objects.all().delete()
|
||||
del_cnt, _ = SlaStatusHist.objects.all().delete()
|
||||
|
||||
from wanitil.models.modelInc import IncCommentNotifyField, IncCommentNotify, IncCommentFile, IncComment
|
||||
from wanitil.models.modelInc import IncIncidentNotifyField, IncIncidentNotify, IncIncidentFile
|
||||
from wanitil.models.modelInc import IncCommentNotifyField, IncCommentNotify, IncComment
|
||||
from wanitil.models.modelInc import IncIncidentNotifyField, IncIncidentNotify
|
||||
from wanitil.models.modelInc import IncCi, IncIncident, IncIncidentHistorical
|
||||
from wanitil.models.modelInc import IncGroup
|
||||
from wanitil.models.modelInc import IncCategory, IncImpact, IncPriority, IncSolution, IncSourceType, IncSubcategory, IncStatusTransit, IncStatus
|
||||
|
|
@ -80,12 +80,10 @@ def clearSystem():
|
|||
|
||||
del_cnt, _ = IncCommentNotifyField.objects.all().delete()
|
||||
del_cnt, _ = IncCommentNotify.objects.all().delete()
|
||||
del_cnt, _ = IncCommentFile.objects.all().delete()
|
||||
del_cnt, _ = IncComment.objects.all().delete()
|
||||
|
||||
del_cnt, _ = IncIncidentNotifyField.objects.all().delete()
|
||||
del_cnt, _ = IncIncidentNotify.objects.all().delete()
|
||||
del_cnt, _ = IncIncidentFile.objects.all().delete()
|
||||
del_cnt, _ = IncCi.objects.all().delete()
|
||||
del_cnt, _ = IncIncident.objects.all().delete()
|
||||
del_cnt, _ = IncIncidentHistorical.objects.all().delete()
|
||||
|
|
@ -100,29 +98,27 @@ def clearSystem():
|
|||
del_cnt, _ = IncStatus.objects.all().delete()
|
||||
del_cnt, _ = IncSourceType.objects.all().delete()
|
||||
|
||||
del_cnt, _ = SysModuleMembership.objects.filter(module_id=11200).delete()
|
||||
del_cnt, _ = SysProfileEmployee.objects.filter(module_id="inc").delete()
|
||||
del_cnt, _ = IncGroup.objects.all().delete()
|
||||
|
||||
|
||||
from wanitil.models.modelReq import ReqCommentNotifyField, ReqCommentNotify, ReqCommentFile, ReqComment
|
||||
from wanitil.models.modelReq import ReqRequestNotifyField, ReqRequestNotify, ReqRequestFile
|
||||
from wanitil.models.modelReq import ReqCommentNotifyField, ReqCommentNotify, ReqComment
|
||||
from wanitil.models.modelReq import ReqRequestNotifyField, ReqRequestNotify
|
||||
from wanitil.models.modelReq import ReqRequest, ReqRequestHistorical, ReqDepend
|
||||
from wanitil.models.modelReq import ReqCriticality, ReqSourceType, ReqStatusTransit, ReqStatus
|
||||
from wanitil.models.modelReq import ReqSettings
|
||||
|
||||
del_cnt, _ = ReqCommentNotifyField.objects.all().delete()
|
||||
del_cnt, _ = ReqCommentNotify.objects.all().delete()
|
||||
del_cnt, _ = ReqCommentFile.objects.all().delete()
|
||||
del_cnt, _ = ReqComment.objects.all().delete()
|
||||
|
||||
del_cnt, _ = ReqRequestNotifyField.objects.all().delete()
|
||||
del_cnt, _ = ReqRequestNotify.objects.all().delete()
|
||||
del_cnt, _ = ReqRequestFile.objects.all().delete()
|
||||
del_cnt, _ = ReqDepend.objects.all().delete()
|
||||
del_cnt, _ = ReqRequest.objects.all().delete()
|
||||
del_cnt, _ = ReqRequestHistorical.objects.all().delete()
|
||||
|
||||
del_cnt, _ = SysModuleMembership.objects.filter(module_id=11100).delete()
|
||||
del_cnt, _ = SysProfileEmployee.objects.filter(module_id="req").delete()
|
||||
|
||||
del_cnt, _ = ReqSettings.objects.all().delete()
|
||||
del_cnt, _ = ReqCriticality.objects.all().delete()
|
||||
|
|
@ -140,12 +136,12 @@ def clearSystem():
|
|||
del_cnt, _ = SrvType.objects.all().delete()
|
||||
|
||||
from wanitil.models.modelCrm import CrmContract, CrmClient
|
||||
from wanitil.models.modelCrm import CrmCategory, CrmType
|
||||
from wanitil.models.modelCrm import CrmClientCategory, CrmClientType
|
||||
|
||||
del_cnt, _ = CrmContract.objects.all().delete()
|
||||
del_cnt, _ = CrmClient.objects.all().delete()
|
||||
del_cnt, _ = CrmCategory.objects.all().delete()
|
||||
del_cnt, _ = CrmType.objects.all().delete()
|
||||
del_cnt, _ = CrmClientCategory.objects.all().delete()
|
||||
del_cnt, _ = CrmClientType.objects.all().delete()
|
||||
|
||||
from wanitil.models.modelCim import CimRelation, CimCi, CimField, CimType
|
||||
|
||||
|
|
@ -899,7 +895,7 @@ def demoSetupEn():
|
|||
]
|
||||
for item in data_list:
|
||||
# try:
|
||||
obj =CrmType.objects.create(**item)
|
||||
obj =CrmClientType.objects.create(**item)
|
||||
obj.save()
|
||||
# except Exception as e:
|
||||
# print("error :"+str(e))
|
||||
|
|
@ -910,7 +906,7 @@ def demoSetupEn():
|
|||
]
|
||||
for item in data_list:
|
||||
# try:
|
||||
obj =CrmCategory.objects.create(**item)
|
||||
obj =CrmClientCategory.objects.create(**item)
|
||||
obj.save()
|
||||
# except Exception as e:
|
||||
# print("error :"+str(e))
|
||||
|
|
@ -939,52 +935,52 @@ def demoSetupEn():
|
|||
{"id":1,"name":"John Smith","fullname":"John Smith","firstname":"John","secondname":"Smith","sys_user": User.objects.filter(id=1001).first()
|
||||
,"house_id":1,"house_name":AdrHouse.objects.filter(id=1).first().address_sv, "lat":AdrHouse.objects.filter(id=1).first().lat, "lon":AdrHouse.objects.filter(id=1).first().lon
|
||||
,"flat":"10"
|
||||
,"crm_type":CrmType.objects.filter(id=1).first(), "crm_category":CrmCategory.objects.filter(id=1).first()
|
||||
,"crm_type":CrmClientType.objects.filter(id=1).first(), "crm_category":CrmClientCategory.objects.filter(id=1).first()
|
||||
},
|
||||
{"id":2,"name":"Adam Wood","fullname":"Adam Wood","firstname":"Adam","secondname":"Wood","sys_user": User.objects.filter(id=1002).first()
|
||||
,"house_id":2,"house_name":AdrHouse.objects.filter(id=2).first().address_sv, "lat":AdrHouse.objects.filter(id=2).first().lat, "lon":AdrHouse.objects.filter(id=2).first().lon
|
||||
,"flat":"10"
|
||||
,"crm_type":CrmType.objects.filter(id=1).first(), "crm_category":CrmCategory.objects.filter(id=1).first()
|
||||
,"crm_type":CrmClientType.objects.filter(id=1).first(), "crm_category":CrmClientCategory.objects.filter(id=1).first()
|
||||
},
|
||||
{"id":3,"name":"Emma Barton","fullname":"Emma Barton","firstname":"Emma","secondname":"Barton","sys_user": User.objects.filter(id=1003).first()
|
||||
,"house_id":3,"house_name":AdrHouse.objects.filter(id=3).first().address_sv, "lat":AdrHouse.objects.filter(id=3).first().lat, "lon":AdrHouse.objects.filter(id=3).first().lon
|
||||
,"flat":"10"
|
||||
,"crm_type":CrmType.objects.filter(id=1).first(), "crm_category":CrmCategory.objects.filter(id=1).first()
|
||||
,"crm_type":CrmClientType.objects.filter(id=1).first(), "crm_category":CrmClientCategory.objects.filter(id=1).first()
|
||||
},
|
||||
{"id":4,"name":"Karl Bruno","fullname":"Karl Bruno","firstname":"Karl","secondname":"Bruno","sys_user": User.objects.filter(id=1004).first()
|
||||
,"house_id":4,"house_name":AdrHouse.objects.filter(id=4).first().address_sv, "lat":AdrHouse.objects.filter(id=4).first().lat, "lon":AdrHouse.objects.filter(id=4).first().lon
|
||||
,"flat":"10"
|
||||
,"crm_type":CrmType.objects.filter(id=1).first(), "crm_category":CrmCategory.objects.filter(id=1).first()
|
||||
,"crm_type":CrmClientType.objects.filter(id=1).first(), "crm_category":CrmClientCategory.objects.filter(id=1).first()
|
||||
},
|
||||
{"id":5,"name":"Lora Chris","fullname":"Lora Chris","firstname":"Lora","secondname":"Chris","sys_user": User.objects.filter(id=1005).first()
|
||||
,"house_id":5,"house_name":AdrHouse.objects.filter(id=5).first().address_sv, "lat":AdrHouse.objects.filter(id=5).first().lat, "lon":AdrHouse.objects.filter(id=5).first().lon
|
||||
,"flat":"10"
|
||||
,"crm_type":CrmType.objects.filter(id=1).first(), "crm_category":CrmCategory.objects.filter(id=1).first()
|
||||
,"crm_type":CrmClientType.objects.filter(id=1).first(), "crm_category":CrmClientCategory.objects.filter(id=1).first()
|
||||
},
|
||||
{"id":6,"name":"Maria Cox","fullname":"Maria Cox","firstname":"Maria","secondname":"Cox","sys_user": User.objects.filter(id=1006).first()
|
||||
,"house_id":6,"house_name":AdrHouse.objects.filter(id=6).first().address_sv, "lat":AdrHouse.objects.filter(id=6).first().lat, "lon":AdrHouse.objects.filter(id=6).first().lon
|
||||
,"flat":"10"
|
||||
,"crm_type":CrmType.objects.filter(id=2).first(), "crm_category":CrmCategory.objects.filter(id=1).first()
|
||||
,"crm_type":CrmClientType.objects.filter(id=2).first(), "crm_category":CrmClientCategory.objects.filter(id=1).first()
|
||||
},
|
||||
{"id":7,"name":"Sam Diaz","fullname":"Sam Diaz","firstname":"Sam","secondname":"Diaz","sys_user": User.objects.filter(id=1007).first()
|
||||
,"house_id":7,"house_name":AdrHouse.objects.filter(id=7).first().address_sv, "lat":AdrHouse.objects.filter(id=7).first().lat, "lon":AdrHouse.objects.filter(id=7).first().lon
|
||||
,"flat":"10"
|
||||
,"crm_type":CrmType.objects.filter(id=2).first(), "crm_category":CrmCategory.objects.filter(id=1).first()
|
||||
,"crm_type":CrmClientType.objects.filter(id=2).first(), "crm_category":CrmClientCategory.objects.filter(id=1).first()
|
||||
},
|
||||
{"id":8,"name":"Tobi Fisher","fullname":"Tobi Fisher","firstname":"Tobi","secondname":"Fisher","sys_user": User.objects.filter(id=1008).first()
|
||||
,"house_id":8,"house_name":AdrHouse.objects.filter(id=8).first().address_sv, "lat":AdrHouse.objects.filter(id=8).first().lat, "lon":AdrHouse.objects.filter(id=8).first().lon
|
||||
,"flat":"10"
|
||||
,"crm_type":CrmType.objects.filter(id=2).first(), "crm_category":CrmCategory.objects.filter(id=1).first()
|
||||
,"crm_type":CrmClientType.objects.filter(id=2).first(), "crm_category":CrmClientCategory.objects.filter(id=1).first()
|
||||
},
|
||||
{"id":9,"name":"Victor Smith","fullname":"Victor Smith","firstname":"Viktor","secondname":"Smith","sys_user": User.objects.filter(id=1009).first()
|
||||
,"house_id":9,"house_name":AdrHouse.objects.filter(id=9).first().address_sv, "lat":AdrHouse.objects.filter(id=9).first().lat, "lon":AdrHouse.objects.filter(id=9).first().lon
|
||||
,"flat":"10"
|
||||
,"crm_type":CrmType.objects.filter(id=2).first(), "crm_category":CrmCategory.objects.filter(id=2).first()
|
||||
,"crm_type":CrmClientType.objects.filter(id=2).first(), "crm_category":CrmClientCategory.objects.filter(id=2).first()
|
||||
},
|
||||
{"id":10,"name":"Viki Good","fullname":"Viki Good","firstname":"Viki","secondname":"Good","sys_user": User.objects.filter(id=1010).first()
|
||||
,"house_id":10,"house_name":AdrHouse.objects.filter(id=10).first().address_sv, "lat":AdrHouse.objects.filter(id=10).first().lat, "lon":AdrHouse.objects.filter(id=10).first().lon
|
||||
,"flat":"10"
|
||||
,"crm_type":CrmType.objects.filter(id=2).first(), "crm_category":CrmCategory.objects.filter(id=2).first()
|
||||
,"crm_type":CrmClientType.objects.filter(id=2).first(), "crm_category":CrmClientCategory.objects.filter(id=2).first()
|
||||
},
|
||||
]
|
||||
for item in data_list:
|
||||
|
|
@ -1239,10 +1235,10 @@ def demoSetupEn():
|
|||
{"id":4,"name":"slareqclient4","description":"slareqclient4","period":1400,"client_id":4, "client_name":CrmClient.objects.filter(id=4).first().name},
|
||||
{"id":5,"name":"slareqclient5","description":"slareqclient5","period":6400,"client_id":5, "client_name":CrmClient.objects.filter(id=5).first().name},
|
||||
{"id":6,"name":"slareqclient6","description":"slareqclient6","period":6400,"client_id":6, "client_name":CrmClient.objects.filter(id=6).first().name},
|
||||
{"id":7,"name":"slareqtype1","description":"slareqtype1","period":12400,"client_type_id":1, "client_type_name":CrmType.objects.filter(id=1).first().name},
|
||||
{"id":8,"name":"slareqtype2","description":"slareqtype2","period":32400,"client_type_id":2, "client_type_name":CrmType.objects.filter(id=2).first().name},
|
||||
{"id":9,"name":"slareqcategory1","description":"slareqcategory1","period":1200,"client_category_id":1, "client_category_name":CrmCategory.objects.filter(id=1).first().name},
|
||||
{"id":10,"name":"slareqcategory2","description":"slareqcategory2","period":32000,"client_category_id":2, "client_category_name":CrmCategory.objects.filter(id=2).first().name},
|
||||
{"id":7,"name":"slareqtype1","description":"slareqtype1","period":12400,"client_type_id":1, "client_type_name":CrmClientType.objects.filter(id=1).first().name},
|
||||
{"id":8,"name":"slareqtype2","description":"slareqtype2","period":32400,"client_type_id":2, "client_type_name":CrmClientType.objects.filter(id=2).first().name},
|
||||
{"id":9,"name":"slareqcategory1","description":"slareqcategory1","period":1200,"client_category_id":1, "client_category_name":CrmClientCategory.objects.filter(id=1).first().name},
|
||||
{"id":10,"name":"slareqcategory2","description":"slareqcategory2","period":32000,"client_category_id":2, "client_category_name":CrmClientCategory.objects.filter(id=2).first().name},
|
||||
{"id":11,"name":"slareqservice19","description":"slareqservice19","period":3600,"service_id":19, "service_name":SrvService.objects.filter(id=19).first().name},
|
||||
{"id":12,"name":"slareqservice20","description":"slareqservice20","period":3600,"service_id":20, "service_name":SrvService.objects.filter(id=20).first().name},
|
||||
{"id":13,"name":"slareqservicetype1","description":"slareqservicetype1","period":1200,"service_type_id":1, "service_type_name":SrvType.objects.filter(id=1).first().name},
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@ from collections import defaultdict
|
|||
|
||||
from django.contrib.auth import get_user_model
|
||||
from django.db import transaction
|
||||
from django.db.models import F, Q
|
||||
from django.db.models import Q
|
||||
from django.utils import timezone
|
||||
|
||||
from ..models.modelSys import (
|
||||
SysClientModuleMembership,
|
||||
SysModuleAccessProfile,
|
||||
SysModuleMembership,
|
||||
SysProfile,
|
||||
SysNavigate,
|
||||
SysProfileEmployee,
|
||||
)
|
||||
|
||||
|
||||
|
|
@ -27,6 +27,36 @@ def _resolve_employee(user_or_employee):
|
|||
raise TypeError("Expected a SysEmployee or Django user")
|
||||
|
||||
|
||||
def refresh_profile_grants(employee, removed_profiles=()):
|
||||
"""Keep direct grants in sync when profile assignments are removed."""
|
||||
|
||||
remaining = SysProfile.objects.filter(
|
||||
employee_assignments__employee=employee,
|
||||
employee_assignments__is_active=True,
|
||||
is_active=True,
|
||||
).distinct()
|
||||
remaining_permission_ids = set(remaining.values_list(
|
||||
"permissions__id", flat=True,
|
||||
))
|
||||
remaining_navigation_ids = set(remaining.values_list(
|
||||
"navigations__id", flat=True,
|
||||
))
|
||||
removed_permission_ids = {
|
||||
value for profile in removed_profiles
|
||||
for value in profile.permissions.values_list("id", flat=True)
|
||||
}
|
||||
removed_navigation_ids = {
|
||||
value for profile in removed_profiles
|
||||
for value in profile.navigations.values_list("id", flat=True)
|
||||
}
|
||||
employee.permissions.remove(*(
|
||||
removed_permission_ids - remaining_permission_ids
|
||||
))
|
||||
employee.navigations.remove(*(
|
||||
removed_navigation_ids - remaining_navigation_ids
|
||||
))
|
||||
|
||||
|
||||
@transaction.atomic
|
||||
def apply_access_profiles(user_or_employee, profiles, *, replace=False):
|
||||
"""Apply profiles, creating one membership per affected module.
|
||||
|
|
@ -39,15 +69,15 @@ def apply_access_profiles(user_or_employee, profiles, *, replace=False):
|
|||
profile_list = list(profiles)
|
||||
profiles_by_module = defaultdict(list)
|
||||
for profile in profile_list:
|
||||
if not isinstance(profile, SysModuleAccessProfile):
|
||||
raise TypeError("profiles must contain SysModuleAccessProfile objects")
|
||||
if not isinstance(profile, SysProfile):
|
||||
raise TypeError("profiles must contain SysProfile objects")
|
||||
if not profile.is_active:
|
||||
raise ValueError(f"Access profile {profile.code!r} is inactive")
|
||||
profiles_by_module[profile.module_id].append(profile)
|
||||
|
||||
memberships = []
|
||||
for module_id, module_profiles in profiles_by_module.items():
|
||||
membership, _ = SysModuleMembership.objects.select_for_update().get_or_create(
|
||||
membership, _ = SysProfileEmployee.objects.select_for_update().get_or_create(
|
||||
employee=employee,
|
||||
module_id=module_id,
|
||||
defaults={"is_active": True},
|
||||
|
|
@ -62,6 +92,16 @@ def apply_access_profiles(user_or_employee, profiles, *, replace=False):
|
|||
membership.profiles.set(module_profiles)
|
||||
else:
|
||||
membership.profiles.add(*module_profiles)
|
||||
employee.permissions.add(*[
|
||||
permission
|
||||
for profile in module_profiles
|
||||
for permission in profile.permissions.all()
|
||||
])
|
||||
employee.navigations.add(*[
|
||||
navigation
|
||||
for profile in module_profiles
|
||||
for navigation in profile.navigations.all()
|
||||
])
|
||||
memberships.append(membership)
|
||||
return memberships
|
||||
|
||||
|
|
@ -82,13 +122,13 @@ def revoke_access_profiles(user_or_employee, profiles):
|
|||
profile_list = list(profiles)
|
||||
profiles_by_module = defaultdict(list)
|
||||
for profile in profile_list:
|
||||
if not isinstance(profile, SysModuleAccessProfile):
|
||||
raise TypeError("profiles must contain SysModuleAccessProfile objects")
|
||||
if not isinstance(profile, SysProfile):
|
||||
raise TypeError("profiles must contain SysProfile objects")
|
||||
profiles_by_module[profile.module_id].append(profile)
|
||||
|
||||
memberships = []
|
||||
for module_id, module_profiles in profiles_by_module.items():
|
||||
membership = SysModuleMembership.objects.select_for_update().filter(
|
||||
membership = SysProfileEmployee.objects.select_for_update().filter(
|
||||
employee=employee, module_id=module_id,
|
||||
).first()
|
||||
if membership is None:
|
||||
|
|
@ -97,6 +137,7 @@ def revoke_access_profiles(user_or_employee, profiles):
|
|||
if not membership.profiles.exists() and membership.is_active:
|
||||
membership.is_active = False
|
||||
membership.save(update_fields=("is_active", "updated_at"))
|
||||
refresh_profile_grants(employee, module_profiles)
|
||||
memberships.append(membership)
|
||||
return memberships
|
||||
|
||||
|
|
@ -105,7 +146,7 @@ def user_has_module_profile(user, module_id, profile_code=None):
|
|||
"""Return whether a user has an active, currently valid membership."""
|
||||
|
||||
now = timezone.now()
|
||||
memberships = SysModuleMembership.objects.filter(
|
||||
memberships = SysProfileEmployee.objects.filter(
|
||||
employee__sys_user=user,
|
||||
employee__is_active=True,
|
||||
module_id=module_id,
|
||||
|
|
@ -123,50 +164,49 @@ def user_has_module_profile(user, module_id, profile_code=None):
|
|||
def get_user_module_membership(user, module_id):
|
||||
if not getattr(user, "is_authenticated", False):
|
||||
return None
|
||||
return SysModuleMembership.objects.filter(
|
||||
return SysProfileEmployee.objects.filter(
|
||||
employee__sys_user=user, module_id=module_id, is_active=True,
|
||||
).select_related("employee", "employee__sys_user").first()
|
||||
|
||||
|
||||
def get_user_permission_codes(user):
|
||||
"""Return atomic permissions granted by active employee memberships."""
|
||||
"""Return permissions granted directly through SysEmployee.permissions."""
|
||||
|
||||
if not getattr(user, "is_authenticated", False):
|
||||
return set()
|
||||
if getattr(user, "is_superuser", False):
|
||||
return {("*", "*", "*")}
|
||||
cached = getattr(user, "_wanitil_permission_codes", None)
|
||||
if cached is not None:
|
||||
return cached
|
||||
now = timezone.now()
|
||||
grants = set(
|
||||
SysModuleMembership.objects.filter(
|
||||
employee__sys_user=user,
|
||||
employee__is_active=True,
|
||||
is_active=True,
|
||||
profiles__is_active=True,
|
||||
profiles__permissions__isnull=False,
|
||||
).filter(
|
||||
Q(valid_from__isnull=True) | Q(valid_from__lte=now),
|
||||
Q(valid_until__isnull=True) | Q(valid_until__gte=now),
|
||||
).values_list(
|
||||
"profiles__permissions__module",
|
||||
"profiles__permissions__action",
|
||||
"profiles__permissions__resource",
|
||||
user.sys_employee.permissions.values_list(
|
||||
"module", "action", "resource",
|
||||
)
|
||||
)
|
||||
) if hasattr(user, "sys_employee") and user.sys_employee.is_active else set()
|
||||
# The Django user instance is request-scoped. This avoids repeating the
|
||||
# same permission query for every permission class without stale global
|
||||
# cache invalidation concerns.
|
||||
user._wanitil_permission_codes = grants
|
||||
return grants
|
||||
|
||||
|
||||
def get_user_navigation_codes(user):
|
||||
"""Return navigation identifiers assigned directly to the employee."""
|
||||
|
||||
if not getattr(user, "is_authenticated", False):
|
||||
return set()
|
||||
if getattr(user, "is_superuser", False):
|
||||
return set(SysNavigate.objects.filter(is_active=True).values_list("id", flat=True))
|
||||
codes = set(user.sys_employee.navigations.filter(
|
||||
is_active=True,
|
||||
).values_list("id", flat=True)) if (
|
||||
hasattr(user, "sys_employee") and user.sys_employee.is_active
|
||||
) else set()
|
||||
return codes
|
||||
|
||||
|
||||
def user_has_permission_code(user, code):
|
||||
"""Check an exact code, supporting ``*`` wildcards in granted codes."""
|
||||
|
||||
try:
|
||||
module, action, resource = code.split(":")
|
||||
module, resource, action = code.split(":")
|
||||
except ValueError:
|
||||
return False
|
||||
grants = get_user_permission_codes(user)
|
||||
|
|
@ -180,42 +220,20 @@ def user_has_permission_code(user, code):
|
|||
|
||||
|
||||
def get_client_permission_codes(user):
|
||||
"""Return atomic permissions granted to the authenticated CRM client."""
|
||||
"""Compatibility selector; all access now comes from SysEmployee."""
|
||||
return get_user_permission_codes(user)
|
||||
|
||||
if not getattr(user, "is_authenticated", False):
|
||||
return set()
|
||||
cached = getattr(user, "_wanitil_client_permission_codes", None)
|
||||
if cached is not None:
|
||||
return cached
|
||||
client = getattr(user, "crm_client", None)
|
||||
if client is None:
|
||||
return set()
|
||||
now = timezone.now()
|
||||
grants = set(
|
||||
SysClientModuleMembership.objects.filter(
|
||||
client=client,
|
||||
is_active=True,
|
||||
profiles__is_active=True,
|
||||
profiles__permissions__isnull=False,
|
||||
profiles__module=F("module"),
|
||||
).filter(
|
||||
Q(valid_from__isnull=True) | Q(valid_from__lte=now),
|
||||
Q(valid_until__isnull=True) | Q(valid_until__gte=now),
|
||||
).values_list(
|
||||
"profiles__permissions__module",
|
||||
"profiles__permissions__action",
|
||||
"profiles__permissions__resource",
|
||||
)
|
||||
)
|
||||
user._wanitil_client_permission_codes = grants
|
||||
return grants
|
||||
|
||||
def get_client_navigation_codes(user):
|
||||
"""Compatibility selector; all navigation now comes from SysEmployee."""
|
||||
return get_user_navigation_codes(user)
|
||||
|
||||
|
||||
def client_has_permission_code(user, code):
|
||||
"""Check a client permission code, including wildcard grants."""
|
||||
|
||||
try:
|
||||
module, action, resource = code.split(":")
|
||||
module, resource, action = code.split(":")
|
||||
except ValueError:
|
||||
return False
|
||||
grants = get_client_permission_codes(user)
|
||||
|
|
|
|||
|
|
@ -1,20 +1,20 @@
|
|||
##MANAGMENTS
|
||||
MMANAGMENT_SYS = 1000
|
||||
MMANAGMENT_SYS = "sys"
|
||||
|
||||
MANAGMENT_CON = 1100
|
||||
MANAGMENT_EMP = 1200
|
||||
MANAGMENT_ADR = 2100
|
||||
MANAGMENT_CON = "con"
|
||||
MANAGMENT_EMP = "emp"
|
||||
MANAGMENT_ADR = "adr"
|
||||
|
||||
MANAGMENT_CRM = 3100
|
||||
MANAGMENT_SRV = 3200
|
||||
MANAGMENT_CRM = "crm"
|
||||
MANAGMENT_SRV = "srv"
|
||||
|
||||
MANAGMENT_DEV = 4100
|
||||
MANAGMENT_CI = 4200
|
||||
MANAGMENT_DEV = "dev"
|
||||
MANAGMENT_CI = "cim"
|
||||
|
||||
MANAGMENT_REQ = 11100
|
||||
MANAGMENT_INC = 11200
|
||||
MANAGMENT_REQ = "req"
|
||||
MANAGMENT_INC = "inc"
|
||||
|
||||
MANAGMENT_SLA = 21100
|
||||
MANAGMENT_SLA = "sla"
|
||||
|
||||
##SLA CURRENT STATUS
|
||||
SLA_STATUS_NOTDEFINED = 0
|
||||
|
|
|
|||
|
|
@ -300,7 +300,7 @@ sysrolekit_n_sysrole_data = [
|
|||
sys_object_data = [
|
||||
{"id":1001,"name":"sysuser","description":"sysuser","sys_managment_id":1000,"prefix":"SSUSR","url":"","spec_field":"","sys_name":"SysUser"},
|
||||
{"id":1003,"name":"sysemployee","description":"System employee","sys_managment_id":1000,"prefix":"SSEMP","url":"","spec_field":"","sys_name":"SysEmployee"},
|
||||
{"id":1004,"name":"sysmodulemembership","description":"System module membership","sys_managment_id":1000,"prefix":"SSMEM","url":"","spec_field":"","sys_name":"SysModuleMembership"},
|
||||
{"id":1004,"name":"sysprofileemployee","description":"System profile employee","sys_managment_id":1000,"prefix":"SSMEM","url":"","spec_field":"","sys_name":"SysProfileEmployee"},
|
||||
{"id":1006,"name":"sysdepartment","description":"Organizational department","sys_managment_id":1000,"prefix":"SSDEP","url":"","spec_field":"","sys_name":"SysDepartment"},
|
||||
{"id":1011,"name":"sysmanagment","description":"sysmanagment","sys_managment_id":1000,"prefix":"SSMAN","url":"","spec_field":"","sys_name":"SysManagment"},
|
||||
{"id":1012,"name":"sysobject","description":"sysobject","sys_managment_id":1000,"prefix":"SSOBJ","url":"","spec_field":"","sys_name":"SysObject"},
|
||||
|
|
@ -345,8 +345,8 @@ sys_object_data = [
|
|||
{"id":3102,"name":"crmlead","description":"CRM leads","sys_managment_id":3100,"prefix":"CRLED","url":"","spec_field":"","sys_name":"CrmLead"},
|
||||
{"id":3103,"name":"crmcontract","description":"crmcontract","sys_managment_id":3100,"prefix":"CRCNR","url":"","spec_field":"","sys_name":"CrmContract"},
|
||||
{"id":3105,"name":"crmsettings","description":"CRM settings","sys_managment_id":3100,"prefix":"CRSET","url":"","spec_field":"","sys_name":"CrmSettings"},
|
||||
{"id":3111,"name":"crmtype","description":"crmtype","sys_managment_id":3100,"prefix":"CRTYP","url":"","spec_field":"","sys_name":"CrmType"},
|
||||
{"id":3112,"name":"crmcategory","description":"crmcategory","sys_managment_id":3100,"prefix":"CRCAT","url":"","spec_field":"","sys_name":"CrmCategory"},
|
||||
{"id":3111,"name":"crmclienttype","description":"crmclienttype","sys_managment_id":3100,"prefix":"CRTYP","url":"","spec_field":"","sys_name":"CrmClientType"},
|
||||
{"id":3112,"name":"crmclientcategory","description":"crmclientcategory","sys_managment_id":3100,"prefix":"CRCAT","url":"","spec_field":"","sys_name":"CrmClientCategory"},
|
||||
{"id":3201,"name":"srvstatus","description":"srvstatus","sys_managment_id":3200,"prefix":"SRSTA","url":"","spec_field":"","sys_name":"SrvStatus"},
|
||||
{"id":3203,"name":"srvservice","description":"srvservice","sys_managment_id":3200,"prefix":"SRSRV","url":"","spec_field":"","sys_name":"SrvService"},
|
||||
{"id":3204,"name":"srvtype","description":"srvtype","sys_managment_id":3200,"prefix":"SRTYP","url":"","spec_field":"","sys_name":"SrvType"},
|
||||
|
|
@ -410,7 +410,6 @@ sys_field_data = [
|
|||
{"id":100103,"name":"email","sysname":"email","type":"str","sys_object_id":1001,"rel_object_id":None,"searchtype":"str","searchname":"","searchlist":"","searchlistname":""},
|
||||
{"id":100311,"name":"lang","sysname":"lang","type":"int","sys_object_id":1003,"rel_object_id":None,"searchtype":"int","searchname":"","searchlist":"","searchlistname":""},
|
||||
{"id":100312,"name":"theme_color","sysname":"theme_color","type":"str","sys_object_id":1003,"rel_object_id":None,"searchtype":"str","searchname":"","searchlist":"","searchlistname":""},
|
||||
{"id":100313,"name":"status","sysname":"status","type":"int","sys_object_id":1003,"rel_object_id":None,"searchtype":"int","searchname":"","searchlist":"","searchlistname":""},
|
||||
{"id":100314,"name":"theme_is_light","sysname":"theme_is_light","type":"bool","sys_object_id":1003,"rel_object_id":None,"searchtype":"bool","searchname":"","searchlist":"","searchlistname":""},
|
||||
{"id":100315,"name":"timezone","sysname":"timezone","type":"int","sys_object_id":1003,"rel_object_id":None,"searchtype":"int","searchname":"","searchlist":"","searchlistname":""},
|
||||
{"id":100371,"name":"sys_user","sysname":"sys_user","type":"rel","sys_object_id":1003,"rel_object_id":1001,"searchtype":"","searchname":"","searchlist":"","searchlistname":""},
|
||||
|
|
@ -418,15 +417,13 @@ sys_field_data = [
|
|||
{"id":100502,"name":"name","sysname":"name","type":"str","sys_object_id":1005,"rel_object_id":None,"searchtype":"str","searchname":"","searchlist":"","searchlistname":""},
|
||||
{"id":100571,"name":"sys_managment","sysname":"sys_managment","type":"rel","sys_object_id":1005,"rel_object_id":1011,"searchtype":"","searchname":"","searchlist":"","searchlistname":""},
|
||||
{"id":100572,"name":"sys_user","sysname":"sys_user","type":"rel","sys_object_id":1005,"rel_object_id":1001,"searchtype":"","searchname":"","searchlist":"","searchlistname":""},
|
||||
{"id":101101,"name":"id","sysname":"id","type":"int","sys_object_id":1011,"rel_object_id":None,"searchtype":"int","searchname":"id","searchlist":"","searchlistname":""},
|
||||
{"id":101102,"name":"name","sysname":"name","type":"str","sys_object_id":1011,"rel_object_id":None,"searchtype":"str","searchname":"name","searchlist":"","searchlistname":""},
|
||||
{"id":101101,"name":"id","sysname":"id","type":"str","sys_object_id":1011,"rel_object_id":None,"searchtype":"str","searchname":"id","searchlist":"","searchlistname":""},
|
||||
{"id":101103,"name":"description","sysname":"description","type":"str","sys_object_id":1011,"rel_object_id":None,"searchtype":"str","searchname":"description","searchlist":"","searchlistname":""},
|
||||
{"id":101111,"name":"isext","sysname":"isext","type":"str","sys_object_id":1011,"rel_object_id":None,"searchtype":"bool","searchname":"isext","searchlist":"","searchlistname":""},
|
||||
{"id":101112,"name":"urldomain","sysname":"urldomain","type":"str","sys_object_id":1011,"rel_object_id":None,"searchtype":"str","searchname":"urldomain","searchlist":"","searchlistname":""},
|
||||
{"id":101113,"name":"urlport","sysname":"urlport","type":"str","sys_object_id":1011,"rel_object_id":None,"searchtype":"str","searchname":"urlport","searchlist":"","searchlistname":""},
|
||||
{"id":101114,"name":"urlapi","sysname":"urlapi","type":"str","sys_object_id":1011,"rel_object_id":None,"searchtype":"str","searchname":"urlapi","searchlist":"","searchlistname":""},
|
||||
{"id":101201,"name":"id","sysname":"id","type":"int","sys_object_id":1012,"rel_object_id":None,"searchtype":"int","searchname":"","searchlist":"","searchlistname":""},
|
||||
{"id":101202,"name":"name","sysname":"name","type":"str","sys_object_id":1012,"rel_object_id":None,"searchtype":"str","searchname":"","searchlist":"","searchlistname":""},
|
||||
{"id":101201,"name":"id","sysname":"id","type":"str","sys_object_id":1012,"rel_object_id":None,"searchtype":"str","searchname":"","searchlist":"","searchlistname":""},
|
||||
{"id":101203,"name":"description","sysname":"description","type":"str","sys_object_id":1012,"rel_object_id":None,"searchtype":"str","searchname":"","searchlist":"","searchlistname":""},
|
||||
{"id":101211,"name":"url","sysname":"url","type":"str","sys_object_id":1012,"rel_object_id":None,"searchtype":"str","searchname":"","searchlist":"","searchlistname":""},
|
||||
{"id":101212,"name":"prefix","sysname":"prefix","type":"str","sys_object_id":1012,"rel_object_id":None,"searchtype":"str","searchname":"","searchlist":"","searchlistname":""},
|
||||
|
|
@ -559,10 +556,12 @@ sys_field_data = [
|
|||
{"id":212273,"name":"adr_street","sysname":"adr_street","type":"rel","sys_object_id":2122,"rel_object_id":2108,"searchtype":"","searchname":"","searchlist":"","searchlistname":""},
|
||||
{"id":311101,"name":"id","sysname":"id","type":"int","sys_object_id":3111,"rel_object_id":None,"searchtype":"int","searchname":"","searchlist":"","searchlistname":""},
|
||||
{"id":311102,"name":"name","sysname":"name","type":"str","sys_object_id":3111,"rel_object_id":None,"searchtype":"str","searchname":"","searchlist":"","searchlistname":""},
|
||||
{"id":311103,"name":"description","sysname":"description","type":"str","sys_object_id":3111,"rel_object_id":None,"searchtype":"str","searchname":"","searchlist":"","searchlistname":""},
|
||||
{"id":311103,"name":"description","sysname":"description","type":"str","sys_object_id":3111,"rel_object_id":None,"searchtype":"str","searchname":"","searchlist":"","searchlistname":""},
|
||||
{"id":311104,"name":"color","sysname":"color","type":"str","sys_object_id":3111,"rel_object_id":None,"searchtype":"str","searchname":"","searchlist":"","searchlistname":""},
|
||||
{"id":311201,"name":"id","sysname":"id","type":"int","sys_object_id":3112,"rel_object_id":None,"searchtype":"int","searchname":"","searchlist":"","searchlistname":""},
|
||||
{"id":311202,"name":"name","sysname":"name","type":"str","sys_object_id":3112,"rel_object_id":None,"searchtype":"str","searchname":"","searchlist":"","searchlistname":""},
|
||||
{"id":311203,"name":"description","sysname":"description","type":"str","sys_object_id":3112,"rel_object_id":None,"searchtype":"str","searchname":"","searchlist":"","searchlistname":""},
|
||||
{"id":311203,"name":"description","sysname":"description","type":"str","sys_object_id":3112,"rel_object_id":None,"searchtype":"str","searchname":"","searchlist":"","searchlistname":""},
|
||||
{"id":311204,"name":"color","sysname":"color","type":"str","sys_object_id":3112,"rel_object_id":None,"searchtype":"str","searchname":"","searchlist":"","searchlistname":""},
|
||||
{"id":310101,"name":"id","sysname":"id","type":"int","sys_object_id":3101,"rel_object_id":None,"searchtype":"int","searchname":"","searchlist":"","searchlistname":""},
|
||||
{"id":310102,"name":"name","sysname":"name","type":"str","sys_object_id":3101,"rel_object_id":None,"searchtype":"str","searchname":"","searchlist":"","searchlistname":""},
|
||||
{"id":310105,"name":"fullname","sysname":"fullname","type":"str","sys_object_id":3101,"rel_object_id":None,"searchtype":"str","searchname":"","searchlist":"","searchlistname":""},
|
||||
|
|
@ -579,6 +578,7 @@ sys_field_data = [
|
|||
{"id":310171,"name":"sys_user","sysname":"sys_user","type":"rel","sys_object_id":3101,"rel_object_id":1001,"searchtype":"","searchname":"","searchlist":"","searchlistname":""},
|
||||
{"id":310172,"name":"crm_type","sysname":"crm_type","type":"rel","sys_object_id":3101,"rel_object_id":3111,"searchtype":"","searchname":"","searchlist":"","searchlistname":""},
|
||||
{"id":310173,"name":"crm_category","sysname":"crm_category","type":"rel","sys_object_id":3101,"rel_object_id":3112,"searchtype":"","searchname":"","searchlist":"","searchlistname":""},
|
||||
{"id":310174,"name":"assigned","sysname":"assigned","type":"rel","sys_object_id":3101,"rel_object_id":1003,"searchtype":"","searchname":"","searchlist":"","searchlistname":""},
|
||||
{"id":310201,"name":"id","sysname":"id","type":"int","sys_object_id":3102,"rel_object_id":None,"searchtype":"int","searchname":"","searchlist":"","searchlistname":""},
|
||||
{"id":310202,"name":"name","sysname":"name","type":"str","sys_object_id":3102,"rel_object_id":None,"searchtype":"str","searchname":"","searchlist":"","searchlistname":""},
|
||||
{"id":310203,"name":"status","sysname":"status","type":"str","sys_object_id":3102,"rel_object_id":None,"searchtype":"str","searchname":"","searchlist":"new,in_progress,qualified,dropped","searchlistname":"Новый,В работе,Квалифицирован,Сброшен"},
|
||||
|
|
@ -588,7 +588,7 @@ sys_field_data = [
|
|||
{"id":310207,"name":"comment","sysname":"comment","type":"str","sys_object_id":3102,"rel_object_id":None,"searchtype":"str","searchname":"","searchlist":"","searchlistname":""},
|
||||
{"id":310208,"name":"created_at","sysname":"created_at","type":"datetime","sys_object_id":3102,"rel_object_id":None,"searchtype":"datetime","searchname":"","searchlist":"","searchlistname":""},
|
||||
{"id":310209,"name":"updated_at","sysname":"updated_at","type":"datetime","sys_object_id":3102,"rel_object_id":None,"searchtype":"datetime","searchname":"","searchlist":"","searchlistname":""},
|
||||
{"id":310271,"name":"responsible","sysname":"responsible","type":"rel","sys_object_id":3102,"rel_object_id":1004,"searchtype":"","searchname":"","searchlist":"","searchlistname":""},
|
||||
{"id":310271,"name":"assigned","sysname":"assigned","type":"rel","sys_object_id":3102,"rel_object_id":1003,"searchtype":"","searchname":"","searchlist":"","searchlistname":""},
|
||||
{"id":310301,"name":"id","sysname":"id","type":"int","sys_object_id":3103,"rel_object_id":None,"searchtype":"int","searchname":"","searchlist":"","searchlistname":""},
|
||||
{"id":310302,"name":"name","sysname":"name","type":"str","sys_object_id":3103,"rel_object_id":None,"searchtype":"str","searchname":"","searchlist":"","searchlistname":""},
|
||||
{"id":310303,"name":"description","sysname":"description","type":"str","sys_object_id":3103,"rel_object_id":None,"searchtype":"str","searchname":"","searchlist":"","searchlistname":""},
|
||||
|
|
@ -1252,10 +1252,15 @@ sys_field_search_data = [
|
|||
{"sys_object_id":3101,"name":"lon","val":"lon","type":"float"},
|
||||
{"sys_object_id":3101,"name":"type id" ,"val":"crm_type__id" ,"type":"int"},
|
||||
{"sys_object_id":3101,"name":"type name" ,"val":"crm_type__name" ,"type":"str"},
|
||||
{"sys_object_id":3101,"name":"type description" ,"val":"crm_type__description" ,"type":"str"},
|
||||
{"sys_object_id":3101,"name":"type description" ,"val":"crm_type__description" ,"type":"str"},
|
||||
{"sys_object_id":3101,"name":"type color","val":"crm_type__color","type":"str"},
|
||||
{"sys_object_id":3101,"name":"category id" ,"val":"crm_category__id" ,"type":"int"},
|
||||
{"sys_object_id":3101,"name":"category name" ,"val":"crm_category__name" ,"type":"str"},
|
||||
{"sys_object_id":3101,"name":"category description" ,"val":"crm_category__description" ,"type":"str"},
|
||||
{"sys_object_id":3101,"name":"category description" ,"val":"crm_category__description" ,"type":"str"},
|
||||
{"sys_object_id":3101,"name":"category color","val":"crm_category__color","type":"str"},
|
||||
{"sys_object_id":3101,"name":"assigned id","val":"assigned__id","type":"int"},
|
||||
{"sys_object_id":3101,"name":"assigned name","val":"assigned__name","type":"str"},
|
||||
{"sys_object_id":3101,"name":"assigned username","val":"assigned__sys_user__username","type":"str"},
|
||||
{"sys_object_id":3101,"name":"con_person__con_contact__type","val":"con_person__con_contact__type","type":"str"},
|
||||
{"sys_object_id":3101,"name":"con_person__con_contact__purpose","val":"con_person__con_contact__purpose","type":"str"},
|
||||
{"sys_object_id":3101,"name":"con_person__con_contact__value","val":"con_person__con_contact__value","type":"str"},
|
||||
|
|
@ -1271,9 +1276,9 @@ sys_field_search_data = [
|
|||
{"sys_object_id":3102,"name":"budget","val":"budget","type":"float"},
|
||||
{"sys_object_id":3102,"name":"need","val":"need","type":"str"},
|
||||
{"sys_object_id":3102,"name":"comment","val":"comment","type":"str"},
|
||||
{"sys_object_id":3102,"name":"responsible id","val":"responsible__id","type":"int"},
|
||||
{"sys_object_id":3102,"name":"responsible name","val":"responsible__name","type":"str"},
|
||||
{"sys_object_id":3102,"name":"responsible username","val":"responsible__sys_user__username","type":"str"},
|
||||
{"sys_object_id":3102,"name":"assigned id","val":"assigned__id","type":"int"},
|
||||
{"sys_object_id":3102,"name":"assigned name","val":"assigned__name","type":"str"},
|
||||
{"sys_object_id":3102,"name":"assigned username","val":"assigned__sys_user__username","type":"str"},
|
||||
{"sys_object_id":3102,"name":"created at","val":"created_at","type":"datetime"},
|
||||
{"sys_object_id":3102,"name":"updated at","val":"updated_at","type":"datetime"},
|
||||
{"sys_object_id":3103,"name":"id","val":"id","type":"int"},
|
||||
|
|
@ -1287,10 +1292,12 @@ sys_field_search_data = [
|
|||
{"sys_object_id":3103,"name":"date end","val":"date_end","type":"datetime"},
|
||||
{"sys_object_id":3111,"name":"id","val":"id","type":"int"},
|
||||
{"sys_object_id":3111,"name":"name","val":"name","type":"str"},
|
||||
{"sys_object_id":3111,"name":"description","val":"desription","type":"str"},
|
||||
{"sys_object_id":3111,"name":"description","val":"desription","type":"str"},
|
||||
{"sys_object_id":3111,"name":"color","val":"color","type":"str"},
|
||||
{"sys_object_id":3112,"name":"id","val":"id","type":"int"},
|
||||
{"sys_object_id":3112,"name":"name","val":"name","type":"str"},
|
||||
{"sys_object_id":3112,"name":"description","val":"desription","type":"str"},
|
||||
{"sys_object_id":3112,"name":"description","val":"desription","type":"str"},
|
||||
{"sys_object_id":3112,"name":"color","val":"color","type":"str"},
|
||||
{"sys_object_id":4101,"name":"id","val":"id","type":"int"},
|
||||
{"sys_object_id":4101,"name":"name","val":"name","type":"str"},
|
||||
{"sys_object_id":4101,"name":"description","val":"description","type":"str"},
|
||||
|
|
@ -1750,28 +1757,23 @@ sys_field_search_data = [
|
|||
{"sys_object_id":3206,"name":"description","val":"description","type":"str"},
|
||||
{"sys_object_id":3206,"name":"request id","val":"srv_request__id","type":"int"},
|
||||
{"sys_object_id":3206,"name":"request name","val":"srv_request__name","type":"str"},
|
||||
{"sys_object_id":1011,"name":"id","val":"id","type":"int"},
|
||||
{"sys_object_id":1011,"name":"name","val":"name","type":"str"},
|
||||
{"sys_object_id":1011,"name":"id","val":"id","type":"str"},
|
||||
{"sys_object_id":1011,"name":"description","val":"description","type":"str"},
|
||||
{"sys_object_id":1011,"name":"isext","val":"isext","type":"bool"},
|
||||
{"sys_object_id":1011,"name":"urldomain","val":"urldomain","type":"str"},
|
||||
{"sys_object_id":1011,"name":"urlport","val":"urlport","type":"str"},
|
||||
{"sys_object_id":1011,"name":"urlapi","val":"urlapi","type":"str"},
|
||||
{"sys_object_id":1012,"name":"id","val":"id","type":"int"},
|
||||
{"sys_object_id":1012,"name":"name","val":"name","type":"str"},
|
||||
{"sys_object_id":1012,"name":"id","val":"id","type":"str"},
|
||||
{"sys_object_id":1012,"name":"description","val":"description","type":"str"},
|
||||
{"sys_object_id":1012,"name":"prefix","val":"prefix","type":"str"},
|
||||
{"sys_object_id":1012,"name":"url","val":"url","type":"str"},
|
||||
{"sys_object_id":1012,"name":"spec field","val":"spec_field","type":"str"},
|
||||
{"sys_object_id":1012,"name":"managment id","val":"sys_managment__id","type":"int"},
|
||||
{"sys_object_id":1012,"name":"managment name","val":"sys_managment__name","type":"str"},
|
||||
{"sys_object_id":1012,"name":"managment id","val":"sys_managment__id","type":"str"},
|
||||
{"sys_object_id":1013,"name":"id","val":"id","type":"int"},
|
||||
{"sys_object_id":1013,"name":"name","val":"name","type":"str"},
|
||||
{"sys_object_id":1013,"name":"sysname","val":"sysname","type":"str"},
|
||||
{"sys_object_id":1013,"name":"object id","val":"sys_object__id","type":"int"},
|
||||
{"sys_object_id":1013,"name":"object name","val":"sys_object__name","type":"str"},
|
||||
{"sys_object_id":1013,"name":"rel object id","val":"rel_object__id","type":"int"},
|
||||
{"sys_object_id":1013,"name":"rel object name","val":"rel_object__name","type":"str"},
|
||||
{"sys_object_id":1013,"name":"object id","val":"sys_object__id","type":"str"},
|
||||
{"sys_object_id":1013,"name":"rel object id","val":"rel_object__id","type":"str"},
|
||||
{"sys_object_id":1013,"name":"type","val":"type","type":"str"},
|
||||
{"sys_object_id":1013,"name":"searchtype","val":"searchtype","type":"str"},
|
||||
{"sys_object_id":1013,"name":"searchname","val":"searchname","type":"str"},
|
||||
|
|
@ -1779,14 +1781,12 @@ sys_field_search_data = [
|
|||
{"sys_object_id":1013,"name":"searchlistname","val":"searchlistname","type":"str"},
|
||||
{"sys_object_id":1015,"name":"id","val":"id","type":"int"},
|
||||
{"sys_object_id":1015,"name":"name","val":"name","type":"str"},
|
||||
{"sys_object_id":1015,"name":"sys_object__id","val":"sys_object__id","type":"int" },
|
||||
{"sys_object_id":1015,"name":"sys_object__name","val":"sys_object__name","type":"str"},
|
||||
{"sys_object_id":1015,"name":"sys_object__id","val":"sys_object__id","type":"str" },
|
||||
{"sys_object_id":1015,"name":"type","val":"type","type":"str"},
|
||||
{"sys_object_id":1015,"name":"val","val":"val","type":"str"},
|
||||
{"sys_object_id":1005,"name":"id","val":"id","type":"int"},
|
||||
{"sys_object_id":1005,"name":"name","val":"name","type":"str"},
|
||||
{"sys_object_id":1005,"name":"managment id","val":"sys_managment__id","type":"int"},
|
||||
{"sys_object_id":1005,"name":"managment name","val":"sys_managment__name","type":"str"},
|
||||
{"sys_object_id":1005,"name":"user id","val":"sys_user__id","type":"int"},
|
||||
{"sys_object_id":1005,"name":"user username","val":"sys_user__username","type":"str"},
|
||||
{"sys_object_id":1007,"name":"id","val":"id","type":"int"},
|
||||
|
|
@ -1805,8 +1805,7 @@ sys_field_search_data = [
|
|||
{"sys_object_id":1052,"name":"holiday group name","val":"sys_holiday_group__name","type":"str"},
|
||||
{"sys_object_id":1027,"name":"id","val":"id","type":"int"},
|
||||
{"sys_object_id":1027,"name":"name","val":"name","type":"str"},
|
||||
{"sys_object_id":1027,"name":"object id","val":"sys_object__id","type":"int"},
|
||||
{"sys_object_id":1027,"name":"object name","val":"sys_object__name","type":"str"},
|
||||
{"sys_object_id":1027,"name":"object id","val":"sys_object__id","type":"str"},
|
||||
{"sys_object_id":1027,"name":"user id","val":"sys_user__id","type":"int"},
|
||||
{"sys_object_id":1027,"name":"user username","val":"sys_user__username","type":"str"},
|
||||
{"sys_object_id":1027,"name":"is all","val":"is_all","type":"bool"},
|
||||
|
|
@ -1828,7 +1827,6 @@ sys_field_search_data = [
|
|||
{"sys_object_id":1001,"name":"email","val":"email","type":"str"},
|
||||
{"sys_object_id":1001,"name":"employee name" ,"val":"sys_employee__name" ,"type":"str"},
|
||||
{"sys_object_id":1001,"name":"employee lang","val":"sys_employee__lang","type":"str"},
|
||||
{"sys_object_id":1001,"name":"employee status","val":"sys_employee__status","type":"int"},
|
||||
{"sys_object_id":1001,"name":"employee theme_is_light","val":"sys_employee__theme_is_light","type":"bool"},
|
||||
{"sys_object_id":1001,"name":"employee theme_color","val":"sys_employee__theme_color","type":"str"},
|
||||
{"sys_object_id":1001,"name":"employee timezone","val":"sys_employee__timezone","type":"int"},
|
||||
|
|
|
|||
|
|
@ -9,9 +9,9 @@ from wanitil.models.modelSys import (
|
|||
SysEmployee,
|
||||
SysManagment,
|
||||
SysModuleSettings,
|
||||
SysModuleAccessProfile,
|
||||
SysModuleMembership,
|
||||
SysPermission,
|
||||
SysProfile,
|
||||
SysProfileEmployee,
|
||||
SysNavigate, SysPermission,
|
||||
)
|
||||
|
||||
|
||||
|
|
@ -115,7 +115,7 @@ class Command(BaseCommand):
|
|||
))
|
||||
|
||||
for module in modules:
|
||||
profile, _ = SysModuleAccessProfile.objects.update_or_create(
|
||||
profile, _ = SysProfile.objects.update_or_create(
|
||||
module=module,
|
||||
code="system-admin",
|
||||
defaults={
|
||||
|
|
@ -127,12 +127,24 @@ class Command(BaseCommand):
|
|||
},
|
||||
)
|
||||
profile.permissions.add(wildcard)
|
||||
membership, _ = SysModuleMembership.objects.update_or_create(
|
||||
profile.navigations.set(
|
||||
SysNavigate.objects.filter(id__startswith=f"{module.id}:")
|
||||
)
|
||||
membership, _ = SysProfileEmployee.objects.update_or_create(
|
||||
employee=employee,
|
||||
module=module,
|
||||
defaults={"is_active": True},
|
||||
defaults={
|
||||
"is_active": True,
|
||||
# The deployment bootstrap must restore unconditional
|
||||
# access even if this membership was previously limited
|
||||
# or expired through the administration UI.
|
||||
"valid_from": None,
|
||||
"valid_until": None,
|
||||
},
|
||||
)
|
||||
membership.profiles.add(profile)
|
||||
employee.permissions.add(wildcard)
|
||||
employee.navigations.add(*profile.navigations.all())
|
||||
|
||||
action = "created" if created else "updated"
|
||||
self.stdout.write(self.style.SUCCESS(
|
||||
|
|
|
|||
|
|
@ -0,0 +1,25 @@
|
|||
from django.db import migrations
|
||||
|
||||
|
||||
def remove_employee_status_catalog_entries(apps, schema_editor):
|
||||
SysField = apps.get_model("wanitil", "SysField")
|
||||
SysFieldSearch = apps.get_model("wanitil", "SysFieldSearch")
|
||||
SysField.objects.filter(sys_object_id=1003, sysname="status").delete()
|
||||
SysFieldSearch.objects.filter(val="sys_employee__status").delete()
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
dependencies = [
|
||||
("wanitil", "0064_rename_sysemployee_display_name_to_name"),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.RunPython(
|
||||
remove_employee_status_catalog_entries,
|
||||
migrations.RunPython.noop,
|
||||
),
|
||||
migrations.RemoveField(
|
||||
model_name="sysemployee",
|
||||
name="status",
|
||||
),
|
||||
]
|
||||
|
|
@ -0,0 +1,74 @@
|
|||
import django.db.models.deletion
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
def migrate_lead_assignments(apps, schema_editor):
|
||||
CrmLead = apps.get_model("wanitil", "CrmLead")
|
||||
for lead in CrmLead.objects.exclude(responsible_id=None).iterator():
|
||||
lead.assigned_id = lead.responsible.employee_id
|
||||
lead.save(update_fields=("assigned",))
|
||||
|
||||
|
||||
def update_catalog(apps, schema_editor):
|
||||
SysField = apps.get_model("wanitil", "SysField")
|
||||
SysFieldSearch = apps.get_model("wanitil", "SysFieldSearch")
|
||||
for field_id, object_id in ((310174, 3101), (310271, 3102)):
|
||||
SysField.objects.update_or_create(
|
||||
pk=field_id,
|
||||
defaults={
|
||||
"name": "assigned", "sysname": "assigned", "type": "rel",
|
||||
"sys_object_id": object_id, "rel_object_id": 1003,
|
||||
"searchtype": "", "searchname": "", "searchlist": "",
|
||||
"searchlistname": "",
|
||||
},
|
||||
)
|
||||
SysFieldSearch.objects.filter(
|
||||
sys_object_id=3102, val__startswith="responsible__",
|
||||
).delete()
|
||||
for object_id in (3101, 3102):
|
||||
for label, value, field_type in (
|
||||
("assigned id", "assigned__id", "int"),
|
||||
("assigned name", "assigned__name", "str"),
|
||||
("assigned username", "assigned__sys_user__username", "str"),
|
||||
):
|
||||
SysFieldSearch.objects.get_or_create(
|
||||
sys_object_id=object_id, val=value,
|
||||
defaults={"name": label, "type": field_type},
|
||||
)
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
dependencies = [
|
||||
("wanitil", "0065_remove_sysemployee_status"),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name="crmclient",
|
||||
name="assigned",
|
||||
field=models.ForeignKey(
|
||||
blank=True, null=True,
|
||||
help_text="Employee assigned to the CRM client",
|
||||
on_delete=django.db.models.deletion.SET_NULL,
|
||||
related_name="assigned_crm_clients",
|
||||
to="wanitil.sysemployee",
|
||||
),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name="crmlead",
|
||||
name="assigned",
|
||||
field=models.ForeignKey(
|
||||
blank=True, null=True,
|
||||
help_text="Employee assigned to the CRM lead",
|
||||
on_delete=django.db.models.deletion.SET_NULL,
|
||||
related_name="assigned_crm_leads",
|
||||
to="wanitil.sysemployee",
|
||||
),
|
||||
),
|
||||
migrations.RunPython(
|
||||
migrate_lead_assignments,
|
||||
migrations.RunPython.noop,
|
||||
),
|
||||
migrations.RemoveField(model_name="crmlead", name="responsible"),
|
||||
migrations.RunPython(update_catalog, migrations.RunPython.noop),
|
||||
]
|
||||
|
|
@ -0,0 +1,57 @@
|
|||
from django.db import migrations, models
|
||||
|
||||
|
||||
def add_color_catalog_entries(apps, schema_editor):
|
||||
SysField = apps.get_model("wanitil", "SysField")
|
||||
SysFieldSearch = apps.get_model("wanitil", "SysFieldSearch")
|
||||
for field_id, object_id in ((311104, 3111), (311204, 3112)):
|
||||
SysField.objects.update_or_create(
|
||||
pk=field_id,
|
||||
defaults={
|
||||
"name": "color", "sysname": "color", "type": "str",
|
||||
"sys_object_id": object_id, "rel_object_id": None,
|
||||
"searchtype": "str", "searchname": "", "searchlist": "",
|
||||
"searchlistname": "",
|
||||
},
|
||||
)
|
||||
SysFieldSearch.objects.get_or_create(
|
||||
sys_object_id=object_id, val="color",
|
||||
defaults={"name": "color", "type": "str"},
|
||||
)
|
||||
for name, value in (
|
||||
("type color", "crm_type__color"),
|
||||
("category color", "crm_category__color"),
|
||||
):
|
||||
SysFieldSearch.objects.get_or_create(
|
||||
sys_object_id=3101, val=value,
|
||||
defaults={"name": name, "type": "str"},
|
||||
)
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
dependencies = [
|
||||
("wanitil", "0066_crm_assigned_employee"),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name="crmtype",
|
||||
name="color",
|
||||
field=models.CharField(
|
||||
blank=True, default="", max_length=60,
|
||||
help_text="Color used to highlight the CRM type",
|
||||
),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name="crmcategory",
|
||||
name="color",
|
||||
field=models.CharField(
|
||||
blank=True, default="", max_length=60,
|
||||
help_text="Color used to highlight the CRM category",
|
||||
),
|
||||
),
|
||||
migrations.RunPython(
|
||||
add_color_catalog_entries,
|
||||
migrations.RunPython.noop,
|
||||
),
|
||||
]
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
from django.db import migrations
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
dependencies = [
|
||||
("wanitil", "0067_crm_type_category_color"),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.RenameModel(
|
||||
old_name="CrmType",
|
||||
new_name="CrmClientType",
|
||||
),
|
||||
migrations.RenameModel(
|
||||
old_name="CrmCategory",
|
||||
new_name="CrmClientCategory",
|
||||
),
|
||||
]
|
||||
|
|
@ -0,0 +1,349 @@
|
|||
import django.db.models.deletion
|
||||
from django.db import migrations, models
|
||||
from django.utils.text import slugify
|
||||
|
||||
|
||||
def populate_new_keys(apps, schema_editor):
|
||||
Management = apps.get_model("wanitil", "SysManagment")
|
||||
Object = apps.get_model("wanitil", "SysObject")
|
||||
|
||||
used_management = set()
|
||||
for management in Management.objects.all():
|
||||
key = management.code or slugify(management.name) or f"module-{management.pk}"
|
||||
if key in used_management:
|
||||
key = f"{key}-{management.pk}"
|
||||
used_management.add(key)
|
||||
management.new_key = key
|
||||
management.save(update_fields=("new_key",))
|
||||
|
||||
used_objects = set()
|
||||
default_management = (
|
||||
Management.objects.filter(new_key="def").first()
|
||||
or Management.objects.order_by("pk").first()
|
||||
)
|
||||
for obj in Object.objects.select_related("sys_managment"):
|
||||
management = obj.sys_managment or default_management
|
||||
management_key = management.new_key
|
||||
object_name = obj.code or slugify(obj.name) or f"object-{obj.pk}"
|
||||
key = f"{management_key}.{object_name}"
|
||||
if key in used_objects:
|
||||
key = f"{key}-{obj.pk}"
|
||||
used_objects.add(key)
|
||||
obj.new_key = key
|
||||
obj.new_sys_managment_id = management_key
|
||||
obj.save(update_fields=("new_key", "new_sys_managment"))
|
||||
|
||||
for model_name in (
|
||||
"SysModuleAccessProfile", "SysModuleMembership",
|
||||
"SysClientModuleMembership",
|
||||
):
|
||||
Model = apps.get_model("wanitil", model_name)
|
||||
for row in Model.objects.select_related("module"):
|
||||
row.new_module_id = row.module.new_key
|
||||
row.save(update_fields=("new_module",))
|
||||
|
||||
for model_name, relations in (
|
||||
("SysField", (("sys_object", "new_sys_object"),
|
||||
("rel_object", "new_rel_object"))),
|
||||
("SysFieldSearch", (("sys_object", "new_sys_object"),)),
|
||||
("SysView", (("sys_object", "new_sys_object"),)),
|
||||
("RepCollection", (("sys_object", "new_sys_object"),)),
|
||||
):
|
||||
Model = apps.get_model("wanitil", model_name)
|
||||
for row in Model.objects.all():
|
||||
updates = []
|
||||
for old_name, new_name in relations:
|
||||
old_id = getattr(row, f"{old_name}_id")
|
||||
if old_id is not None:
|
||||
target = Object.objects.only("new_key").get(pk=old_id)
|
||||
setattr(row, f"{new_name}_id", target.new_key)
|
||||
updates.append(new_name)
|
||||
if updates:
|
||||
row.save(update_fields=updates)
|
||||
|
||||
|
||||
def normalize_dependency_management_ids(apps, schema_editor):
|
||||
Dependency = apps.get_model("wanitil", "ReqDepend")
|
||||
mapping = {"11100": "req", "11200": "inc"}
|
||||
for old_value, new_value in mapping.items():
|
||||
Dependency.objects.filter(depend_type=old_value).update(
|
||||
depend_type=new_value,
|
||||
)
|
||||
|
||||
Field = apps.get_model("wanitil", "SysField")
|
||||
FieldSearch = apps.get_model("wanitil", "SysFieldSearch")
|
||||
Field.objects.filter(
|
||||
sys_object_id__in=("sys.module", "sys.object"), sysname="name",
|
||||
).delete()
|
||||
Field.objects.filter(
|
||||
sys_object_id__in=("sys.module", "sys.object"), sysname="id",
|
||||
).update(type="str", searchtype="str")
|
||||
FieldSearch.objects.filter(
|
||||
sys_object_id__in=(
|
||||
"sys.module", "sys.object", "sys.field", "sys.field-search",
|
||||
"sys.view",
|
||||
),
|
||||
val__in=(
|
||||
"name", "sys_managment__name", "sys_object__name",
|
||||
"rel_object__name",
|
||||
),
|
||||
).delete()
|
||||
FieldSearch.objects.filter(
|
||||
val__in=("id", "sys_managment__id", "sys_object__id", "rel_object__id"),
|
||||
).update(type="str")
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
dependencies = [("wanitil", "0068_rename_crm_client_type_category")]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name="sysmanagment", name="new_key",
|
||||
field=models.SlugField(max_length=32, null=True, unique=True),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name="sysobject", name="new_key",
|
||||
field=models.CharField(max_length=97, null=True, unique=True),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name="sysobject", name="new_sys_managment",
|
||||
field=models.ForeignKey(
|
||||
db_constraint=False,
|
||||
null=True, on_delete=django.db.models.deletion.SET_NULL,
|
||||
related_name="+", to="wanitil.sysmanagment",
|
||||
to_field="new_key",
|
||||
),
|
||||
),
|
||||
*[
|
||||
migrations.AddField(
|
||||
model_name=model_name, name="new_module",
|
||||
field=models.ForeignKey(
|
||||
db_constraint=False,
|
||||
null=True, on_delete=django.db.models.deletion.SET_NULL,
|
||||
related_name="+", to="wanitil.sysmanagment",
|
||||
to_field="new_key",
|
||||
),
|
||||
)
|
||||
for model_name in (
|
||||
"sysmoduleaccessprofile", "sysmodulemembership",
|
||||
"sysclientmodulemembership",
|
||||
)
|
||||
],
|
||||
*[
|
||||
migrations.AddField(
|
||||
model_name=model_name, name=field_name,
|
||||
field=models.ForeignKey(
|
||||
db_constraint=False,
|
||||
null=True, on_delete=django.db.models.deletion.SET_NULL,
|
||||
related_name="+", to="wanitil.sysobject",
|
||||
to_field="new_key",
|
||||
),
|
||||
)
|
||||
for model_name, field_name in (
|
||||
("sysfield", "new_sys_object"),
|
||||
("sysfield", "new_rel_object"),
|
||||
("sysfieldsearch", "new_sys_object"),
|
||||
("sysview", "new_sys_object"),
|
||||
("repcollection", "new_sys_object"),
|
||||
)
|
||||
],
|
||||
migrations.RunPython(populate_new_keys, migrations.RunPython.noop),
|
||||
migrations.RemoveConstraint(
|
||||
model_name="sysobject", name="sys_object_module_code_unique",
|
||||
),
|
||||
migrations.RemoveConstraint(
|
||||
model_name="sysmoduleaccessprofile",
|
||||
name="sys_module_access_profile_unique",
|
||||
),
|
||||
migrations.RemoveConstraint(
|
||||
model_name="sysmodulemembership",
|
||||
name="sys_employee_module_unique",
|
||||
),
|
||||
migrations.RemoveConstraint(
|
||||
model_name="sysclientmodulemembership",
|
||||
name="sys_client_module_unique",
|
||||
),
|
||||
*[
|
||||
migrations.RemoveField(model_name=model_name, name=field_name)
|
||||
for model_name, field_name in (
|
||||
("sysobject", "sys_managment"),
|
||||
("sysmoduleaccessprofile", "module"),
|
||||
("sysmodulemembership", "module"),
|
||||
("sysclientmodulemembership", "module"),
|
||||
("sysfield", "sys_object"),
|
||||
("sysfield", "rel_object"),
|
||||
("sysfieldsearch", "sys_object"),
|
||||
("sysview", "sys_object"),
|
||||
("repcollection", "sys_object"),
|
||||
)
|
||||
],
|
||||
migrations.RemoveField(model_name="sysobject", name="id"),
|
||||
migrations.RemoveField(model_name="sysobject", name="name"),
|
||||
migrations.RemoveField(model_name="sysobject", name="code"),
|
||||
migrations.RemoveField(model_name="sysmanagment", name="id"),
|
||||
migrations.RemoveField(model_name="sysmanagment", name="name"),
|
||||
migrations.RemoveField(model_name="sysmanagment", name="code"),
|
||||
migrations.RenameField(
|
||||
model_name="sysmanagment", old_name="new_key", new_name="id",
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name="sysmanagment", name="id",
|
||||
field=models.SlugField(max_length=32, primary_key=True, serialize=False),
|
||||
),
|
||||
migrations.RenameField(
|
||||
model_name="sysobject", old_name="new_key", new_name="id",
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name="sysobject", name="id",
|
||||
field=models.CharField(max_length=97, primary_key=True, serialize=False),
|
||||
),
|
||||
migrations.RenameField(
|
||||
model_name="sysobject", old_name="new_sys_managment",
|
||||
new_name="sys_managment",
|
||||
),
|
||||
migrations.RenameField(
|
||||
model_name="sysmoduleaccessprofile", old_name="new_module",
|
||||
new_name="module",
|
||||
),
|
||||
migrations.RenameField(
|
||||
model_name="sysmodulemembership", old_name="new_module",
|
||||
new_name="module",
|
||||
),
|
||||
migrations.RenameField(
|
||||
model_name="sysclientmodulemembership", old_name="new_module",
|
||||
new_name="module",
|
||||
),
|
||||
*[
|
||||
migrations.RenameField(
|
||||
model_name=model_name, old_name=old_name, new_name=new_name,
|
||||
)
|
||||
for model_name, old_name, new_name in (
|
||||
("sysfield", "new_sys_object", "sys_object"),
|
||||
("sysfield", "new_rel_object", "rel_object"),
|
||||
("sysfieldsearch", "new_sys_object", "sys_object"),
|
||||
("sysview", "new_sys_object", "sys_object"),
|
||||
("repcollection", "new_sys_object", "sys_object"),
|
||||
)
|
||||
],
|
||||
migrations.AlterField(
|
||||
model_name="sysmanagment", name="id",
|
||||
field=models.SlugField(
|
||||
help_text="Stable management identifier used by the permission system",
|
||||
max_length=32, primary_key=True, serialize=False,
|
||||
),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name="sysobject", name="id",
|
||||
field=models.CharField(
|
||||
help_text="Object identifier in management.object format",
|
||||
max_length=97, primary_key=True, serialize=False,
|
||||
),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name="sysobject", name="sys_managment",
|
||||
field=models.ForeignKey(
|
||||
help_text="System management of the object", null=True,
|
||||
on_delete=django.db.models.deletion.SET_NULL,
|
||||
related_name="sys_object", to="wanitil.sysmanagment",
|
||||
),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name="sysmoduleaccessprofile", name="module",
|
||||
field=models.ForeignKey(
|
||||
on_delete=django.db.models.deletion.CASCADE,
|
||||
related_name="access_profiles", to="wanitil.sysmanagment",
|
||||
),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name="sysmodulemembership", name="module",
|
||||
field=models.ForeignKey(
|
||||
on_delete=django.db.models.deletion.PROTECT,
|
||||
related_name="employee_memberships", to="wanitil.sysmanagment",
|
||||
),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name="sysclientmodulemembership", name="module",
|
||||
field=models.ForeignKey(
|
||||
on_delete=django.db.models.deletion.PROTECT,
|
||||
related_name="client_memberships", to="wanitil.sysmanagment",
|
||||
),
|
||||
),
|
||||
migrations.AddConstraint(
|
||||
model_name="sysmoduleaccessprofile",
|
||||
constraint=models.UniqueConstraint(
|
||||
fields=("module", "code"),
|
||||
name="sys_module_access_profile_unique",
|
||||
),
|
||||
),
|
||||
migrations.AddConstraint(
|
||||
model_name="sysmodulemembership",
|
||||
constraint=models.UniqueConstraint(
|
||||
fields=("employee", "module"),
|
||||
name="sys_employee_module_unique",
|
||||
),
|
||||
),
|
||||
migrations.AddConstraint(
|
||||
model_name="sysclientmodulemembership",
|
||||
constraint=models.UniqueConstraint(
|
||||
fields=("client", "module"),
|
||||
name="sys_client_module_unique",
|
||||
),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name="sysfield", name="sys_object",
|
||||
field=models.ForeignKey(
|
||||
help_text="System object of the field",
|
||||
on_delete=django.db.models.deletion.CASCADE,
|
||||
related_name="sys_field", to="wanitil.sysobject",
|
||||
),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name="sysfield", name="rel_object",
|
||||
field=models.ForeignKey(
|
||||
help_text="Related object of the field", null=True,
|
||||
on_delete=django.db.models.deletion.DO_NOTHING,
|
||||
related_name="sys_field_rel", to="wanitil.sysobject",
|
||||
),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name="sysfieldsearch", name="sys_object",
|
||||
field=models.ForeignKey(
|
||||
help_text="System object of the field search",
|
||||
on_delete=django.db.models.deletion.CASCADE,
|
||||
related_name="sys_field_search", to="wanitil.sysobject",
|
||||
),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name="sysview", name="sys_object",
|
||||
field=models.ForeignKey(
|
||||
help_text="System object of the view", null=True,
|
||||
on_delete=django.db.models.deletion.SET_NULL,
|
||||
related_name="sys_view", to="wanitil.sysobject",
|
||||
),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name="repcollection", name="sys_object",
|
||||
field=models.ForeignKey(
|
||||
help_text="System object associated with the collection", null=True,
|
||||
on_delete=django.db.models.deletion.SET_NULL,
|
||||
related_name="rep_collection", to="wanitil.sysobject",
|
||||
),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name="reqdepend", name="depend_type",
|
||||
field=models.CharField(
|
||||
default="inc", help_text="Management identifier of the linked record",
|
||||
max_length=32, null=True,
|
||||
),
|
||||
),
|
||||
migrations.RunPython(
|
||||
normalize_dependency_management_ids, migrations.RunPython.noop,
|
||||
),
|
||||
# Django defers creation of FK indexes until the schema editor exits.
|
||||
# Flush PostgreSQL's deferred FK trigger events produced by the data
|
||||
# cleanup above before that DDL is executed.
|
||||
migrations.RunSQL(
|
||||
sql="SET CONSTRAINTS ALL IMMEDIATE",
|
||||
reverse_sql=migrations.RunSQL.noop,
|
||||
),
|
||||
]
|
||||
|
|
@ -0,0 +1,185 @@
|
|||
from django.db import migrations, models
|
||||
import django.db.models.deletion
|
||||
|
||||
|
||||
def migrate_permissions_and_navigation(apps, schema_editor):
|
||||
LegacyPermission = apps.get_model("wanitil", "LegacySysPermission")
|
||||
Permission = apps.get_model("wanitil", "SysPermission")
|
||||
Navigate = apps.get_model("wanitil", "SysNavigate")
|
||||
Profile = apps.get_model("wanitil", "Profile")
|
||||
SysObject = apps.get_model("wanitil", "SysObject")
|
||||
|
||||
permission_ids = {}
|
||||
for legacy in LegacyPermission.objects.all().iterator():
|
||||
permission_id = f"{legacy.module}:{legacy.resource}:{legacy.action}"
|
||||
Permission.objects.update_or_create(
|
||||
pk=permission_id,
|
||||
defaults={
|
||||
"module": legacy.module,
|
||||
"resource": legacy.resource,
|
||||
"action": legacy.action,
|
||||
"description": legacy.description,
|
||||
},
|
||||
)
|
||||
permission_ids[legacy.pk] = permission_id
|
||||
|
||||
for obj in SysObject.objects.all().iterator():
|
||||
module, separator, resource = obj.pk.partition(".")
|
||||
if not separator:
|
||||
continue
|
||||
Navigate.objects.update_or_create(
|
||||
pk=f"{module}:{resource}",
|
||||
defaults={"description": obj.description, "is_active": True},
|
||||
)
|
||||
|
||||
all_navigation_ids = list(Navigate.objects.values_list("id", flat=True))
|
||||
for profile in Profile.objects.prefetch_related("permissions").iterator(
|
||||
chunk_size=200,
|
||||
):
|
||||
legacy_permissions = list(profile.permissions.all())
|
||||
profile.new_permissions.add(*[
|
||||
permission_ids[item.pk] for item in legacy_permissions
|
||||
])
|
||||
|
||||
navigation_ids = set()
|
||||
for permission in legacy_permissions:
|
||||
if permission.action not in ("view", "*"):
|
||||
continue
|
||||
if permission.module == "*":
|
||||
if permission.resource == "*":
|
||||
navigation_ids.update(all_navigation_ids)
|
||||
else:
|
||||
navigation_ids.update(
|
||||
value for value in all_navigation_ids
|
||||
if value.endswith(f":{permission.resource}")
|
||||
)
|
||||
elif permission.resource == "*":
|
||||
navigation_ids.update(
|
||||
value for value in all_navigation_ids
|
||||
if value.startswith(f"{permission.module}:")
|
||||
)
|
||||
else:
|
||||
navigation_ids.add(
|
||||
f"{permission.module}:{permission.resource}"
|
||||
)
|
||||
profile.navigations.add(*Navigate.objects.filter(pk__in=navigation_ids))
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
dependencies = [("wanitil", "0069_string_system_catalog_ids")]
|
||||
|
||||
operations = [
|
||||
migrations.RenameModel(
|
||||
old_name="SysModuleAccessProfile",
|
||||
new_name="Profile",
|
||||
),
|
||||
migrations.RenameModel(
|
||||
old_name="SysModuleMembership",
|
||||
new_name="SysProfileEmployee",
|
||||
),
|
||||
migrations.RenameModel(
|
||||
old_name="SysPermission",
|
||||
new_name="LegacySysPermission",
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name="profile",
|
||||
name="module",
|
||||
field=models.ForeignKey(
|
||||
on_delete=django.db.models.deletion.CASCADE,
|
||||
related_name="profiles", to="wanitil.sysmanagment",
|
||||
),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name="sysprofileemployee",
|
||||
name="employee",
|
||||
field=models.ForeignKey(
|
||||
on_delete=django.db.models.deletion.CASCADE,
|
||||
related_name="profile_employees", to="wanitil.sysemployee",
|
||||
),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name="sysprofileemployee",
|
||||
name="module",
|
||||
field=models.ForeignKey(
|
||||
on_delete=django.db.models.deletion.PROTECT,
|
||||
related_name="profile_employees", to="wanitil.sysmanagment",
|
||||
),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name="sysprofileemployee",
|
||||
name="profiles",
|
||||
field=models.ManyToManyField(
|
||||
blank=True, related_name="employee_assignments",
|
||||
to="wanitil.profile",
|
||||
),
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name="SysPermission",
|
||||
fields=[
|
||||
("id", models.CharField(
|
||||
help_text="Permission identifier in management:object:action format",
|
||||
max_length=130, primary_key=True, serialize=False,
|
||||
)),
|
||||
("module", models.SlugField(max_length=32)),
|
||||
("action", models.SlugField(max_length=32)),
|
||||
("resource", models.SlugField(max_length=64)),
|
||||
("description", models.CharField(blank=True, max_length=256)),
|
||||
],
|
||||
options={
|
||||
"ordering": ("module", "resource", "action"),
|
||||
"constraints": [
|
||||
models.UniqueConstraint(
|
||||
fields=("module", "action", "resource"),
|
||||
name="sys_permission_string_code_unique",
|
||||
),
|
||||
],
|
||||
},
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name="SysNavigate",
|
||||
fields=[
|
||||
("id", models.CharField(
|
||||
help_text="Navigation identifier in management:object format",
|
||||
max_length=97, primary_key=True, serialize=False,
|
||||
)),
|
||||
("description", models.CharField(blank=True, max_length=256)),
|
||||
("is_active", models.BooleanField(db_index=True, default=True)),
|
||||
],
|
||||
options={"ordering": ("id",)},
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name="profile",
|
||||
name="new_permissions",
|
||||
field=models.ManyToManyField(
|
||||
blank=True, related_name="+", to="wanitil.syspermission",
|
||||
),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name="profile",
|
||||
name="navigations",
|
||||
field=models.ManyToManyField(
|
||||
blank=True, related_name="profiles", to="wanitil.sysnavigate",
|
||||
),
|
||||
),
|
||||
migrations.RunPython(
|
||||
migrate_permissions_and_navigation,
|
||||
migrations.RunPython.noop,
|
||||
),
|
||||
migrations.RemoveField(
|
||||
model_name="profile",
|
||||
name="permissions",
|
||||
),
|
||||
migrations.DeleteModel(name="LegacySysPermission"),
|
||||
migrations.RenameField(
|
||||
model_name="profile",
|
||||
old_name="new_permissions",
|
||||
new_name="permissions",
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name="profile",
|
||||
name="permissions",
|
||||
field=models.ManyToManyField(
|
||||
blank=True, related_name="profiles", to="wanitil.syspermission",
|
||||
),
|
||||
),
|
||||
]
|
||||
|
|
@ -0,0 +1,177 @@
|
|||
from django.db import migrations, models
|
||||
|
||||
|
||||
MENU = {
|
||||
"rep": ("Обзор", ("chart",)),
|
||||
"adr": ("Адреса", (
|
||||
"country", "region", "area", "town", "street", "house", "zone",
|
||||
"town-type", "street-type", "house-type", "zone-type",
|
||||
)),
|
||||
"crm": ("CRM", ("client", "contract", "lead", "settings")),
|
||||
"srv": ("Сервисы", (
|
||||
"service", "request-type", "solution", "status", "type", "settings",
|
||||
)),
|
||||
"req": ("Обращения", (
|
||||
"request", "criticality", "source-type", "status", "notification",
|
||||
"settings",
|
||||
)),
|
||||
"inc": ("Инциденты", (
|
||||
"incident", "group", "category", "subcategory", "solution", "impact",
|
||||
"priority", "status", "settings",
|
||||
)),
|
||||
"chn": ("Задачи", (
|
||||
"task", "change", "task-transition", "task-category",
|
||||
"task-priority", "task-status", "task-type", "change-status",
|
||||
"change-type", "settings",
|
||||
)),
|
||||
"sla": ("SLA", (
|
||||
"request-agreement", "request-status", "schedule-week",
|
||||
"request-calculation", "incident-agreement", "incident-status",
|
||||
"incident-calculation",
|
||||
)),
|
||||
"cim": ("Configuration items", ("ci", "type")),
|
||||
"dev": ("Устройства", ("manufacturer", "model")),
|
||||
"con": ("Коммуникации", ("person", "contact", "settings")),
|
||||
"sys": ("Система", (
|
||||
"user", "employee-access", "department", "object", "view",
|
||||
"holiday-group", "holiday", "module-settings", "settings",
|
||||
)),
|
||||
}
|
||||
|
||||
ACTIONS = ("view", "add", "change", "delete")
|
||||
|
||||
LABELS = {
|
||||
"chart": "Обзор", "country": "Страны", "region": "Регионы",
|
||||
"area": "Районы", "town": "Населённые пункты", "street": "Улицы",
|
||||
"house": "Дома", "zone": "Зоны", "town-type": "Типы населённых пунктов",
|
||||
"street-type": "Типы улиц", "house-type": "Типы домов",
|
||||
"zone-type": "Типы зон", "client": "Клиенты", "contract": "Договора",
|
||||
"lead": "Лиды", "service": "Сервисы", "request-type": "Запросы сервиса",
|
||||
"solution": "Решения", "status": "Статусы", "type": "Типы",
|
||||
"request": "Обращения", "criticality": "Критичности",
|
||||
"source-type": "Источники", "notification": "Уведомления",
|
||||
"incident": "Инциденты", "group": "Группы", "category": "Категории",
|
||||
"subcategory": "Подкатегории", "impact": "Влияния",
|
||||
"priority": "Приоритеты", "task": "Задачи", "change": "Изменения",
|
||||
"task-transition": "Схема переходов", "task-category": "Категории",
|
||||
"task-priority": "Приоритеты", "task-status": "Статусы",
|
||||
"task-type": "Типы", "change-status": "Статусы изменений",
|
||||
"change-type": "Типы изменений", "request-agreement": "SLA обращений",
|
||||
"request-status": "Статусы обращений", "schedule-week": "Рабочие недели",
|
||||
"request-calculation": "Расчёты обращений",
|
||||
"incident-agreement": "SLA инцидентов", "incident-status": "Статусы инцидентов",
|
||||
"incident-calculation": "Расчёты инцидентов", "ci": "Конфигурационные единицы",
|
||||
"manufacturer": "Производители", "model": "Модели", "person": "Контактные лица",
|
||||
"contact": "Контакты", "user": "Пользователи", "employee-access": "Сотрудники",
|
||||
"department": "Подразделения", "object": "Объекты", "view": "Представления",
|
||||
"holiday-group": "Группы праздников", "holiday": "Праздники",
|
||||
"module-settings": "Системные параметры", "settings": "Настройки",
|
||||
}
|
||||
|
||||
|
||||
def migrate_and_seed(apps, schema_editor):
|
||||
Employee = apps.get_model("wanitil", "SysEmployee")
|
||||
Membership = apps.get_model("wanitil", "SysProfileEmployee")
|
||||
Navigation = apps.get_model("wanitil", "SysNavigate")
|
||||
Permission = apps.get_model("wanitil", "SysPermission")
|
||||
Profile = apps.get_model("wanitil", "SysProfile")
|
||||
|
||||
# Preserve every effective grant before profile memberships stop being the
|
||||
# authorization source.
|
||||
permission_ids_by_employee = {}
|
||||
navigation_ids_by_employee = {}
|
||||
for membership in Membership.objects.filter(is_active=True).prefetch_related(
|
||||
"profiles__permissions", "profiles__navigations"
|
||||
):
|
||||
permission_ids = permission_ids_by_employee.setdefault(
|
||||
membership.employee_id, set(),
|
||||
)
|
||||
navigation_ids = navigation_ids_by_employee.setdefault(
|
||||
membership.employee_id, set(),
|
||||
)
|
||||
for profile in membership.profiles.filter(is_active=True):
|
||||
permission_ids.update(
|
||||
profile.permissions.values_list("id", flat=True),
|
||||
)
|
||||
navigation_ids.update(
|
||||
profile.navigations.values_list("id", flat=True),
|
||||
)
|
||||
|
||||
# The unique indexes of newly added implicit M2M tables are deferred by
|
||||
# PostgreSQL until the migration's schema editor exits. Insert every pair
|
||||
# only once instead of relying on those indexes during RunPython.
|
||||
employee_ids = (
|
||||
set(permission_ids_by_employee) | set(navigation_ids_by_employee)
|
||||
)
|
||||
for employee in Employee.objects.filter(id__in=employee_ids):
|
||||
employee.permissions.set(
|
||||
permission_ids_by_employee.get(employee.id, set()),
|
||||
)
|
||||
employee.navigations.set(
|
||||
navigation_ids_by_employee.get(employee.id, set()),
|
||||
)
|
||||
|
||||
for module_id, (name, resources) in MENU.items():
|
||||
profile, _ = Profile.objects.update_or_create(
|
||||
module_id=module_id,
|
||||
code="built-in-module",
|
||||
defaults={
|
||||
"name": name,
|
||||
"description": f"Системный профиль модуля «{name}»",
|
||||
"scope": "all",
|
||||
"is_system": True,
|
||||
"is_active": True,
|
||||
},
|
||||
)
|
||||
permissions = []
|
||||
navigations = []
|
||||
for resource in resources:
|
||||
label = LABELS[resource]
|
||||
navigation, _ = Navigation.objects.update_or_create(
|
||||
pk=f"{module_id}:{resource}",
|
||||
defaults={"description": label, "is_active": True},
|
||||
)
|
||||
navigations.append(navigation)
|
||||
for action in ACTIONS:
|
||||
permission, _ = Permission.objects.get_or_create(
|
||||
pk=f"{module_id}:{resource}:{action}",
|
||||
defaults={
|
||||
"module": module_id,
|
||||
"resource": resource,
|
||||
"action": action,
|
||||
"description": f"{name}: {label}: {action}",
|
||||
},
|
||||
)
|
||||
permissions.append(permission)
|
||||
profile.permissions.set(permissions)
|
||||
profile.navigations.set(navigations)
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
dependencies = [("wanitil", "0070_profiles_permissions_and_navigation")]
|
||||
|
||||
operations = [
|
||||
migrations.RenameModel(old_name="Profile", new_name="SysProfile"),
|
||||
migrations.AddField(
|
||||
model_name="sysemployee",
|
||||
name="permissions",
|
||||
field=models.ManyToManyField(
|
||||
blank=True,
|
||||
help_text="Atomic permissions granted directly to the employee",
|
||||
related_name="employees",
|
||||
to="wanitil.syspermission",
|
||||
),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name="sysemployee",
|
||||
name="navigations",
|
||||
field=models.ManyToManyField(
|
||||
blank=True,
|
||||
help_text="Navigation entries visible to the employee",
|
||||
related_name="employees",
|
||||
to="wanitil.sysnavigate",
|
||||
),
|
||||
),
|
||||
migrations.RunPython(migrate_and_seed, migrations.RunPython.noop),
|
||||
migrations.DeleteModel(name="SysClientModuleMembership"),
|
||||
]
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
from django.db import migrations
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
dependencies = [
|
||||
("wanitil", "0071_employee_direct_access_and_sysprofile"),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.DeleteModel(name="SysTask"),
|
||||
]
|
||||
|
|
@ -0,0 +1,43 @@
|
|||
from django.db import migrations
|
||||
|
||||
|
||||
ROLE_NAMES = {
|
||||
"built-in-reader": "Чтение",
|
||||
"built-in-editor": "Редактор",
|
||||
"built-in-manager": "Менеджер",
|
||||
"built-in-module": "Полный доступ",
|
||||
}
|
||||
|
||||
SCOPE_NAMES = {
|
||||
"own": "Только свои",
|
||||
"team": "Своя группа",
|
||||
"all": "Все записи",
|
||||
}
|
||||
|
||||
|
||||
def update_system_profile_names(apps, schema_editor):
|
||||
Profile = apps.get_model("wanitil", "SysProfile")
|
||||
|
||||
profiles = Profile.objects.filter(is_system=True).select_related("module")
|
||||
for profile in profiles.iterator():
|
||||
role_name = ROLE_NAMES.get(profile.code, profile.name)[:35]
|
||||
module_name = (
|
||||
profile.module.description.strip() or profile.module_id
|
||||
)[:40]
|
||||
scope_name = SCOPE_NAMES.get(profile.scope, profile.scope)
|
||||
profile.name = (
|
||||
f"{role_name} — Модуль: {module_name}; "
|
||||
f"Область применения: {scope_name}"
|
||||
)
|
||||
profile.save(update_fields=("name",))
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
dependencies = [("wanitil", "0072_delete_systask")]
|
||||
|
||||
operations = [
|
||||
migrations.RunPython(
|
||||
update_system_profile_names,
|
||||
migrations.RunPython.noop,
|
||||
),
|
||||
]
|
||||
|
|
@ -0,0 +1,58 @@
|
|||
from django.db import migrations, models
|
||||
|
||||
|
||||
def copy_assignees(apps, schema_editor):
|
||||
Task = apps.get_model("wanitil", "Task")
|
||||
through = Task.assignees.through
|
||||
rows = (
|
||||
through(task_id=task_id, sysemployee_id=assignee_id)
|
||||
for task_id, assignee_id in Task.objects.exclude(assignee_id=None)
|
||||
.values_list("id", "assignee_id")
|
||||
)
|
||||
through.objects.bulk_create(rows, batch_size=1000)
|
||||
|
||||
|
||||
def restore_single_assignee(apps, schema_editor):
|
||||
Task = apps.get_model("wanitil", "Task")
|
||||
tasks = []
|
||||
for task in Task.objects.prefetch_related("assignees").iterator(
|
||||
chunk_size=1000,
|
||||
):
|
||||
task.assignee_id = task.assignees.order_by("id").values_list(
|
||||
"id", flat=True,
|
||||
).first()
|
||||
tasks.append(task)
|
||||
Task.objects.bulk_update(tasks, ("assignee",), batch_size=1000)
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
dependencies = [("wanitil", "0073_descriptive_system_profile_names")]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name="task",
|
||||
name="assignees",
|
||||
field=models.ManyToManyField(
|
||||
blank=True,
|
||||
related_name="assigned_chn_tasks_multi",
|
||||
to="wanitil.sysemployee",
|
||||
),
|
||||
),
|
||||
migrations.RemoveConstraint(
|
||||
model_name="task", name="chn_task_has_assignment",
|
||||
),
|
||||
migrations.RemoveIndex(
|
||||
model_name="task", name="chn_task_assignee_status",
|
||||
),
|
||||
migrations.RunPython(copy_assignees, restore_single_assignee),
|
||||
migrations.RemoveField(model_name="task", name="assignee"),
|
||||
migrations.AlterField(
|
||||
model_name="task",
|
||||
name="assignees",
|
||||
field=models.ManyToManyField(
|
||||
blank=True,
|
||||
related_name="assigned_chn_tasks",
|
||||
to="wanitil.sysemployee",
|
||||
),
|
||||
),
|
||||
]
|
||||
|
|
@ -0,0 +1,114 @@
|
|||
import django.db.models.deletion
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
ACTIONS = ("view", "add", "change", "delete")
|
||||
PROFILE_ACTIONS = {
|
||||
"built-in-reader": ("view",),
|
||||
"built-in-editor": ("view", "add", "change"),
|
||||
"built-in-manager": ACTIONS,
|
||||
"built-in-module": ACTIONS,
|
||||
}
|
||||
|
||||
|
||||
def seed_reminder_catalog(apps, schema_editor):
|
||||
Navigate = apps.get_model("wanitil", "SysNavigate")
|
||||
Object = apps.get_model("wanitil", "SysObject")
|
||||
Permission = apps.get_model("wanitil", "SysPermission")
|
||||
Profile = apps.get_model("wanitil", "SysProfile")
|
||||
|
||||
Object.objects.update_or_create(
|
||||
pk="sys.reminder",
|
||||
defaults={
|
||||
"description": "Напоминания",
|
||||
"prefix": "SYSREM",
|
||||
"url": "sys/reminders",
|
||||
"spec_field": "",
|
||||
"sys_name": "SysReminder",
|
||||
"sys_managment_id": "sys",
|
||||
},
|
||||
)
|
||||
navigation, _ = Navigate.objects.update_or_create(
|
||||
pk="sys:reminder",
|
||||
defaults={"description": "Напоминания", "is_active": True},
|
||||
)
|
||||
permissions = {}
|
||||
for action in ACTIONS:
|
||||
permission, _ = Permission.objects.update_or_create(
|
||||
pk=f"sys:reminder:{action}",
|
||||
defaults={
|
||||
"module": "sys", "resource": "reminder", "action": action,
|
||||
"description": f"Напоминания: {action}",
|
||||
},
|
||||
)
|
||||
permissions[action] = permission
|
||||
|
||||
for code, actions in PROFILE_ACTIONS.items():
|
||||
for profile in Profile.objects.filter(
|
||||
module_id="sys", code=code, is_system=True,
|
||||
):
|
||||
granted_permissions = [permissions[action] for action in actions]
|
||||
profile.permissions.add(*granted_permissions)
|
||||
if "view" in actions:
|
||||
profile.navigations.add(navigation)
|
||||
for assignment in profile.employee_assignments.filter(
|
||||
is_active=True,
|
||||
).select_related("employee"):
|
||||
assignment.employee.permissions.add(*granted_permissions)
|
||||
if "view" in actions:
|
||||
assignment.employee.navigations.add(navigation)
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
dependencies = [("wanitil", "0074_task_multiple_assignees")]
|
||||
|
||||
operations = [
|
||||
migrations.CreateModel(
|
||||
name="SysReminder",
|
||||
fields=[
|
||||
("id", models.BigAutoField(primary_key=True, serialize=False)),
|
||||
("title", models.CharField(max_length=256)),
|
||||
("text", models.TextField(blank=True)),
|
||||
("remind_at", models.DateTimeField(db_index=True)),
|
||||
("status", models.CharField(
|
||||
choices=[("pending", "Ожидает"), ("completed", "Выполнено"), ("cancelled", "Отменено")],
|
||||
db_index=True, default="pending", max_length=16,
|
||||
)),
|
||||
("is_read", models.BooleanField(db_index=True, default=False)),
|
||||
("completed_at", models.DateTimeField(blank=True, null=True)),
|
||||
("created_at", models.DateTimeField(auto_now_add=True)),
|
||||
("updated_at", models.DateTimeField(auto_now=True)),
|
||||
("created_by", models.ForeignKey(
|
||||
on_delete=django.db.models.deletion.PROTECT,
|
||||
related_name="created_reminders", to="wanitil.sysemployee",
|
||||
)),
|
||||
("recipient", models.ForeignKey(
|
||||
on_delete=django.db.models.deletion.PROTECT,
|
||||
related_name="reminders", to="wanitil.sysemployee",
|
||||
)),
|
||||
],
|
||||
options={
|
||||
"ordering": ("remind_at", "id"),
|
||||
"indexes": [models.Index(
|
||||
fields=["recipient", "status", "remind_at"],
|
||||
name="sys_reminder_recipient_due",
|
||||
)],
|
||||
},
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name="crmactivity", name="type",
|
||||
field=models.CharField(
|
||||
choices=[("task", "Task"), ("comment", "Comment"), ("call", "Call"), ("messenger_message", "Messenger message"), ("email", "Email"), ("reminder", "Reminder")],
|
||||
db_index=True, max_length=24,
|
||||
),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name="crmactivity", name="reference_type",
|
||||
field=models.CharField(
|
||||
blank=True,
|
||||
choices=[("call", "Call"), ("task", "Task"), ("messenger_message", "Messenger message"), ("email", "Email"), ("reminder", "Reminder")],
|
||||
db_index=True, max_length=24, null=True,
|
||||
),
|
||||
),
|
||||
migrations.RunPython(seed_reminder_catalog, migrations.RunPython.noop),
|
||||
]
|
||||
|
|
@ -0,0 +1,22 @@
|
|||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
("wanitil", "0075_sys_reminder_and_crm_activity_type"),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name="task",
|
||||
name="priority",
|
||||
field=models.ForeignKey(
|
||||
blank=True,
|
||||
null=True,
|
||||
on_delete=models.SET_NULL,
|
||||
related_name="tasks",
|
||||
to="wanitil.taskpriority",
|
||||
),
|
||||
),
|
||||
]
|
||||
|
|
@ -0,0 +1,32 @@
|
|||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
("wanitil", "0076_task_optional_priority"),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name="task",
|
||||
name="planned_finish_at",
|
||||
field=models.DateTimeField(blank=True, db_index=True, null=True),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name="task",
|
||||
name="planned_start_at",
|
||||
field=models.DateTimeField(blank=True, db_index=True, null=True),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name="task",
|
||||
name="task_type",
|
||||
field=models.ForeignKey(
|
||||
blank=True,
|
||||
null=True,
|
||||
on_delete=models.SET_NULL,
|
||||
related_name="tasks",
|
||||
to="wanitil.tasktype",
|
||||
),
|
||||
),
|
||||
]
|
||||
|
|
@ -0,0 +1,117 @@
|
|||
# Generated by Django 5.1.3 on 2026-09-14 18:48
|
||||
|
||||
import django.db.models.deletion
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('wanitil', '0077_task_optional_type_and_planned_dates'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name='change',
|
||||
name='parent_change',
|
||||
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='child_changes', to='wanitil.change'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='changetype',
|
||||
name='approvers',
|
||||
field=models.ManyToManyField(blank=True, related_name='chn_change_types_to_approve', to='wanitil.sysemployee'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='changetype',
|
||||
name='status_after_approval',
|
||||
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='change_types_after_approval', to='wanitil.changestatus'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='changetype',
|
||||
name='status_approval',
|
||||
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='change_types_approval', to='wanitil.changestatus'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='changetype',
|
||||
name='status_completed',
|
||||
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='change_types_completed', to='wanitil.changestatus'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='changetype',
|
||||
name='status_created',
|
||||
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='change_types_created', to='wanitil.changestatus'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='changetype',
|
||||
name='status_in_progress',
|
||||
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='change_types_in_progress', to='wanitil.changestatus'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='changetype',
|
||||
name='status_not_completed',
|
||||
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='change_types_not_completed', to='wanitil.changestatus'),
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='WorkflowNode',
|
||||
fields=[
|
||||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('kind', models.CharField(choices=[('task', 'Task'), ('change', 'Change')], max_length=16)),
|
||||
('title', models.CharField(max_length=256)),
|
||||
('description', models.TextField(blank=True)),
|
||||
('x', models.FloatField(default=0)),
|
||||
('y', models.FloatField(default=0)),
|
||||
('assignees', models.ManyToManyField(blank=True, related_name='chn_workflow_nodes', to='wanitil.sysemployee')),
|
||||
('change_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='workflow_nodes', to='wanitil.changetype')),
|
||||
('child_change_type', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='parent_workflow_nodes', to='wanitil.changetype')),
|
||||
('department', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='chn_workflow_nodes', to='wanitil.sysdepartment')),
|
||||
('priority', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='workflow_nodes', to='wanitil.taskpriority')),
|
||||
('task_type', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='workflow_nodes', to='wanitil.tasktype')),
|
||||
],
|
||||
options={
|
||||
'ordering': ('id',),
|
||||
},
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='ChangeApproval',
|
||||
fields=[
|
||||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('decision', models.CharField(choices=[('pending', 'Pending'), ('approved', 'Approved'), ('rejected', 'Rejected')], db_index=True, default='pending', max_length=16)),
|
||||
('comment', models.TextField(blank=True)),
|
||||
('decided_at', models.DateTimeField(blank=True, null=True)),
|
||||
('change', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='approvals', to='wanitil.change')),
|
||||
('employee', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='chn_change_approvals', to='wanitil.sysemployee')),
|
||||
],
|
||||
options={
|
||||
'ordering': ('id',),
|
||||
'constraints': [models.UniqueConstraint(fields=('change', 'employee'), name='chn_unique_change_approver')],
|
||||
},
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='WorkflowEdge',
|
||||
fields=[
|
||||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('decision', models.CharField(choices=[('positive', 'Positive'), ('negative', 'Negative')], max_length=16)),
|
||||
('source', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='outgoing_edges', to='wanitil.workflownode')),
|
||||
('target', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='incoming_edges', to='wanitil.workflownode')),
|
||||
],
|
||||
options={
|
||||
'ordering': ('id',),
|
||||
'constraints': [models.UniqueConstraint(fields=('source', 'target', 'decision'), name='chn_unique_workflow_edge'), models.CheckConstraint(condition=models.Q(('source', models.F('target')), _negated=True), name='chn_workflow_edge_different_nodes')],
|
||||
},
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='WorkflowRun',
|
||||
fields=[
|
||||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('state', models.CharField(choices=[('pending', 'Pending'), ('active', 'Active'), ('succeeded', 'Succeeded'), ('failed', 'Failed')], db_index=True, default='pending', max_length=16)),
|
||||
('change', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='workflow_runs', to='wanitil.change')),
|
||||
('child_change', models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='parent_workflow_run', to='wanitil.change')),
|
||||
('node', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='runs', to='wanitil.workflownode')),
|
||||
('task', models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='workflow_run', to='wanitil.task')),
|
||||
],
|
||||
options={
|
||||
'ordering': ('id',),
|
||||
'constraints': [models.UniqueConstraint(fields=('change', 'node'), name='chn_unique_workflow_node_run')],
|
||||
},
|
||||
),
|
||||
]
|
||||
|
|
@ -0,0 +1,19 @@
|
|||
# Generated by Django 5.1.3 on 2026-09-14 18:49
|
||||
|
||||
import django.db.models.deletion
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('wanitil', '0078_change_parent_change_changetype_approvers_and_more'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name='changestatus',
|
||||
name='change_type',
|
||||
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='statuses', to='wanitil.changetype'),
|
||||
),
|
||||
]
|
||||
|
|
@ -0,0 +1,55 @@
|
|||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
dependencies = [("wanitil", "0079_changestatus_change_type")]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name="workflowedge",
|
||||
name="decision",
|
||||
field=models.CharField(
|
||||
choices=[
|
||||
("always", "Always"),
|
||||
("positive", "Positive"),
|
||||
("negative", "Negative"),
|
||||
],
|
||||
max_length=16,
|
||||
),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name="workflownode",
|
||||
name="kind",
|
||||
field=models.CharField(
|
||||
choices=[
|
||||
("task", "Task"),
|
||||
("change", "Change"),
|
||||
("input", "Process input"),
|
||||
("positive_output", "Positive process output"),
|
||||
("negative_output", "Negative process output"),
|
||||
],
|
||||
max_length=16,
|
||||
),
|
||||
),
|
||||
migrations.AddConstraint(
|
||||
model_name="workflownode",
|
||||
constraint=models.UniqueConstraint(
|
||||
condition=models.Q(("kind", "input")), fields=("change_type",),
|
||||
name="chn_unique_workflow_input",
|
||||
),
|
||||
),
|
||||
migrations.AddConstraint(
|
||||
model_name="workflownode",
|
||||
constraint=models.UniqueConstraint(
|
||||
condition=models.Q(("kind", "positive_output")), fields=("change_type",),
|
||||
name="chn_unique_workflow_positive_output",
|
||||
),
|
||||
),
|
||||
migrations.AddConstraint(
|
||||
model_name="workflownode",
|
||||
constraint=models.UniqueConstraint(
|
||||
condition=models.Q(("kind", "negative_output")), fields=("change_type",),
|
||||
name="chn_unique_workflow_negative_output",
|
||||
),
|
||||
),
|
||||
]
|
||||
|
|
@ -0,0 +1,101 @@
|
|||
from django.db import migrations, models
|
||||
|
||||
|
||||
STATUSES = (
|
||||
("new", "Создан", "Зафиксирован RFC с описанием сути, рисков и плана.", "#6c757d"),
|
||||
("assessment", "На оценке", "Оценка влияния, рисков и выбор типа изменения.", "#17a2b8"),
|
||||
("pending_approval", "На согласовании", "Рассмотрение CAB или владельцем изменения.", "#ffc107"),
|
||||
("rejected", "Отклонен", "Изменение признано нецелесообразным или опасным.", "#dc3545"),
|
||||
("approved", "Авторизован / Запланирован", "Получено одобрение и зафиксировано окно внедрения.", "#0d6efd"),
|
||||
("in_progress", "В работе", "Выполнение технических работ.", "#fd7e14"),
|
||||
("review", "Проверка", "Проверка работоспособности после внедрения (PIR).", "#6f42c1"),
|
||||
("closed", "Закрыт", "Успешное завершение или фиксация итогов.", "#198754"),
|
||||
("cancelled", "Отменен", "Выполнен откат к предыдущей версии.", "#343a40"),
|
||||
)
|
||||
|
||||
|
||||
def create_and_map_statuses(apps, schema_editor):
|
||||
ChangeStatus = apps.get_model("wanitil", "ChangeStatus")
|
||||
Change = apps.get_model("wanitil", "Change")
|
||||
fixed = {}
|
||||
for code, name, description, color in STATUSES:
|
||||
fixed[code], _created = ChangeStatus.objects.get_or_create(
|
||||
code=code,
|
||||
defaults={
|
||||
"name": name, "color": color, "description": description,
|
||||
"is_active": True,
|
||||
},
|
||||
)
|
||||
|
||||
for change in Change.objects.select_related("change_type").iterator():
|
||||
change_type = change.change_type
|
||||
mapping = (
|
||||
(change_type.status_created_id, "new"),
|
||||
(change_type.status_approval_id, "pending_approval"),
|
||||
(change_type.status_after_approval_id, "approved"),
|
||||
(change_type.status_in_progress_id, "in_progress"),
|
||||
(change_type.status_completed_id, "closed"),
|
||||
(change_type.status_not_completed_id, "cancelled"),
|
||||
)
|
||||
code = next((value for status_id, value in mapping if status_id == change.status_id), "new")
|
||||
Change.objects.filter(pk=change.pk).update(status_id=fixed[code].pk)
|
||||
|
||||
ChangeType = apps.get_model("wanitil", "ChangeType")
|
||||
for change_type in ChangeType.objects.all().iterator():
|
||||
if change_type.approvers.exists():
|
||||
ChangeType.objects.filter(pk=change_type.pk).update(requires_approval=True)
|
||||
|
||||
def delete_legacy_statuses(apps, schema_editor):
|
||||
ChangeStatus = apps.get_model("wanitil", "ChangeStatus")
|
||||
ChangeStatus.objects.exclude(code__in=[item[0] for item in STATUSES]).delete()
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
# PostgreSQL must commit data remapping before dropping the old foreign keys;
|
||||
# otherwise deferred FK trigger events block the following ALTER TABLE.
|
||||
atomic = False
|
||||
|
||||
dependencies = [("wanitil", "0080_workflow_process_ports")]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name="changestatus", name="code",
|
||||
field=models.CharField(blank=True, max_length=32, null=True),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name="changetype", name="requires_approval",
|
||||
field=models.BooleanField(default=False),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name="changetype", name="requires_assessment",
|
||||
field=models.BooleanField(default=False),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name="changetype", name="requires_testing",
|
||||
field=models.BooleanField(default=False),
|
||||
),
|
||||
migrations.RunPython(create_and_map_statuses, migrations.RunPython.noop),
|
||||
migrations.RemoveField(model_name="changetype", name="status_created"),
|
||||
migrations.RemoveField(model_name="changetype", name="status_approval"),
|
||||
migrations.RemoveField(model_name="changetype", name="status_after_approval"),
|
||||
migrations.RemoveField(model_name="changetype", name="status_in_progress"),
|
||||
migrations.RemoveField(model_name="changetype", name="status_completed"),
|
||||
migrations.RemoveField(model_name="changetype", name="status_not_completed"),
|
||||
migrations.RemoveField(model_name="chnsettings", name="change_status_on_check"),
|
||||
migrations.RunPython(delete_legacy_statuses, migrations.RunPython.noop),
|
||||
migrations.RemoveField(model_name="changestatus", name="change_type"),
|
||||
migrations.AlterField(
|
||||
model_name="changestatus", name="code",
|
||||
field=models.CharField(
|
||||
choices=[
|
||||
("new", "Создан"), ("assessment", "На оценке"),
|
||||
("pending_approval", "На согласовании"),
|
||||
("rejected", "Отклонен"),
|
||||
("approved", "Авторизован / Запланирован"),
|
||||
("in_progress", "В работе"), ("review", "Проверка"),
|
||||
("closed", "Закрыт"), ("cancelled", "Отменен"),
|
||||
],
|
||||
max_length=32, unique=True,
|
||||
),
|
||||
),
|
||||
]
|
||||
|
|
@ -0,0 +1,80 @@
|
|||
import django.db.models.deletion
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
def add_intermediate_statuses(apps, schema_editor):
|
||||
ChangeStatus = apps.get_model("wanitil", "ChangeStatus")
|
||||
ChangeStatus.objects.get_or_create(
|
||||
code="assessment_completed",
|
||||
defaults={
|
||||
"name": "Оценка предоставлена",
|
||||
"description": "Оценка влияния и рисков изменения завершена.",
|
||||
"color": "#20c997", "is_active": True,
|
||||
},
|
||||
)
|
||||
ChangeStatus.objects.get_or_create(
|
||||
code="review_completed",
|
||||
defaults={
|
||||
"name": "Проверка проведена",
|
||||
"description": "Проверка работоспособности после внедрения завершена.",
|
||||
"color": "#6610f2", "is_active": True,
|
||||
},
|
||||
)
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
dependencies = [("wanitil", "0081_fixed_change_statuses")]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name="changestatus", name="code",
|
||||
field=models.CharField(
|
||||
choices=[
|
||||
("new", "Создан"), ("assessment", "На оценке"),
|
||||
("assessment_completed", "Оценка предоставлена"),
|
||||
("pending_approval", "На согласовании"),
|
||||
("rejected", "Отклонен"),
|
||||
("approved", "Авторизован / Запланирован"),
|
||||
("in_progress", "В работе"), ("review", "Проверка"),
|
||||
("review_completed", "Проверка проведена"),
|
||||
("closed", "Закрыт"), ("cancelled", "Отменен"),
|
||||
], max_length=32, unique=True,
|
||||
),
|
||||
),
|
||||
migrations.RunPython(add_intermediate_statuses, migrations.RunPython.noop),
|
||||
migrations.AddField(
|
||||
model_name="changetype", name="requires_planning",
|
||||
field=models.BooleanField(default=False),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name="changetype", name="assessment_task_type",
|
||||
field=models.ForeignKey(
|
||||
blank=True, null=True, on_delete=django.db.models.deletion.PROTECT,
|
||||
related_name="assessment_change_types", to="wanitil.tasktype",
|
||||
),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name="changetype", name="testing_task_type",
|
||||
field=models.ForeignKey(
|
||||
blank=True, null=True, on_delete=django.db.models.deletion.PROTECT,
|
||||
related_name="testing_change_types", to="wanitil.tasktype",
|
||||
),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name="task", name="change_stage",
|
||||
field=models.CharField(
|
||||
blank=True,
|
||||
choices=[
|
||||
("assessment", "Change assessment"),
|
||||
("testing", "Post-implementation review"),
|
||||
], db_index=True, max_length=16, null=True,
|
||||
),
|
||||
),
|
||||
migrations.AddConstraint(
|
||||
model_name="task",
|
||||
constraint=models.UniqueConstraint(
|
||||
condition=models.Q(("change_stage__isnull", False)),
|
||||
fields=("change", "change_stage"), name="chn_unique_change_stage_task",
|
||||
),
|
||||
),
|
||||
]
|
||||
|
|
@ -0,0 +1,20 @@
|
|||
import django.db.models.deletion
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
dependencies = [("wanitil", "0082_change_lifecycle_stages")]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name="change",
|
||||
name="responsible",
|
||||
field=models.ForeignKey(
|
||||
blank=True,
|
||||
null=True,
|
||||
on_delete=django.db.models.deletion.PROTECT,
|
||||
related_name="responsible_chn_changes",
|
||||
to="wanitil.sysemployee",
|
||||
),
|
||||
),
|
||||
]
|
||||
|
|
@ -0,0 +1,29 @@
|
|||
import django.db.models.deletion
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
def populate_task_parent_change(apps, schema_editor):
|
||||
Task = apps.get_model("wanitil", "Task")
|
||||
Task.objects.filter(
|
||||
parent_change__isnull=True,
|
||||
change__isnull=False,
|
||||
).update(parent_change_id=models.F("change_id"))
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
dependencies = [("wanitil", "0083_change_responsible")]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name="task",
|
||||
name="parent_change",
|
||||
field=models.ForeignKey(
|
||||
blank=True,
|
||||
null=True,
|
||||
on_delete=django.db.models.deletion.CASCADE,
|
||||
related_name="child_tasks",
|
||||
to="wanitil.change",
|
||||
),
|
||||
),
|
||||
migrations.RunPython(populate_task_parent_change, migrations.RunPython.noop),
|
||||
]
|
||||
|
|
@ -0,0 +1,73 @@
|
|||
from django.db import migrations, models
|
||||
|
||||
|
||||
STATUSES = (
|
||||
("new", "Новое", "Заявка зарегистрирована, работа ещё не начата.", "#6c757d", False),
|
||||
("in_progress", "В работе", "Задача передана исполнителю и выполняется.", "#0d6efd", False),
|
||||
("pending", "Ожидание", "Работа временно приостановлена.", "#ffc107", False),
|
||||
("resolved", "Решено", "Решение найдено и ожидает подтверждения.", "#20c997", False),
|
||||
("closed", "Закрыто", "Результат подтверждён, жизненный цикл завершён.", "#198754", True),
|
||||
("cancelled", "Отменено", "Задача аннулирована.", "#dc3545", True),
|
||||
)
|
||||
|
||||
|
||||
def create_fixed_task_statuses(apps, schema_editor):
|
||||
TaskStatus = apps.get_model("wanitil", "TaskStatus")
|
||||
Task = apps.get_model("wanitil", "Task")
|
||||
ChnSettings = apps.get_model("wanitil", "ChnSettings")
|
||||
fixed = {}
|
||||
for code, name, description, color, is_closed in STATUSES:
|
||||
fixed[code], _ = TaskStatus.objects.update_or_create(
|
||||
code=code,
|
||||
defaults={
|
||||
"name": name, "description": description, "color": color,
|
||||
"is_closed": is_closed, "is_active": True,
|
||||
},
|
||||
)
|
||||
|
||||
settings = ChnSettings.objects.filter(pk=1).first()
|
||||
if settings:
|
||||
mappings = (
|
||||
(settings.task_status_create_id, fixed["new"]),
|
||||
(settings.task_status_close_id, fixed["closed"]),
|
||||
(settings.task_status_not_done_id, fixed["cancelled"]),
|
||||
)
|
||||
for old_id, target in mappings:
|
||||
if old_id and old_id != target.pk:
|
||||
Task.objects.filter(status_id=old_id).update(status_id=target.pk)
|
||||
settings.task_status_create = fixed["new"]
|
||||
settings.task_status_close = fixed["closed"]
|
||||
settings.task_status_not_done = fixed["cancelled"]
|
||||
settings.save(update_fields=(
|
||||
"task_status_create", "task_status_close", "task_status_not_done",
|
||||
))
|
||||
|
||||
Task.objects.filter(status__code__isnull=True, status__is_closed=True).update(
|
||||
status=fixed["closed"],
|
||||
)
|
||||
Task.objects.filter(status__code__isnull=True).update(status=fixed["new"])
|
||||
TaskStatus.objects.filter(code__isnull=True, tasks__isnull=True).delete()
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
atomic = False
|
||||
dependencies = [("wanitil", "0084_task_parent_change")]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name="taskstatus",
|
||||
name="code",
|
||||
field=models.CharField(
|
||||
blank=True,
|
||||
choices=[
|
||||
("new", "Новое"), ("in_progress", "В работе"),
|
||||
("pending", "Ожидание"), ("resolved", "Решено"),
|
||||
("closed", "Закрыто"), ("cancelled", "Отменено"),
|
||||
],
|
||||
max_length=32,
|
||||
null=True,
|
||||
unique=True,
|
||||
),
|
||||
),
|
||||
migrations.RunPython(create_fixed_task_statuses, migrations.RunPython.noop),
|
||||
]
|
||||
|
|
@ -0,0 +1,106 @@
|
|||
# Generated by Django 5.1.3 on 2026-09-17 17:59
|
||||
|
||||
import django.db.models.deletion
|
||||
import uuid
|
||||
import wanitil.models.modelDsk
|
||||
from django.conf import settings
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
def create_dsk_catalog(apps, schema_editor):
|
||||
Module = apps.get_model("wanitil", "SysManagment")
|
||||
Object = apps.get_model("wanitil", "SysObject")
|
||||
Navigate = apps.get_model("wanitil", "SysNavigate")
|
||||
module, _ = Module.objects.get_or_create(
|
||||
pk="dsk",
|
||||
defaults={"description": "Диск", "preference": {}},
|
||||
)
|
||||
Object.objects.update_or_create(
|
||||
pk="dsk.file",
|
||||
defaults={
|
||||
"description": "Файлы", "prefix": "DSK", "url": "dsk/files",
|
||||
"spec_field": "", "sys_name": "DskFile", "sys_managment": module,
|
||||
},
|
||||
)
|
||||
Navigate.objects.update_or_create(
|
||||
pk="dsk:file", defaults={"description": "Файлы"},
|
||||
)
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('contenttypes', '0002_remove_content_type_name'),
|
||||
('wanitil', '0085_fixed_task_statuses'),
|
||||
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.CreateModel(
|
||||
name='DskFile',
|
||||
fields=[
|
||||
('id', models.BigAutoField(primary_key=True, serialize=False)),
|
||||
('storage_id', models.UUIDField(default=uuid.uuid4, editable=False, unique=True)),
|
||||
('file', models.FileField(max_length=500, upload_to=wanitil.models.modelDsk.dsk_file_path)),
|
||||
('original_name', models.CharField(max_length=1000)),
|
||||
('content_type', models.CharField(blank=True, max_length=255)),
|
||||
('size', models.BigIntegerField()),
|
||||
('checksum', models.CharField(blank=True, db_index=True, max_length=64)),
|
||||
('created_at', models.DateTimeField(auto_now_add=True)),
|
||||
('updated_at', models.DateTimeField(auto_now=True)),
|
||||
('uploaded_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='dsk_uploaded_files', to=settings.AUTH_USER_MODEL)),
|
||||
],
|
||||
options={
|
||||
'ordering': ('-created_at', '-id'),
|
||||
},
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='DskAttachment',
|
||||
fields=[
|
||||
('id', models.BigAutoField(primary_key=True, serialize=False)),
|
||||
('target_id', models.PositiveBigIntegerField()),
|
||||
('created_at', models.DateTimeField(auto_now_add=True)),
|
||||
('created_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='dsk_created_attachments', to=settings.AUTH_USER_MODEL)),
|
||||
('target_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='contenttypes.contenttype')),
|
||||
('dsk_file', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='attachments', to='wanitil.dskfile')),
|
||||
],
|
||||
options={
|
||||
'ordering': ('id',),
|
||||
'indexes': [models.Index(fields=['target_type', 'target_id'], name='dsk_attachment_target')],
|
||||
'constraints': [models.UniqueConstraint(fields=('dsk_file', 'target_type', 'target_id'), name='dsk_unique_file_target')],
|
||||
},
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='DskFileClientAccess',
|
||||
fields=[
|
||||
('id', models.BigAutoField(primary_key=True, serialize=False)),
|
||||
('access_level', models.CharField(choices=[('read', 'Чтение'), ('edit', 'Изменение'), ('manage', 'Управление')], default='read', max_length=16)),
|
||||
('created_at', models.DateTimeField(auto_now_add=True)),
|
||||
('updated_at', models.DateTimeField(auto_now=True)),
|
||||
('client', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='dsk_file_accesses', to='wanitil.crmclient')),
|
||||
('dsk_file', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='client_accesses', to='wanitil.dskfile')),
|
||||
('granted_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='dsk_client_access_grants', to=settings.AUTH_USER_MODEL)),
|
||||
],
|
||||
options={
|
||||
'ordering': ('client_id',),
|
||||
'constraints': [models.UniqueConstraint(fields=('dsk_file', 'client'), name='dsk_unique_file_client')],
|
||||
},
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='DskFileEmployeeAccess',
|
||||
fields=[
|
||||
('id', models.BigAutoField(primary_key=True, serialize=False)),
|
||||
('access_level', models.CharField(choices=[('read', 'Чтение'), ('edit', 'Изменение'), ('manage', 'Управление')], default='read', max_length=16)),
|
||||
('created_at', models.DateTimeField(auto_now_add=True)),
|
||||
('updated_at', models.DateTimeField(auto_now=True)),
|
||||
('dsk_file', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='employee_accesses', to='wanitil.dskfile')),
|
||||
('employee', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='dsk_file_accesses', to='wanitil.sysemployee')),
|
||||
('granted_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='dsk_employee_access_grants', to=settings.AUTH_USER_MODEL)),
|
||||
],
|
||||
options={
|
||||
'ordering': ('employee_id',),
|
||||
'constraints': [models.UniqueConstraint(fields=('dsk_file', 'employee'), name='dsk_unique_file_employee')],
|
||||
},
|
||||
),
|
||||
migrations.RunPython(create_dsk_catalog, migrations.RunPython.noop),
|
||||
]
|
||||
|
|
@ -0,0 +1,134 @@
|
|||
# Generated by Django 5.1.3 on 2026-09-17 18:13
|
||||
|
||||
import os
|
||||
import uuid
|
||||
|
||||
from django.db import migrations
|
||||
|
||||
|
||||
def migrate_legacy_files(apps, schema_editor):
|
||||
DskFile = apps.get_model("wanitil", "DskFile")
|
||||
DskAttachment = apps.get_model("wanitil", "DskAttachment")
|
||||
EmployeeAccess = apps.get_model("wanitil", "DskFileEmployeeAccess")
|
||||
ClientAccess = apps.get_model("wanitil", "DskFileClientAccess")
|
||||
SysEmployee = apps.get_model("wanitil", "SysEmployee")
|
||||
CrmClient = apps.get_model("wanitil", "CrmClient")
|
||||
ContentType = apps.get_model("contenttypes", "ContentType")
|
||||
|
||||
def grant_owner(dsk_file, user_id):
|
||||
if not user_id:
|
||||
return
|
||||
employee = SysEmployee.objects.filter(sys_user_id=user_id).first()
|
||||
if employee is not None:
|
||||
EmployeeAccess.objects.create(
|
||||
dsk_file=dsk_file, employee=employee,
|
||||
access_level="manage", granted_by_id=user_id,
|
||||
)
|
||||
return
|
||||
client = CrmClient.objects.filter(sys_user_id=user_id).first()
|
||||
if client is not None:
|
||||
ClientAccess.objects.create(
|
||||
dsk_file=dsk_file, client=client,
|
||||
access_level="manage", granted_by_id=user_id,
|
||||
)
|
||||
|
||||
def transfer(legacy, target_model=None, target_id=None):
|
||||
stored_name = str(legacy.file or "")
|
||||
if not stored_name:
|
||||
return
|
||||
dsk_file = DskFile.objects.create(
|
||||
storage_id=uuid.uuid4(), file=stored_name,
|
||||
original_name=legacy.name or os.path.basename(stored_name),
|
||||
content_type="", size=0, checksum="", uploaded_by_id=legacy.sys_user_id,
|
||||
)
|
||||
grant_owner(dsk_file, legacy.sys_user_id)
|
||||
if target_model and target_id:
|
||||
content_type, _ = ContentType.objects.get_or_create(
|
||||
app_label="wanitil", model=target_model,
|
||||
)
|
||||
DskAttachment.objects.create(
|
||||
dsk_file=dsk_file, target_type=content_type,
|
||||
target_id=target_id, created_by_id=legacy.sys_user_id,
|
||||
)
|
||||
|
||||
ReqRequestFile = apps.get_model("wanitil", "ReqRequestFile")
|
||||
for legacy in ReqRequestFile.objects.all().iterator():
|
||||
transfer(legacy, "reqrequest", legacy.req_request_id)
|
||||
|
||||
ReqCommentFile = apps.get_model("wanitil", "ReqCommentFile")
|
||||
ReqComment = apps.get_model("wanitil", "ReqComment")
|
||||
request_ids = dict(ReqComment.objects.values_list("id", "req_request_id"))
|
||||
for legacy in ReqCommentFile.objects.all().iterator():
|
||||
transfer(legacy, "reqrequest", request_ids.get(legacy.req_comment_id))
|
||||
|
||||
IncIncidentFile = apps.get_model("wanitil", "IncIncidentFile")
|
||||
for legacy in IncIncidentFile.objects.all().iterator():
|
||||
transfer(legacy, "incincident", legacy.inc_incident_id)
|
||||
|
||||
IncCommentFile = apps.get_model("wanitil", "IncCommentFile")
|
||||
IncComment = apps.get_model("wanitil", "IncComment")
|
||||
incident_ids = dict(IncComment.objects.values_list("id", "inc_incident_id"))
|
||||
for legacy in IncCommentFile.objects.all().iterator():
|
||||
transfer(legacy, "incincident", incident_ids.get(legacy.inc_comment_id))
|
||||
|
||||
CrmActivityAttachment = apps.get_model("wanitil", "CrmActivityAttachment")
|
||||
for legacy in CrmActivityAttachment.objects.all().iterator():
|
||||
transfer(legacy)
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('wanitil', '0086_dskfile_dskattachment_dskfileclientaccess_and_more'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.RunPython(migrate_legacy_files, migrations.RunPython.noop),
|
||||
migrations.RemoveField(
|
||||
model_name='inccommentfile',
|
||||
name='inc_comment',
|
||||
),
|
||||
migrations.RemoveField(
|
||||
model_name='inccommentfile',
|
||||
name='sys_user',
|
||||
),
|
||||
migrations.RemoveField(
|
||||
model_name='incincidentfile',
|
||||
name='inc_incident',
|
||||
),
|
||||
migrations.RemoveField(
|
||||
model_name='incincidentfile',
|
||||
name='sys_user',
|
||||
),
|
||||
migrations.RemoveField(
|
||||
model_name='reqcommentfile',
|
||||
name='req_comment',
|
||||
),
|
||||
migrations.RemoveField(
|
||||
model_name='reqcommentfile',
|
||||
name='sys_user',
|
||||
),
|
||||
migrations.RemoveField(
|
||||
model_name='reqrequestfile',
|
||||
name='req_request',
|
||||
),
|
||||
migrations.RemoveField(
|
||||
model_name='reqrequestfile',
|
||||
name='sys_user',
|
||||
),
|
||||
migrations.DeleteModel(
|
||||
name='CrmActivityAttachment',
|
||||
),
|
||||
migrations.DeleteModel(
|
||||
name='IncCommentFile',
|
||||
),
|
||||
migrations.DeleteModel(
|
||||
name='IncIncidentFile',
|
||||
),
|
||||
migrations.DeleteModel(
|
||||
name='ReqCommentFile',
|
||||
),
|
||||
migrations.DeleteModel(
|
||||
name='ReqRequestFile',
|
||||
),
|
||||
]
|
||||
|
|
@ -0,0 +1,66 @@
|
|||
# Generated by Django 5.1.3 on 2026-09-17 18:20
|
||||
|
||||
import django.db.models.deletion
|
||||
from django.conf import settings
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
def create_tag_catalog(apps, schema_editor):
|
||||
Module = apps.get_model("wanitil", "SysManagment")
|
||||
Object = apps.get_model("wanitil", "SysObject")
|
||||
Navigate = apps.get_model("wanitil", "SysNavigate")
|
||||
module = Module.objects.get(pk="sys")
|
||||
Object.objects.update_or_create(
|
||||
pk="sys.tag",
|
||||
defaults={
|
||||
"description": "Теги", "prefix": "SYSTAG", "url": "sys/tags",
|
||||
"spec_field": "", "sys_name": "SysTag", "sys_managment": module,
|
||||
},
|
||||
)
|
||||
Navigate.objects.update_or_create(
|
||||
pk="sys:tag", defaults={"description": "Теги"},
|
||||
)
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('contenttypes', '0002_remove_content_type_name'),
|
||||
('wanitil', '0087_remove_inccommentfile_inc_comment_and_more'),
|
||||
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.CreateModel(
|
||||
name='SysTag',
|
||||
fields=[
|
||||
('id', models.BigAutoField(primary_key=True, serialize=False)),
|
||||
('name', models.CharField(max_length=128, unique=True)),
|
||||
('description', models.CharField(blank=True, max_length=1024)),
|
||||
('color', models.CharField(blank=True, default='', max_length=16)),
|
||||
('created_at', models.DateTimeField(auto_now_add=True)),
|
||||
('updated_at', models.DateTimeField(auto_now=True)),
|
||||
('created_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='created_sys_tags', to=settings.AUTH_USER_MODEL)),
|
||||
],
|
||||
options={
|
||||
'ordering': ('name', 'id'),
|
||||
},
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='SysTagAssignment',
|
||||
fields=[
|
||||
('id', models.BigAutoField(primary_key=True, serialize=False)),
|
||||
('target_id', models.PositiveBigIntegerField()),
|
||||
('created_at', models.DateTimeField(auto_now_add=True)),
|
||||
('created_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='created_sys_tag_assignments', to=settings.AUTH_USER_MODEL)),
|
||||
('tag', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='assignments', to='wanitil.systag')),
|
||||
('target_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='contenttypes.contenttype')),
|
||||
],
|
||||
options={
|
||||
'ordering': ('id',),
|
||||
'indexes': [models.Index(fields=['target_type', 'target_id'], name='sys_tag_assignment_target')],
|
||||
'constraints': [models.UniqueConstraint(fields=('tag', 'target_type', 'target_id'), name='sys_unique_tag_target')],
|
||||
},
|
||||
),
|
||||
migrations.RunPython(create_tag_catalog, migrations.RunPython.noop),
|
||||
]
|
||||
|
|
@ -0,0 +1,27 @@
|
|||
# Generated by Django 5.1.3 on 2026-09-17 18:26
|
||||
|
||||
import django.db.models.deletion
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('wanitil', '0088_systag_systagassignment'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name='task',
|
||||
name='parent_task',
|
||||
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='child_tasks', to='wanitil.task'),
|
||||
),
|
||||
migrations.AddConstraint(
|
||||
model_name='task',
|
||||
constraint=models.CheckConstraint(condition=models.Q(('parent_task__isnull', True), ('parent_change__isnull', True), _connector='OR'), name='chn_task_single_parent'),
|
||||
),
|
||||
migrations.AddConstraint(
|
||||
model_name='task',
|
||||
constraint=models.CheckConstraint(condition=models.Q(('parent_task', models.F('pk')), _negated=True), name='chn_task_not_own_parent'),
|
||||
),
|
||||
]
|
||||
|
|
@ -0,0 +1,44 @@
|
|||
from django.db import migrations, models
|
||||
|
||||
|
||||
def create_pending_status(apps, schema_editor):
|
||||
ChangeStatus = apps.get_model("wanitil", "ChangeStatus")
|
||||
ChangeStatus.objects.update_or_create(
|
||||
code="pending",
|
||||
defaults={
|
||||
"name": "Ожидание",
|
||||
"description": "Изменение ожидает завершения дочерних работ.",
|
||||
"color": "#ffc107",
|
||||
"is_active": True,
|
||||
},
|
||||
)
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
dependencies = [("wanitil", "0089_task_parent_task_task_chn_task_single_parent_and_more")]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name="changestatus",
|
||||
name="code",
|
||||
field=models.CharField(
|
||||
choices=[
|
||||
("new", "Создан"),
|
||||
("assessment", "На оценке"),
|
||||
("assessment_completed", "Оценка предоставлена"),
|
||||
("pending_approval", "На согласовании"),
|
||||
("rejected", "Отклонен"),
|
||||
("approved", "Авторизован / Запланирован"),
|
||||
("pending", "Ожидание"),
|
||||
("in_progress", "В работе"),
|
||||
("review", "Проверка"),
|
||||
("review_completed", "Проверка проведена"),
|
||||
("closed", "Закрыт"),
|
||||
("cancelled", "Отменен"),
|
||||
],
|
||||
max_length=32,
|
||||
unique=True,
|
||||
),
|
||||
),
|
||||
migrations.RunPython(create_pending_status, migrations.RunPython.noop),
|
||||
]
|
||||
|
|
@ -25,6 +25,17 @@ class TaskType(ChnReferenceModel):
|
|||
|
||||
|
||||
class TaskStatus(ChnReferenceModel):
|
||||
class Code(models.TextChoices):
|
||||
NEW = "new", "Новое"
|
||||
IN_PROGRESS = "in_progress", "В работе"
|
||||
PENDING = "pending", "Ожидание"
|
||||
RESOLVED = "resolved", "Решено"
|
||||
CLOSED = "closed", "Закрыто"
|
||||
CANCELLED = "cancelled", "Отменено"
|
||||
|
||||
code = models.CharField(
|
||||
max_length=32, choices=Code.choices, unique=True, null=True, blank=True,
|
||||
)
|
||||
color = models.CharField(max_length=7, blank=True)
|
||||
is_closed = models.BooleanField(default=False, db_index=True)
|
||||
|
||||
|
|
@ -50,11 +61,40 @@ class TaskCategory(ChnReferenceModel):
|
|||
|
||||
|
||||
class ChangeStatus(ChnReferenceModel):
|
||||
class Code(models.TextChoices):
|
||||
NEW = "new", "Создан"
|
||||
ASSESSMENT = "assessment", "На оценке"
|
||||
ASSESSMENT_COMPLETED = "assessment_completed", "Оценка предоставлена"
|
||||
PENDING_APPROVAL = "pending_approval", "На согласовании"
|
||||
REJECTED = "rejected", "Отклонен"
|
||||
APPROVED = "approved", "Авторизован / Запланирован"
|
||||
PENDING = "pending", "Ожидание"
|
||||
IN_PROGRESS = "in_progress", "В работе"
|
||||
REVIEW = "review", "Проверка"
|
||||
REVIEW_COMPLETED = "review_completed", "Проверка проведена"
|
||||
CLOSED = "closed", "Закрыт"
|
||||
CANCELLED = "cancelled", "Отменен"
|
||||
|
||||
code = models.CharField(max_length=32, choices=Code.choices, unique=True)
|
||||
color = models.CharField(max_length=7, blank=True)
|
||||
|
||||
|
||||
class ChangeType(ChnReferenceModel):
|
||||
pass
|
||||
requires_approval = models.BooleanField(default=False)
|
||||
requires_assessment = models.BooleanField(default=False)
|
||||
requires_testing = models.BooleanField(default=False)
|
||||
requires_planning = models.BooleanField(default=False)
|
||||
assessment_task_type = models.ForeignKey(
|
||||
TaskType, null=True, blank=True, related_name="assessment_change_types",
|
||||
on_delete=models.PROTECT,
|
||||
)
|
||||
testing_task_type = models.ForeignKey(
|
||||
TaskType, null=True, blank=True, related_name="testing_change_types",
|
||||
on_delete=models.PROTECT,
|
||||
)
|
||||
approvers = models.ManyToManyField(
|
||||
SysEmployee, blank=True, related_name="chn_change_types_to_approve",
|
||||
)
|
||||
|
||||
|
||||
class Change(models.Model):
|
||||
|
|
@ -70,6 +110,14 @@ class Change(models.Model):
|
|||
initiator = models.ForeignKey(
|
||||
SysEmployee, related_name="initiated_chn_changes", on_delete=models.PROTECT,
|
||||
)
|
||||
responsible = models.ForeignKey(
|
||||
SysEmployee, null=True, blank=True, related_name="responsible_chn_changes",
|
||||
on_delete=models.PROTECT,
|
||||
)
|
||||
parent_change = models.ForeignKey(
|
||||
"self", null=True, blank=True, related_name="child_changes",
|
||||
on_delete=models.CASCADE,
|
||||
)
|
||||
created_at = models.DateTimeField(auto_now_add=True)
|
||||
updated_at = models.DateTimeField(auto_now=True)
|
||||
|
||||
|
|
@ -80,6 +128,156 @@ class Change(models.Model):
|
|||
return self.title
|
||||
|
||||
|
||||
class ChangeApproval(models.Model):
|
||||
class Decision(models.TextChoices):
|
||||
PENDING = "pending", "Pending"
|
||||
APPROVED = "approved", "Approved"
|
||||
REJECTED = "rejected", "Rejected"
|
||||
|
||||
change = models.ForeignKey(Change, related_name="approvals", on_delete=models.CASCADE)
|
||||
employee = models.ForeignKey(
|
||||
SysEmployee, related_name="chn_change_approvals", on_delete=models.PROTECT,
|
||||
)
|
||||
decision = models.CharField(
|
||||
max_length=16, choices=Decision.choices, default=Decision.PENDING, db_index=True,
|
||||
)
|
||||
comment = models.TextField(blank=True)
|
||||
decided_at = models.DateTimeField(null=True, blank=True)
|
||||
|
||||
class Meta:
|
||||
ordering = ("id",)
|
||||
constraints = [models.UniqueConstraint(
|
||||
fields=("change", "employee"), name="chn_unique_change_approver",
|
||||
)]
|
||||
|
||||
|
||||
class WorkflowNode(models.Model):
|
||||
class Kind(models.TextChoices):
|
||||
TASK = "task", "Task"
|
||||
CHANGE = "change", "Change"
|
||||
INPUT = "input", "Process input"
|
||||
POSITIVE_OUTPUT = "positive_output", "Positive process output"
|
||||
NEGATIVE_OUTPUT = "negative_output", "Negative process output"
|
||||
|
||||
change_type = models.ForeignKey(
|
||||
ChangeType, related_name="workflow_nodes", on_delete=models.CASCADE,
|
||||
)
|
||||
kind = models.CharField(max_length=16, choices=Kind.choices)
|
||||
title = models.CharField(max_length=256)
|
||||
description = models.TextField(blank=True)
|
||||
x = models.FloatField(default=0)
|
||||
y = models.FloatField(default=0)
|
||||
task_type = models.ForeignKey(
|
||||
TaskType, null=True, blank=True, related_name="workflow_nodes",
|
||||
on_delete=models.PROTECT,
|
||||
)
|
||||
child_change_type = models.ForeignKey(
|
||||
ChangeType, null=True, blank=True, related_name="parent_workflow_nodes",
|
||||
on_delete=models.PROTECT,
|
||||
)
|
||||
priority = models.ForeignKey(
|
||||
TaskPriority, null=True, blank=True, related_name="workflow_nodes",
|
||||
on_delete=models.SET_NULL,
|
||||
)
|
||||
department = models.ForeignKey(
|
||||
SysDepartment, null=True, blank=True, related_name="chn_workflow_nodes",
|
||||
on_delete=models.PROTECT,
|
||||
)
|
||||
assignees = models.ManyToManyField(
|
||||
SysEmployee, blank=True, related_name="chn_workflow_nodes",
|
||||
)
|
||||
|
||||
class Meta:
|
||||
ordering = ("id",)
|
||||
constraints = [
|
||||
models.UniqueConstraint(
|
||||
fields=("change_type",), condition=models.Q(kind="input"),
|
||||
name="chn_unique_workflow_input",
|
||||
),
|
||||
models.UniqueConstraint(
|
||||
fields=("change_type",), condition=models.Q(kind="positive_output"),
|
||||
name="chn_unique_workflow_positive_output",
|
||||
),
|
||||
models.UniqueConstraint(
|
||||
fields=("change_type",), condition=models.Q(kind="negative_output"),
|
||||
name="chn_unique_workflow_negative_output",
|
||||
),
|
||||
]
|
||||
|
||||
def clean(self):
|
||||
super().clean()
|
||||
errors = {}
|
||||
if self.kind == self.Kind.TASK and not self.task_type_id:
|
||||
errors["task_type"] = "Task node requires a task type."
|
||||
if self.kind == self.Kind.CHANGE and not self.child_change_type_id:
|
||||
errors["child_change_type"] = "Change node requires a change type."
|
||||
if self.child_change_type_id and self.child_change_type_id == self.change_type_id:
|
||||
errors["child_change_type"] = "A workflow cannot recursively create its own type."
|
||||
if errors:
|
||||
raise ValidationError(errors)
|
||||
|
||||
|
||||
class WorkflowEdge(models.Model):
|
||||
class Decision(models.TextChoices):
|
||||
ALWAYS = "always", "Always"
|
||||
POSITIVE = "positive", "Positive"
|
||||
NEGATIVE = "negative", "Negative"
|
||||
|
||||
source = models.ForeignKey(
|
||||
WorkflowNode, related_name="outgoing_edges", on_delete=models.CASCADE,
|
||||
)
|
||||
target = models.ForeignKey(
|
||||
WorkflowNode, related_name="incoming_edges", on_delete=models.CASCADE,
|
||||
)
|
||||
decision = models.CharField(max_length=16, choices=Decision.choices)
|
||||
|
||||
class Meta:
|
||||
ordering = ("id",)
|
||||
constraints = [
|
||||
models.UniqueConstraint(
|
||||
fields=("source", "target", "decision"), name="chn_unique_workflow_edge",
|
||||
),
|
||||
models.CheckConstraint(
|
||||
condition=~models.Q(source=models.F("target")),
|
||||
name="chn_workflow_edge_different_nodes",
|
||||
),
|
||||
]
|
||||
|
||||
def clean(self):
|
||||
super().clean()
|
||||
if self.source_id and self.target_id and (
|
||||
self.source.change_type_id != self.target.change_type_id
|
||||
):
|
||||
raise ValidationError({"target": "Nodes must belong to the same change type."})
|
||||
|
||||
|
||||
class WorkflowRun(models.Model):
|
||||
class State(models.TextChoices):
|
||||
PENDING = "pending", "Pending"
|
||||
ACTIVE = "active", "Active"
|
||||
SUCCEEDED = "succeeded", "Succeeded"
|
||||
FAILED = "failed", "Failed"
|
||||
|
||||
change = models.ForeignKey(Change, related_name="workflow_runs", on_delete=models.CASCADE)
|
||||
node = models.ForeignKey(WorkflowNode, related_name="runs", on_delete=models.PROTECT)
|
||||
task = models.OneToOneField(
|
||||
"Task", null=True, blank=True, related_name="workflow_run", on_delete=models.CASCADE,
|
||||
)
|
||||
child_change = models.OneToOneField(
|
||||
Change, null=True, blank=True, related_name="parent_workflow_run",
|
||||
on_delete=models.CASCADE,
|
||||
)
|
||||
state = models.CharField(
|
||||
max_length=16, choices=State.choices, default=State.PENDING, db_index=True,
|
||||
)
|
||||
|
||||
class Meta:
|
||||
ordering = ("id",)
|
||||
constraints = [models.UniqueConstraint(
|
||||
fields=("change", "node"), name="chn_unique_workflow_node_run",
|
||||
)]
|
||||
|
||||
|
||||
class Task(models.Model):
|
||||
class ProcessState(models.TextChoices):
|
||||
ACTIVE = "active", "Active"
|
||||
|
|
@ -87,17 +285,23 @@ class Task(models.Model):
|
|||
COMPLETED = "completed", "Completed"
|
||||
NOT_DONE = "not_done", "Not done"
|
||||
|
||||
class ChangeStage(models.TextChoices):
|
||||
ASSESSMENT = "assessment", "Change assessment"
|
||||
TESTING = "testing", "Post-implementation review"
|
||||
|
||||
title = models.CharField(max_length=256)
|
||||
description = models.TextField(blank=True)
|
||||
result = models.TextField(blank=True)
|
||||
task_type = models.ForeignKey(
|
||||
TaskType, related_name="tasks", on_delete=models.PROTECT,
|
||||
TaskType, null=True, blank=True, related_name="tasks",
|
||||
on_delete=models.SET_NULL,
|
||||
)
|
||||
status = models.ForeignKey(
|
||||
TaskStatus, related_name="tasks", on_delete=models.PROTECT,
|
||||
)
|
||||
priority = models.ForeignKey(
|
||||
TaskPriority, related_name="tasks", on_delete=models.PROTECT,
|
||||
TaskPriority, null=True, blank=True, related_name="tasks",
|
||||
on_delete=models.SET_NULL,
|
||||
)
|
||||
category = models.ForeignKey(
|
||||
TaskCategory, null=True, blank=True, related_name="tasks",
|
||||
|
|
@ -106,9 +310,19 @@ class Task(models.Model):
|
|||
change = models.ForeignKey(
|
||||
Change, null=True, blank=True, related_name="tasks", on_delete=models.CASCADE,
|
||||
)
|
||||
assignee = models.ForeignKey(
|
||||
SysEmployee, null=True, blank=True, related_name="assigned_chn_tasks",
|
||||
on_delete=models.PROTECT,
|
||||
parent_change = models.ForeignKey(
|
||||
Change, null=True, blank=True, related_name="child_tasks",
|
||||
on_delete=models.CASCADE,
|
||||
)
|
||||
parent_task = models.ForeignKey(
|
||||
"self", null=True, blank=True, related_name="child_tasks",
|
||||
on_delete=models.CASCADE,
|
||||
)
|
||||
change_stage = models.CharField(
|
||||
max_length=16, choices=ChangeStage.choices, null=True, blank=True, db_index=True,
|
||||
)
|
||||
assignees = models.ManyToManyField(
|
||||
SysEmployee, blank=True, related_name="assigned_chn_tasks",
|
||||
)
|
||||
department = models.ForeignKey(
|
||||
SysDepartment, null=True, blank=True, related_name="assigned_chn_tasks",
|
||||
|
|
@ -117,8 +331,8 @@ class Task(models.Model):
|
|||
initiator = models.ForeignKey(
|
||||
SysEmployee, related_name="initiated_chn_tasks", on_delete=models.PROTECT,
|
||||
)
|
||||
planned_start_at = models.DateTimeField(db_index=True)
|
||||
planned_finish_at = models.DateTimeField(db_index=True)
|
||||
planned_start_at = models.DateTimeField(null=True, blank=True, db_index=True)
|
||||
planned_finish_at = models.DateTimeField(null=True, blank=True, db_index=True)
|
||||
actual_start_at = models.DateTimeField(null=True, blank=True)
|
||||
actual_finish_at = models.DateTimeField(null=True, blank=True)
|
||||
progress = models.PositiveSmallIntegerField(default=0)
|
||||
|
|
@ -132,17 +346,28 @@ class Task(models.Model):
|
|||
|
||||
class Meta:
|
||||
ordering = ("planned_finish_at", "-priority__weight", "id")
|
||||
constraints = [
|
||||
models.UniqueConstraint(
|
||||
fields=("change", "change_stage"),
|
||||
condition=models.Q(change_stage__isnull=False),
|
||||
name="chn_unique_change_stage_task",
|
||||
),
|
||||
models.CheckConstraint(
|
||||
condition=(
|
||||
models.Q(parent_task__isnull=True)
|
||||
| models.Q(parent_change__isnull=True)
|
||||
),
|
||||
name="chn_task_single_parent",
|
||||
),
|
||||
models.CheckConstraint(
|
||||
condition=~models.Q(parent_task=models.F("pk")),
|
||||
name="chn_task_not_own_parent",
|
||||
),
|
||||
]
|
||||
indexes = [
|
||||
models.Index(fields=("assignee", "status"), name="chn_task_assignee_status"),
|
||||
models.Index(fields=("department", "status"), name="chn_task_department_status"),
|
||||
models.Index(fields=("initiator", "status"), name="chn_task_initiator_status"),
|
||||
]
|
||||
constraints = [
|
||||
models.CheckConstraint(
|
||||
condition=models.Q(assignee__isnull=False) | models.Q(department__isnull=False),
|
||||
name="chn_task_has_assignment",
|
||||
),
|
||||
]
|
||||
|
||||
def __str__(self):
|
||||
return self.title
|
||||
|
|
@ -162,20 +387,38 @@ class Task(models.Model):
|
|||
def clean(self):
|
||||
super().clean()
|
||||
errors = {}
|
||||
if self.parent_task_id and self.parent_change_id:
|
||||
errors["parent_task"] = (
|
||||
"Укажите только одну родительскую сущность: задачу или изменение."
|
||||
)
|
||||
if self.parent_task_id and self.pk:
|
||||
ancestor = self.parent_task
|
||||
visited = set()
|
||||
while ancestor is not None and ancestor.pk not in visited:
|
||||
if ancestor.pk == self.pk:
|
||||
errors["parent_task"] = "Иерархия задач не может содержать цикл."
|
||||
break
|
||||
visited.add(ancestor.pk)
|
||||
ancestor = ancestor.parent_task
|
||||
if self.planned_start_at and self.planned_finish_at and self.planned_finish_at < self.planned_start_at:
|
||||
errors["planned_finish_at"] = "Planned finish cannot be earlier than planned start."
|
||||
if self.actual_start_at and self.actual_finish_at and self.actual_finish_at < self.actual_start_at:
|
||||
errors["actual_finish_at"] = "Actual finish cannot be earlier than actual start."
|
||||
if self.progress > 100:
|
||||
errors["progress"] = "Progress must be between 0 and 100."
|
||||
if self.assignee_id is None and self.department_id is None:
|
||||
errors["assignee"] = "An assignee or department must be specified."
|
||||
if (
|
||||
self.assignee_id is not None
|
||||
and self.department_id is not None
|
||||
and not self.assignee.departments.filter(pk=self.department_id).exists()
|
||||
):
|
||||
errors["assignee"] = "The assignee must belong to the selected department."
|
||||
if self.pk:
|
||||
assignees = self.assignees.all()
|
||||
if not assignees.exists() and self.department_id is None:
|
||||
errors["assignees"] = "Assignees or a department must be specified."
|
||||
if self.department_id is not None:
|
||||
invalid_ids = list(
|
||||
assignees.exclude(departments__id=self.department_id)
|
||||
.values_list("id", flat=True)
|
||||
)
|
||||
if invalid_ids:
|
||||
errors["assignees"] = (
|
||||
"All assignees must belong to the selected department."
|
||||
)
|
||||
if errors:
|
||||
raise ValidationError(errors)
|
||||
|
||||
|
|
@ -241,10 +484,6 @@ class ChnSettings(models.Model):
|
|||
task_status_not_done = models.ForeignKey(
|
||||
TaskStatus, null=True, blank=True, related_name="+", on_delete=models.PROTECT,
|
||||
)
|
||||
change_status_on_check = models.ForeignKey(
|
||||
ChangeStatus, null=True, blank=True, related_name="+", on_delete=models.PROTECT,
|
||||
)
|
||||
|
||||
def save(self, *args, **kwargs):
|
||||
self.pk = 1
|
||||
return super().save(*args, **kwargs)
|
||||
|
|
|
|||
|
|
@ -1,23 +1,31 @@
|
|||
from django.db import models
|
||||
from django.contrib.auth.models import User
|
||||
from .modelCon import ConPerson
|
||||
from .modelSys import SysModuleMembership
|
||||
from .modelSys import SysEmployee, SysProfileEmployee
|
||||
|
||||
|
||||
from .baseModel import BaseModel, BaseCreateDateModel, BaseCreateModel, BaseUpdateModel, BaseExtraModel, BaseExtraCreateDateModel, BaseExtraCreateModel, BaseExtraUpdateModel
|
||||
|
||||
|
||||
|
||||
class CrmType(BaseModel):
|
||||
class CrmClientType(BaseModel):
|
||||
id = models.BigAutoField(primary_key=True, help_text="Unique identifier of the CRM type")
|
||||
name = models.CharField(max_length=64, blank=True, help_text="Name of the CRM type")
|
||||
description = models.CharField(max_length=1024, blank=True, help_text="Description of the CRM type")
|
||||
description = models.CharField(max_length=1024, blank=True, help_text="Description of the CRM type")
|
||||
color = models.CharField(
|
||||
max_length=60, blank=True, default="",
|
||||
help_text="Color used to highlight the CRM type",
|
||||
)
|
||||
|
||||
|
||||
class CrmCategory(BaseModel):
|
||||
class CrmClientCategory(BaseModel):
|
||||
id = models.BigAutoField(primary_key=True, help_text="Unique identifier of the CRM category")
|
||||
name = models.CharField(max_length=64, blank=True, help_text="Name of the CRM category")
|
||||
description = models.CharField(max_length=1024, blank=True, help_text="Description of the CRM category")
|
||||
color = models.CharField(
|
||||
max_length=60, blank=True, default="",
|
||||
help_text="Color used to highlight the CRM category",
|
||||
)
|
||||
|
||||
|
||||
class CrmClient(BaseExtraUpdateModel):
|
||||
|
|
@ -81,9 +89,14 @@ class CrmClient(BaseExtraUpdateModel):
|
|||
null=True, blank=True, help_text="Actual address longitude",
|
||||
)
|
||||
crm_type = models.ForeignKey(
|
||||
CrmType, null=True, related_name='crm_client', on_delete=models.SET_NULL, help_text="Type of the CRM client")
|
||||
CrmClientType, null=True, related_name='crm_client', on_delete=models.SET_NULL, help_text="Type of the CRM client")
|
||||
crm_category = models.ForeignKey(
|
||||
CrmCategory, null=True, related_name='crm_client', on_delete=models.SET_NULL, help_text="Category of the CRM client")
|
||||
CrmClientCategory, null=True, related_name='crm_client', on_delete=models.SET_NULL, help_text="Category of the CRM client")
|
||||
assigned = models.ForeignKey(
|
||||
SysEmployee, null=True, blank=True,
|
||||
related_name="assigned_crm_clients", on_delete=models.SET_NULL,
|
||||
help_text="Employee assigned to the CRM client",
|
||||
)
|
||||
|
||||
|
||||
class CrmContractStatus(models.TextChoices):
|
||||
|
|
@ -142,10 +155,10 @@ class CrmLead(models.Model):
|
|||
default=CrmLeadStatus.NEW, db_index=True,
|
||||
help_text="Current lead stage in the sales funnel",
|
||||
)
|
||||
responsible = models.ForeignKey(
|
||||
SysModuleMembership, null=True, blank=True, related_name="crm_lead",
|
||||
assigned = models.ForeignKey(
|
||||
SysEmployee, null=True, blank=True, related_name="assigned_crm_leads",
|
||||
on_delete=models.SET_NULL,
|
||||
help_text="CRM employee responsible for the lead",
|
||||
help_text="Employee assigned to the CRM lead",
|
||||
)
|
||||
source = models.CharField(
|
||||
max_length=20, choices=CrmLeadSource.choices, null=True, blank=True,
|
||||
|
|
@ -178,6 +191,7 @@ class CrmActivityType(models.TextChoices):
|
|||
CALL = "call", "Call"
|
||||
MESSENGER_MESSAGE = "messenger_message", "Messenger message"
|
||||
EMAIL = "email", "Email"
|
||||
REMINDER = "reminder", "Reminder"
|
||||
|
||||
|
||||
class CrmActivitySubjectType(models.TextChoices):
|
||||
|
|
@ -191,6 +205,7 @@ class CrmActivityReferenceType(models.TextChoices):
|
|||
TASK = "task", "Task"
|
||||
MESSENGER_MESSAGE = "messenger_message", "Messenger message"
|
||||
EMAIL = "email", "Email"
|
||||
REMINDER = "reminder", "Reminder"
|
||||
|
||||
|
||||
class CrmActivity(models.Model):
|
||||
|
|
@ -242,6 +257,7 @@ class CrmActivity(models.Model):
|
|||
CrmActivityType.CALL: CrmActivityReferenceType.CALL,
|
||||
CrmActivityType.MESSENGER_MESSAGE: CrmActivityReferenceType.MESSENGER_MESSAGE,
|
||||
CrmActivityType.EMAIL: CrmActivityReferenceType.EMAIL,
|
||||
CrmActivityType.REMINDER: CrmActivityReferenceType.REMINDER,
|
||||
CrmActivityType.COMMENT: None,
|
||||
}.get(self.type)
|
||||
if self.reference_type != expected:
|
||||
|
|
@ -252,23 +268,11 @@ class CrmActivity(models.Model):
|
|||
raise ValidationError(errors)
|
||||
|
||||
|
||||
# Kept only because migration 0045 serializes this callable.
|
||||
def crm_activity_attachment_path(instance, filename):
|
||||
return f"wanitil/crm/activity/{instance.activity_id}/{filename}"
|
||||
|
||||
|
||||
class CrmActivityAttachment(models.Model):
|
||||
id = models.BigAutoField(primary_key=True)
|
||||
activity = models.ForeignKey(
|
||||
CrmActivity, related_name="attachments", on_delete=models.CASCADE,
|
||||
)
|
||||
name = models.CharField(max_length=1000, blank=True)
|
||||
file = models.FileField(upload_to=crm_activity_attachment_path)
|
||||
sysdatemod = models.DateTimeField(auto_now=True)
|
||||
sys_user = models.ForeignKey(
|
||||
User, null=True, related_name="+", on_delete=models.SET_NULL,
|
||||
)
|
||||
|
||||
|
||||
class CrmSettings(models.Model):
|
||||
"""Singleton settings record for the CRM module."""
|
||||
|
||||
|
|
@ -276,7 +280,7 @@ class CrmSettings(models.Model):
|
|||
primary_key=True, default=1, editable=False,
|
||||
)
|
||||
default_lead_employee = models.ForeignKey(
|
||||
SysModuleMembership, null=True, blank=True, related_name="+",
|
||||
SysProfileEmployee, null=True, blank=True, related_name="+",
|
||||
on_delete=models.PROTECT,
|
||||
help_text="Default employee responsible for new leads",
|
||||
)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,132 @@
|
|||
import uuid
|
||||
|
||||
from django.contrib.auth.models import User
|
||||
from django.contrib.contenttypes.fields import GenericForeignKey
|
||||
from django.contrib.contenttypes.models import ContentType
|
||||
from django.db import models
|
||||
|
||||
from .modelCrm import CrmClient
|
||||
from .modelSys import SysEmployee
|
||||
|
||||
|
||||
def dsk_file_path(instance, filename):
|
||||
extension = filename.rsplit(".", 1)[-1].lower() if "." in filename else ""
|
||||
suffix = f".{extension}" if extension else ""
|
||||
identifier = str(instance.storage_id)
|
||||
return f"wanitil/dsk/{identifier[:2]}/{identifier}{suffix}"
|
||||
|
||||
|
||||
class DskAccessLevel(models.TextChoices):
|
||||
READ = "read", "Чтение"
|
||||
EDIT = "edit", "Изменение"
|
||||
MANAGE = "manage", "Управление"
|
||||
|
||||
|
||||
class DskFile(models.Model):
|
||||
"""A private file stored independently from its business object links."""
|
||||
|
||||
id = models.BigAutoField(primary_key=True)
|
||||
storage_id = models.UUIDField(default=uuid.uuid4, unique=True, editable=False)
|
||||
file = models.FileField(upload_to=dsk_file_path, max_length=500)
|
||||
original_name = models.CharField(max_length=1000)
|
||||
content_type = models.CharField(max_length=255, blank=True)
|
||||
size = models.BigIntegerField()
|
||||
checksum = models.CharField(max_length=64, blank=True, db_index=True)
|
||||
uploaded_by = models.ForeignKey(
|
||||
User, null=True, related_name="dsk_uploaded_files", on_delete=models.SET_NULL,
|
||||
)
|
||||
created_at = models.DateTimeField(auto_now_add=True)
|
||||
updated_at = models.DateTimeField(auto_now=True)
|
||||
|
||||
class Meta:
|
||||
ordering = ("-created_at", "-id")
|
||||
|
||||
|
||||
class DskAttachment(models.Model):
|
||||
"""A generic link between a DSK file and a business object."""
|
||||
|
||||
id = models.BigAutoField(primary_key=True)
|
||||
dsk_file = models.ForeignKey(
|
||||
DskFile, related_name="attachments", on_delete=models.CASCADE,
|
||||
)
|
||||
target_type = models.ForeignKey(ContentType, on_delete=models.CASCADE)
|
||||
target_id = models.PositiveBigIntegerField()
|
||||
target = GenericForeignKey("target_type", "target_id")
|
||||
created_by = models.ForeignKey(
|
||||
User, null=True, related_name="dsk_created_attachments",
|
||||
on_delete=models.SET_NULL,
|
||||
)
|
||||
created_at = models.DateTimeField(auto_now_add=True)
|
||||
|
||||
class Meta:
|
||||
ordering = ("id",)
|
||||
indexes = [
|
||||
models.Index(
|
||||
fields=("target_type", "target_id"),
|
||||
name="dsk_attachment_target",
|
||||
),
|
||||
]
|
||||
constraints = [
|
||||
models.UniqueConstraint(
|
||||
fields=("dsk_file", "target_type", "target_id"),
|
||||
name="dsk_unique_file_target",
|
||||
),
|
||||
]
|
||||
|
||||
|
||||
class DskFileEmployeeAccess(models.Model):
|
||||
id = models.BigAutoField(primary_key=True)
|
||||
dsk_file = models.ForeignKey(
|
||||
DskFile, related_name="employee_accesses", on_delete=models.CASCADE,
|
||||
)
|
||||
employee = models.ForeignKey(
|
||||
SysEmployee, related_name="dsk_file_accesses", on_delete=models.CASCADE,
|
||||
)
|
||||
access_level = models.CharField(
|
||||
max_length=16, choices=DskAccessLevel.choices,
|
||||
default=DskAccessLevel.READ,
|
||||
)
|
||||
granted_by = models.ForeignKey(
|
||||
User, null=True, related_name="dsk_employee_access_grants",
|
||||
on_delete=models.SET_NULL,
|
||||
)
|
||||
created_at = models.DateTimeField(auto_now_add=True)
|
||||
updated_at = models.DateTimeField(auto_now=True)
|
||||
|
||||
class Meta:
|
||||
ordering = ("employee_id",)
|
||||
constraints = [
|
||||
models.UniqueConstraint(
|
||||
fields=("dsk_file", "employee"),
|
||||
name="dsk_unique_file_employee",
|
||||
),
|
||||
]
|
||||
|
||||
|
||||
class DskFileClientAccess(models.Model):
|
||||
id = models.BigAutoField(primary_key=True)
|
||||
dsk_file = models.ForeignKey(
|
||||
DskFile, related_name="client_accesses", on_delete=models.CASCADE,
|
||||
)
|
||||
client = models.ForeignKey(
|
||||
CrmClient, related_name="dsk_file_accesses", on_delete=models.CASCADE,
|
||||
)
|
||||
access_level = models.CharField(
|
||||
max_length=16, choices=DskAccessLevel.choices,
|
||||
default=DskAccessLevel.READ,
|
||||
)
|
||||
granted_by = models.ForeignKey(
|
||||
User, null=True, related_name="dsk_client_access_grants",
|
||||
on_delete=models.SET_NULL,
|
||||
)
|
||||
created_at = models.DateTimeField(auto_now_add=True)
|
||||
updated_at = models.DateTimeField(auto_now=True)
|
||||
|
||||
class Meta:
|
||||
ordering = ("client_id",)
|
||||
constraints = [
|
||||
models.UniqueConstraint(
|
||||
fields=("dsk_file", "client"),
|
||||
name="dsk_unique_file_client",
|
||||
),
|
||||
]
|
||||
|
|
@ -7,7 +7,7 @@ from django.db.models.signals import post_save
|
|||
from django.db import models
|
||||
from django.contrib.auth.models import User
|
||||
from .modelCon import ConContact, ConPerson
|
||||
from .modelSys import SysModuleMembership
|
||||
from .modelSys import SysProfileEmployee
|
||||
from django.forms.models import model_to_dict
|
||||
from simple_history.models import HistoricalRecords
|
||||
|
||||
|
|
@ -26,9 +26,9 @@ class IncGroup(BaseModel):
|
|||
name = models.CharField(max_length=64, blank=True, help_text="Name of the incident group")
|
||||
description = models.CharField(max_length=1024, blank=True, help_text="Description of the incident group")
|
||||
manager = models.ForeignKey(
|
||||
SysModuleMembership, null=True, related_name='inc_group_manager', on_delete=models.SET_NULL, help_text="Manager of the group")
|
||||
SysProfileEmployee, null=True, related_name='inc_group_manager', on_delete=models.SET_NULL, help_text="Manager of the group")
|
||||
inc_employee = models.ManyToManyField(
|
||||
SysModuleMembership, related_name='inc_group', symmetrical=False, help_text="Employees in the group")
|
||||
SysProfileEmployee, related_name='inc_group', symmetrical=False, help_text="Employees in the group")
|
||||
|
||||
|
||||
class IncSourceType(BaseModel):
|
||||
|
|
@ -117,7 +117,7 @@ class IncIncident(BaseExtraUpdateModel):
|
|||
IncSourceType, null=True, related_name='inc_incident', on_delete=models.DO_NOTHING, help_text="Source type of the incident")
|
||||
|
||||
inc_employee = models.ForeignKey(
|
||||
SysModuleMembership, null=True, related_name='inc_incident', on_delete=models.DO_NOTHING, help_text="Employee assigned to the incident")
|
||||
SysProfileEmployee, null=True, related_name='inc_incident', on_delete=models.DO_NOTHING, help_text="Employee assigned to the incident")
|
||||
inc_group = models.ForeignKey(
|
||||
IncGroup, null=True, related_name='inc_incident', on_delete=models.DO_NOTHING, help_text="Group assigned to the incident")
|
||||
|
||||
|
|
@ -161,7 +161,7 @@ class IncIncidentHistorical(BaseModel):
|
|||
IncSourceType, null=True, related_name='inc_incident_historical', on_delete=models.DO_NOTHING)
|
||||
|
||||
inc_employee = models.ForeignKey(
|
||||
SysModuleMembership, null=True, related_name='inc_incident_historical', on_delete=models.DO_NOTHING)
|
||||
SysProfileEmployee, null=True, related_name='inc_incident_historical', on_delete=models.DO_NOTHING)
|
||||
inc_group = models.ForeignKey(
|
||||
IncGroup, null=True, related_name='inc_incident_historical', on_delete=models.DO_NOTHING)
|
||||
|
||||
|
|
@ -290,40 +290,15 @@ class IncSettings(models.Model):
|
|||
return super().save(*args, **kwargs)
|
||||
|
||||
|
||||
# Kept only because historical migrations serialize these callables.
|
||||
def incident_directory_path(instance, filename):
|
||||
# file will be uploaded to MEDIA_ROOT/..
|
||||
# return '{0}/{1}'.format(instance.req_request.id, filename)
|
||||
return 'wanitil/incincident/{0}/{1}'.format(instance.inc_incident.id, filename)
|
||||
|
||||
|
||||
def comment_directory_path(instance, filename):
|
||||
# file will be uploaded to MEDIA_ROOT/..
|
||||
# return '{0}/{1}'.format(instance.req_request.id, filename)
|
||||
return 'wanitil/inccomment/{0}/{1}'.format(instance.inc_comment.id, filename)
|
||||
|
||||
|
||||
class IncIncidentFile(models.Model):
|
||||
id = models.BigAutoField(primary_key=True)
|
||||
name = models.CharField(max_length=1000, blank=True)
|
||||
file = models.FileField(upload_to=incident_directory_path)
|
||||
inc_incident = models.ForeignKey(
|
||||
IncIncident, related_name='inc_incident_file', on_delete=models.CASCADE)
|
||||
sysdatemod = models.DateTimeField(auto_now=True, blank=True)
|
||||
sys_user = models.ForeignKey(
|
||||
User, null=True, related_name='+', on_delete=models.SET_NULL)
|
||||
|
||||
|
||||
class IncCommentFile(models.Model):
|
||||
id = models.BigAutoField(primary_key=True)
|
||||
name = models.CharField(max_length=1000, blank=True)
|
||||
file = models.FileField(upload_to=comment_directory_path)
|
||||
inc_comment = models.ForeignKey(
|
||||
IncComment, related_name='inc_comment_file', on_delete=models.CASCADE)
|
||||
sysdatemod = models.DateTimeField(auto_now=True, blank=True)
|
||||
sys_user = models.ForeignKey(
|
||||
User, null=True, related_name='+', on_delete=models.SET_NULL)
|
||||
|
||||
|
||||
return f"wanitil/incincident/{instance.inc_incident.id}/{filename}"
|
||||
|
||||
|
||||
def comment_directory_path(instance, filename):
|
||||
return f"wanitil/inccomment/{instance.inc_comment.id}/{filename}"
|
||||
|
||||
|
||||
def IncGetPreferenceValue(nameIn):
|
||||
field_name = {
|
||||
"inc_status_create": "status_create_id",
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ from django.db.models.signals import post_save
|
|||
from django.db import models
|
||||
from django.contrib.auth.models import User
|
||||
from .modelCon import ConContact, ConPerson
|
||||
from .modelSys import SysModuleMembership
|
||||
from .modelSys import SysProfileEmployee
|
||||
from django.forms.models import model_to_dict
|
||||
|
||||
from simple_history.models import HistoricalRecords
|
||||
|
|
@ -69,7 +69,7 @@ class ReqRequest(BaseExtraUpdateModel):
|
|||
req_source_type = models.ForeignKey(
|
||||
ReqSourceType, null=True, related_name='req_request', on_delete=models.DO_NOTHING, help_text="Source type of the request")
|
||||
req_employee = models.ForeignKey(
|
||||
SysModuleMembership, null=True, related_name='req_request', on_delete=models.SET_NULL, help_text="Employee assigned to the request")
|
||||
SysProfileEmployee, null=True, related_name='req_request', on_delete=models.SET_NULL, help_text="Employee assigned to the request")
|
||||
|
||||
client_id = models.IntegerField(null=True, db_index=True, help_text="ID of the client")
|
||||
client_extid = models.CharField(max_length=64, null=True, blank=True, help_text="External ID of the client")
|
||||
|
|
@ -149,7 +149,7 @@ class ReqRequestHistorical(models.Model):
|
|||
req_criticality = models.ForeignKey(
|
||||
ReqCriticality, null=True, related_name='req_request_historical', on_delete=models.DO_NOTHING, help_text="Criticality of the request")
|
||||
req_employee = models.ForeignKey(
|
||||
SysModuleMembership, null=True, related_name='req_request_historical', on_delete=models.DO_NOTHING, help_text="Employee assigned to the request")
|
||||
SysProfileEmployee, null=True, related_name='req_request_historical', on_delete=models.DO_NOTHING, help_text="Employee assigned to the request")
|
||||
req_source_type = models.ForeignKey(
|
||||
ReqSourceType, null=True, related_name='req_request_historical', on_delete=models.DO_NOTHING, help_text="Source type of the request")
|
||||
|
||||
|
|
@ -242,7 +242,7 @@ class ReqRequestHistorical(models.Model):
|
|||
db_table = 'wanitil_historicalreqrequest'
|
||||
|
||||
|
||||
class ReqComment(BaseCreateDateModel):
|
||||
class ReqComment(BaseCreateDateModel):
|
||||
id = models.BigAutoField(primary_key=True, help_text="Unique identifier of the request comment")
|
||||
req_request = models.ForeignKey(
|
||||
ReqRequest, null=True, related_name='req_comment', on_delete=models.CASCADE, help_text="Request associated with the comment")
|
||||
|
|
@ -250,45 +250,20 @@ class ReqComment(BaseCreateDateModel):
|
|||
author = models.CharField(max_length=256, null=True, help_text="Author of the comment")
|
||||
# author type 1- employee, 10 -client
|
||||
author_type = models.IntegerField(null=True, help_text="Type of the author (1-employee, 10-client)")
|
||||
sys_user = models.ForeignKey(
|
||||
User, null=True, related_name='+', on_delete=models.SET_NULL, help_text="System user associated with the comment")
|
||||
sys_user = models.ForeignKey(
|
||||
User, null=True, related_name='+', on_delete=models.SET_NULL, help_text="System user associated with the comment")
|
||||
|
||||
|
||||
# Kept only because historical migrations serialize these callables.
|
||||
def request_directory_path(instance, filename):
|
||||
return f"wanitil/reqrequest/{instance.req_request.id}/{filename}"
|
||||
|
||||
|
||||
def comment_directory_path(instance, filename):
|
||||
return f"wanitil/reqcomment/{instance.req_comment.id}/{filename}"
|
||||
|
||||
|
||||
def request_directory_path(instance, filename):
|
||||
# file will be uploaded to MEDIA_ROOT/..
|
||||
# return '{0}/{1}'.format(instance.req_request.id, filename)
|
||||
return 'wanitil/reqrequest/{0}/{1}'.format(instance.req_request.id, filename)
|
||||
|
||||
|
||||
def comment_directory_path(instance, filename):
|
||||
# file will be uploaded to MEDIA_ROOT/..
|
||||
# return '{0}/{1}'.format(instance.req_request.id, filename)
|
||||
return 'wanitil/reqcomment/{0}/{1}'.format(instance.req_comment.id, filename)
|
||||
|
||||
|
||||
class ReqRequestFile(models.Model):
|
||||
id = models.BigAutoField(primary_key=True, help_text="Unique identifier of the request file")
|
||||
name = models.CharField(max_length=1000, blank=True, help_text="Name of the file")
|
||||
file = models.FileField(upload_to=request_directory_path, help_text="File upload")
|
||||
req_request = models.ForeignKey(
|
||||
ReqRequest, related_name='req_request_file', on_delete=models.CASCADE, help_text="Request associated with the file")
|
||||
sysdatemod = models.DateTimeField(auto_now=True, blank=True, help_text="Date when the file was modified")
|
||||
sys_user = models.ForeignKey(
|
||||
User, null=True, related_name='+', on_delete=models.SET_NULL, help_text="System user who uploaded the file")
|
||||
|
||||
|
||||
class ReqCommentFile(models.Model):
|
||||
id = models.BigAutoField(primary_key=True, help_text="Unique identifier of the comment file")
|
||||
name = models.CharField(max_length=1000, blank=True, help_text="Name of the file")
|
||||
file = models.FileField(upload_to=comment_directory_path, help_text="File upload")
|
||||
req_comment = models.ForeignKey(
|
||||
ReqComment, related_name='req_comment_file', on_delete=models.CASCADE, help_text="Comment associated with the file")
|
||||
sysdatemod = models.DateTimeField(auto_now=True, blank=True, help_text="Date when the file was modified")
|
||||
sys_user = models.ForeignKey(
|
||||
User, null=True, related_name='+', on_delete=models.SET_NULL, help_text="System user who uploaded the file")
|
||||
|
||||
|
||||
class ReqRequestNotify(BaseModel):
|
||||
class ReqRequestNotify(BaseModel):
|
||||
id = models.BigAutoField(primary_key=True, help_text="Unique identifier of the request notification")
|
||||
name = models.CharField(max_length=256, blank=True, help_text="Name of the notification")
|
||||
title = models.CharField(max_length=256, blank=True, help_text="Title of the notification")
|
||||
|
|
@ -352,7 +327,10 @@ class ReqDepend(BaseModel):
|
|||
depend_id = models.IntegerField(null=True)
|
||||
depend_extid = models.CharField(max_length=64, blank=True, default="")
|
||||
# 2500 - Request, 3500 - Incident,
|
||||
depend_type = models.IntegerField(null=True, default=MANAGMENT_INC)
|
||||
depend_type = models.CharField(
|
||||
max_length=32, null=True, default=MANAGMENT_INC,
|
||||
help_text="Management identifier of the linked record",
|
||||
)
|
||||
category_id = models.IntegerField(null=True)
|
||||
category_name = models.CharField(
|
||||
max_length=1000, null=True, blank=True, default="")
|
||||
|
|
|
|||
|
|
@ -1,88 +1,76 @@
|
|||
from django.db import models
|
||||
from django.db import models
|
||||
from django.contrib.auth.models import User
|
||||
from ..cast import safeCast
|
||||
|
||||
|
||||
from .baseModel import BaseModel, BaseCreateDateModel, BaseCreateModel, BaseUpdateModel, BaseExtraModel, BaseExtraCreateDateModel, BaseExtraCreateModel, BaseExtraUpdateModel
|
||||
|
||||
|
||||
from django.contrib.contenttypes.fields import GenericForeignKey
|
||||
from django.contrib.contenttypes.models import ContentType
|
||||
from ..cast import safeCast
|
||||
|
||||
|
||||
from .baseModel import BaseModel, BaseCreateDateModel, BaseCreateModel, BaseUpdateModel, BaseExtraModel, BaseExtraCreateDateModel, BaseExtraCreateModel, BaseExtraUpdateModel
|
||||
|
||||
|
||||
class SysManagment(models.Model):
|
||||
id = models.BigAutoField(primary_key=True, help_text="Unique identifier of the system management")
|
||||
name = models.CharField(max_length=60, blank=True, help_text="Name of the system management")
|
||||
description = models.CharField(max_length=1024, blank=True, help_text="Description of the system management")
|
||||
isext = models.BooleanField(blank=False, default=False, help_text="Indicates if the management is external")
|
||||
urldomain = models.CharField(max_length=60, blank=True, null=True, help_text="URL domain")
|
||||
urlport = models.IntegerField(blank=True, null=True, help_text="URL port")
|
||||
urlapi = models.CharField(max_length=60, blank=True, null=True, help_text="URL API")
|
||||
id = models.SlugField(
|
||||
max_length=32, primary_key=True,
|
||||
help_text="Stable management identifier used by the permission system",
|
||||
)
|
||||
description = models.CharField(max_length=1024, blank=True, help_text="Description of the system management")
|
||||
isext = models.BooleanField(blank=False, default=False, help_text="Indicates if the management is external")
|
||||
urldomain = models.CharField(max_length=60, blank=True, null=True, help_text="URL domain")
|
||||
urlport = models.IntegerField(blank=True, null=True, help_text="URL port")
|
||||
urlapi = models.CharField(max_length=60, blank=True, null=True, help_text="URL API")
|
||||
preference = models.JSONField(default=dict, help_text="Preferences of the system management")
|
||||
code = models.SlugField(
|
||||
max_length=32, unique=True, null=True, blank=True,
|
||||
help_text="Stable code used by the permission system",
|
||||
)
|
||||
|
||||
|
||||
|
||||
|
||||
class SysObject(models.Model):
|
||||
id = models.BigAutoField(primary_key=True, help_text="Unique identifier of the system object")
|
||||
name = models.CharField(max_length=60, blank=True, help_text="Name of the system object")
|
||||
description = models.CharField(max_length=1000, blank=True, help_text="Description of the system object")
|
||||
prefix = models.CharField(max_length=8, blank=True, help_text="Prefix of the system object")
|
||||
url = models.CharField(max_length=64, blank=False, default="", help_text="URL of the system object")
|
||||
spec_field = models.CharField(max_length=1000, blank=False, default="", help_text="Special field of the system object")
|
||||
sys_name = models.CharField(max_length=60, blank=True, help_text="System name of the object")
|
||||
code = models.SlugField(
|
||||
max_length=64, null=True, blank=True,
|
||||
help_text="Stable resource code used by the permission system",
|
||||
id = models.CharField(
|
||||
max_length=97, primary_key=True,
|
||||
help_text="Object identifier in management.object format",
|
||||
)
|
||||
|
||||
description = models.CharField(max_length=1000, blank=True, help_text="Description of the system object")
|
||||
prefix = models.CharField(max_length=8, blank=True, help_text="Prefix of the system object")
|
||||
url = models.CharField(max_length=64, blank=False, default="", help_text="URL of the system object")
|
||||
spec_field = models.CharField(max_length=1000, blank=False, default="", help_text="Special field of the system object")
|
||||
sys_name = models.CharField(max_length=60, blank=True, help_text="System name of the object")
|
||||
sys_managment = models.ForeignKey(
|
||||
SysManagment, null=True, related_name='sys_object', on_delete=models.SET_NULL, help_text="System management of the object")
|
||||
|
||||
class Meta:
|
||||
constraints = [
|
||||
models.UniqueConstraint(
|
||||
fields=("sys_managment", "code"),
|
||||
name="sys_object_module_code_unique",
|
||||
),
|
||||
]
|
||||