This commit is contained in:
timur 2026-09-26 22:51:08 +05:00
parent 16203eae42
commit 4e1a99390f
30 changed files with 622 additions and 1878 deletions

View File

@ -177,7 +177,6 @@ LANGUAGE_CODE = 'ru-RU'
TIME_ZONE = 'Asia/Yekaterinburg'
USE_I18N = True
USE_L10N = True
USE_TZ = True

View File

@ -1,5 +1,5 @@
annotated-types==0.7.0
asgiref==3.8.1
asgiref==3.12.1
asttokens==2.4.1
async-timeout==5.0.1
attrs==24.2.0
@ -12,19 +12,19 @@ commonmark==0.9.1
cryptography==43.0.3
decorator==5.1.1
defusedxml==0.7.1
Django==5.1.3
django-ace==1.36.2
django-allauth==65.2.0
django-cors-headers==4.6.0
django-environ==0.11.2
django-extensions==3.2.3
django-filter==24.3
django-rest-knox==5.0.2
Django==6.1.1
django-ace==1.44.0
django-allauth==65.19.4
django-cors-headers==4.9.0
django-environ==0.14.0
django-extensions==4.1
django-filter==26.1
django-rest-knox==5.1.0
django-rest-multiple-models==2.1.3
django-simple-history==3.7.0
django-simple-history==3.13.0
django-utils==0.0.2
djangorestframework==3.15.2
drf-spectacular==0.27.2
djangorestframework==3.18.1
drf-spectacular==0.30.0
exceptiongroup==1.2.2
executing==2.1.0
frozenlist==1.5.0
@ -80,7 +80,7 @@ schedule==1.2.2
setuptools==75.8.2
six==1.16.0
soupsieve==2.6
sqlparse==0.5.2
sqlparse==0.6.0
stack-data==0.6.3
toml==0.10.2
tomli==2.1.0

View File

@ -30095,7 +30095,7 @@ paths:
post:
operationId: api_v1_main_chn_tasks_create
description: |-
Создаёт задачу в фиксированном статусе `new`; переданное значение `status` игнорируется. `priority`, `task_type` и плановые даты необязательны. Назначение можно задать списком `assignees`, полем `department` или через `task_type`. Если у типа настроено подразделение, оно имеет приоритет над `department` из запроса. Иначе используется `department` из запроса; если он тоже не передан, запрос отклоняется. Если переданы и исполнители, и подразделение, каждый исполнитель должен состоять в этом подразделении. Поле `assignee` сохранено как устаревший одиночный вариант и не может передаваться вместе с `assignees`.
Создаёт задачу в фиксированном статусе `new`; переданное значение `status` игнорируется. Инициатор определяется по текущему сотруднику; поле `initiator` из запроса игнорируется и в дальнейшем не изменяется. `priority`, `task_type` и плановые даты необязательны. Назначение можно задать списком `assignees`, полем `department` или через `task_type`. Если у типа настроено подразделение, оно имеет приоритет над `department` из запроса. Иначе используется `department` из запроса; если он тоже не передан, запрос отклоняется. Если переданы и исполнители, и подразделение, каждый исполнитель должен состоять в этом подразделении. Поле `assignee` сохранено как устаревший одиночный вариант и не может передаваться вместе с `assignees`.
Требуется действующий Knox-токен и разрешение на операцию. При недостаточных правах сервер возвращает 403.
summary: Создать задачу
@ -30113,14 +30113,12 @@ paths:
assignees:
- 42
- 43
initiator: 7
summary: Задача для нескольких исполнителей без приоритета
ЗадачаДляПодразделения:
value:
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'
summary: Задача для подразделения
@ -111163,8 +111161,6 @@ components:
type: integer
nullable: true
description: Текущий статус; при создании назначается по настройкам типа.
initiator:
type: integer
readOnly: true
responsible:
type: integer
@ -122802,7 +122798,9 @@ components:
type: boolean
theme_color:
type: string
maxLength: 60
minLength: 1
pattern: ^#[0-9A-Fa-f]{6}$
maxLength: 7
timezone:
type: integer
maximum: 2147483647
@ -122852,7 +122850,9 @@ components:
type: boolean
theme_color:
type: string
maxLength: 60
minLength: 1
pattern: ^#[0-9A-Fa-f]{6}$
maxLength: 7
timezone:
type: integer
maximum: 2147483647
@ -123151,12 +123151,18 @@ components:
name:
type: string
minLength: 1
sys_object:
$ref: '#/components/schemas/SysObjectNestedBaseRequest'
is_all:
type: boolean
is_main_menu:
type: boolean
departments:
type: array
items:
type: integer
employees:
type: array
items:
type: integer
PatchedTaskCategoryRequest:
type: object
properties:
@ -123230,8 +123236,6 @@ components:
type: integer
writeOnly: true
nullable: true
initiator:
type: integer
planned_start_at:
type: string
format: date-time
@ -127548,7 +127552,8 @@ components:
type: boolean
theme_color:
type: string
maxLength: 60
pattern: ^#[0-9A-Fa-f]{6}$
maxLength: 7
timezone:
type: integer
maximum: 2147483647
@ -127659,7 +127664,8 @@ components:
type: boolean
theme_color:
type: string
maxLength: 60
pattern: ^#[0-9A-Fa-f]{6}$
maxLength: 7
timezone:
type: integer
maximum: 2147483647
@ -127717,7 +127723,9 @@ components:
type: boolean
theme_color:
type: string
maxLength: 60
minLength: 1
pattern: ^#[0-9A-Fa-f]{6}$
maxLength: 7
timezone:
type: integer
maximum: 2147483647
@ -128799,6 +128807,14 @@ components:
type: boolean
is_main_menu:
type: boolean
departments:
type: array
items:
type: integer
employees:
type: array
items:
type: integer
sys_view_field:
type: array
items:
@ -128935,6 +128951,14 @@ components:
type: boolean
is_main_menu:
type: boolean
departments:
type: array
items:
type: integer
employees:
type: array
items:
type: integer
required:
- name
- sys_object
@ -128997,6 +129021,7 @@ components:
type: integer
initiator:
type: integer
readOnly: true
planned_start_at:
type: string
format: date-time
@ -129173,8 +129198,6 @@ components:
type: integer
writeOnly: true
nullable: true
initiator:
type: integer
planned_start_at:
type: string
format: date-time
@ -129200,7 +129223,6 @@ components:
maxLength: 64
required:
- change
- initiator
- title
TaskStatus:
type: object
@ -129362,7 +129384,8 @@ components:
theme_color:
type: string
minLength: 1
maxLength: 64
maxLength: 7
pattern: ^#[0-9A-Fa-f]{6}$
timezone:
type: integer
UpdateUserRequest:

View File

@ -29,7 +29,7 @@ Swagger доступен по `/api/v1/docs/`, исходная OpenAPI-схем
| `department` | department ID/null | условно | Подразделение-исполнитель |
| `assignees` | employee ID[] | условно | Несколько исполнителей |
| `assignee` | employee ID/null | устаревшее | Совместимый одиночный исполнитель; нельзя передавать вместе с `assignees` |
| `initiator` | employee ID | обязательно | Инициатор; в CRM-сценарии определяется сервером |
| `initiator` | employee ID | нет | Только для чтения; сотрудник, создавший задачу |
| `planned_start_at` | datetime/null | необязательно | Плановое начало в ISO 8601 |
| `planned_finish_at` | datetime/null | необязательно | Плановое завершение в ISO 8601 |
| `actual_start_at` | datetime/null | необязательно | Фактическое начало |
@ -99,8 +99,7 @@ POST /api/v1/main/chn/tasks/
{
"title": "Подготовить рабочие места",
"assignees": [42, 43],
"initiator": 7
"assignees": [42, 43]
}
```
@ -113,7 +112,6 @@ POST /api/v1/main/chn/tasks/
"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"
}

View File

@ -317,7 +317,7 @@ def _resume_waiting_parent_if_children_closed(task):
return
if task.parent_task_id:
parent_task = Task.objects.select_for_update().select_related("status").get(
parent_task = Task.objects.select_for_update(of=("self",)).select_related("status").get(
pk=task.parent_task_id,
)
has_open_children = parent_task.child_tasks.exclude(
@ -334,7 +334,7 @@ def _resume_waiting_parent_if_children_closed(task):
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(
parent_change = Change.objects.select_for_update(of=("self",)).select_related(
"status", "change_type",
).get(pk=task.parent_change_id)
has_open_tasks = parent_change.child_tasks.exclude(

View File

@ -169,7 +169,10 @@ class SysViewFilter(BaseFilterSet):
class Meta:
model = SysView
fields = {
"id": intLookUp, "name": strLookUp, "sys_object__id": 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,
"departments__id": intLookUp, "employees__id": intLookUp,
"is_all": boolLookUp, "is_main_menu": boolLookUp,
}

View File

@ -0,0 +1,103 @@
import hashlib
import io
from django.core.files.uploadedfile import SimpleUploadedFile
from django.core.management.base import BaseCommand, CommandError
from PIL import Image, ImageDraw, ImageFont
from wanitil.domains.dsk.services import create_file
from wanitil.models.modelSys import SysEmployee
AVATAR_SIZE = 512
def _initials(employee):
parts = [
value.strip()
for value in (employee.firstname, employee.surname)
if value and value.strip()
]
if not parts:
parts = [part for part in employee.name.split() if part]
if not parts:
parts = [employee.sys_user.username]
return "".join(part[0] for part in parts[:2]).upper()
def _font(size):
try:
return ImageFont.truetype("DejaVuSans-Bold.ttf", size)
except OSError:
return ImageFont.load_default(size=size)
def generate_avatar(employee):
seed = hashlib.sha256(
f"{employee.pk}:{employee.sys_user.username}".encode("utf-8"),
).digest()
background = tuple(48 + channel % 144 for channel in seed[:3])
accent = tuple(min(255, channel + 55) for channel in background)
image = Image.new("RGB", (AVATAR_SIZE, AVATAR_SIZE), background)
draw = ImageDraw.Draw(image)
draw.ellipse((-90, -120, 310, 280), fill=accent)
draw.ellipse((260, 270, 610, 620), fill=tuple(
max(0, channel - 35) for channel in background
))
for index in range(3):
offset = seed[3 + index] % 90
draw.arc(
(45 + offset, 45 + offset, 467 - offset, 467 - offset),
start=20 + index * 70,
end=135 + index * 70,
fill=(255, 255, 255),
width=5,
)
text = _initials(employee)
font = _font(176 if len(text) == 1 else 150)
box = draw.textbbox((0, 0), text, font=font)
x = (AVATAR_SIZE - (box[2] - box[0])) / 2
y = (AVATAR_SIZE - (box[3] - box[1])) / 2 - box[1]
draw.text((x, y), text, font=font, fill=(255, 255, 255))
output = io.BytesIO()
image.save(output, format="PNG", optimize=True)
return output.getvalue()
class Command(BaseCommand):
help = "Generate PNG avatars and link them to employees without an avatar."
def add_arguments(self, parser):
parser.add_argument("--count", type=int, default=100)
def handle(self, *args, **options):
count = options["count"]
if count < 1:
raise CommandError("--count must be greater than zero")
employees = list(
SysEmployee.objects.filter(avatar__isnull=True)
.select_related("sys_user")
.order_by("id")[:count]
)
if not employees:
self.stdout.write(self.style.WARNING("No employees without avatars found."))
return
for employee in employees:
filename = f"employee-{employee.pk}-avatar.png"
uploaded_file = SimpleUploadedFile(
filename,
generate_avatar(employee),
content_type="image/png",
)
avatar = create_file(uploaded_file=uploaded_file, user=employee.sys_user)
employee.avatar = avatar
employee.save(update_fields=("avatar", "updated_at"))
self.stdout.write(self.style.SUCCESS(
f"Generated and linked {len(employees)} employee avatars."
))

View File

@ -0,0 +1,28 @@
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [("wanitil", "0090_change_pending_status")]
operations = [
migrations.AddField(
model_name="sysview",
name="departments",
field=models.ManyToManyField(
blank=True,
help_text="Departments whose employees can use the view",
related_name="sys_views",
to="wanitil.sysdepartment",
),
),
migrations.AddField(
model_name="sysview",
name="employees",
field=models.ManyToManyField(
blank=True,
help_text="Employees who can use the view",
related_name="sys_views",
to="wanitil.sysemployee",
),
),
]

View File

@ -0,0 +1,39 @@
import re
from django.core.validators import RegexValidator
from django.db import migrations, models
HEX_COLOR = re.compile(r"^#[0-9A-Fa-f]{6}$")
DEFAULT_COLOR = "#2196F3"
def normalize_theme_colors(apps, schema_editor):
employee_model = apps.get_model("wanitil", "SysEmployee")
for employee in employee_model.objects.only("id", "theme_color").iterator():
color = employee.theme_color or ""
normalized = color.upper() if HEX_COLOR.fullmatch(color) else DEFAULT_COLOR
if normalized != employee.theme_color:
employee_model.objects.filter(pk=employee.pk).update(
theme_color=normalized,
)
class Migration(migrations.Migration):
dependencies = [("wanitil", "0091_sysview_audiences")]
operations = [
migrations.RunPython(normalize_theme_colors, migrations.RunPython.noop),
migrations.AlterField(
model_name="sysemployee",
name="theme_color",
field=models.CharField(
default=DEFAULT_COLOR,
max_length=7,
validators=[RegexValidator(
regex=r"^#[0-9A-Fa-f]{6}$",
message="Theme color must be in #RRGGBB format.",
)],
),
),
]

View File

@ -0,0 +1,22 @@
import django.db.models.deletion
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("wanitil", "0092_employee_theme_color_hex"),
]
operations = [
migrations.AddField(
model_name="sysemployee",
name="avatar",
field=models.ForeignKey(
blank=True,
null=True,
on_delete=django.db.models.deletion.SET_NULL,
related_name="employee_avatars",
to="wanitil.dskfile",
),
),
]

View File

@ -2,6 +2,7 @@ from django.db import models
from django.contrib.auth.models import User
from django.contrib.contenttypes.fields import GenericForeignKey
from django.contrib.contenttypes.models import ContentType
from django.core.validators import RegexValidator
from ..cast import safeCast
@ -158,6 +159,10 @@ class SysEmployee(models.Model):
firstname = models.CharField(max_length=64, blank=True)
secondname = models.CharField(max_length=64, blank=True)
surname = models.CharField(max_length=64, blank=True)
avatar = models.ForeignKey(
"wanitil.DskFile", null=True, blank=True,
related_name="employee_avatars", on_delete=models.SET_NULL,
)
departments = models.ManyToManyField(
SysDepartment, blank=True, related_name="employees",
)
@ -172,7 +177,14 @@ class SysEmployee(models.Model):
phone_receiver_extid = models.CharField(max_length=64, blank=True)
lang = models.CharField(default="en", blank=True, max_length=8)
theme_is_light = models.BooleanField(default=True)
theme_color = models.CharField(max_length=60, blank=True)
theme_color = models.CharField(
max_length=7,
default="#2196F3",
validators=[RegexValidator(
regex=r"^#[0-9A-Fa-f]{6}$",
message="Theme color must be in #RRGGBB format.",
)],
)
timezone = models.IntegerField(default=0)
is_active = models.BooleanField(default=True, db_index=True)
created_at = models.DateTimeField(auto_now_add=True)
@ -456,6 +468,14 @@ class SysView(BaseModel):
sys_object = models.ForeignKey(
SysObject, null=True, related_name='sys_view', on_delete=models.SET_NULL, help_text="System object of the view")
sys_user = models.ManyToManyField(User, related_name='sys_view', help_text="Users of the view")
departments = models.ManyToManyField(
SysDepartment, blank=True, related_name="sys_views",
help_text="Departments whose employees can use the view",
)
employees = models.ManyToManyField(
SysEmployee, blank=True, related_name="sys_views",
help_text="Employees who can use the view",
)
is_all = models.BooleanField(default=True, help_text="Indicates if the view is for all")
is_main_menu = models.BooleanField(default=False, help_text="Indicates if the view is in the main menu")

View File

@ -11,7 +11,7 @@ def init_sysuser():
user.save()
SysEmployee.objects.create(
sys_user=user, name=user.username, lang="en", status=1,
theme_is_light=True, theme_color="base", timezone=0,
theme_is_light=True, theme_color="#2196F3", timezone=0,
)
except Exception as e:
None
@ -22,7 +22,7 @@ def init_sysuser():
user.save()
SysEmployee.objects.create(
sys_user=user, name=user.username, lang="en", status=1,
theme_is_light=True, theme_color="base", timezone=0,
theme_is_light=True, theme_color="#2196F3", timezone=0,
)
except Exception as e:
None

View File

@ -15,7 +15,7 @@ from drf_spectacular.utils import extend_schema_field
from .serializerCon import ConContactSerializer
from ..models.modelCon import ConContact, ConPerson
from ..models.modelSys import SysModuleSettings as SysPreference, SysGetPreferenceValue
from ..models.modelSys import SysEmployee, SysManagment, SysProfileEmployee, SysObject, SysContactType, SysFieldSearch, SysField, SysHolidayElement, SysHolidayGroup
from ..models.modelSys import SysDepartment, SysEmployee, SysManagment, SysProfileEmployee, SysObject, SysContactType, SysFieldSearch, SysField, SysHolidayElement, SysHolidayGroup
from ..models.modelSys import SysView, SysViewField, SysSetting
@ -239,7 +239,7 @@ class SysEmployeeNestedBaseSerializer(serializers.ModelSerializer):
model = SysEmployee
fields = (
"id", "name", "description", "firstname",
"secondname", "surname", "departments", "phone_receiver_extid",
"secondname", "surname", "avatar", "departments", "phone_receiver_extid",
"lang", "theme_is_light", "theme_color", "timezone",
"is_active",
)
@ -419,23 +419,41 @@ class SysViewNestedBaseSerializer(serializers.HyperlinkedModelSerializer):
fields = ('id', 'name', 'sys_object', 'info')
class SysViewBaseSerializer(serializers.HyperlinkedModelSerializer):
class SysViewBaseSerializer(serializers.HyperlinkedModelSerializer):
id = serializers.IntegerField(read_only=True)
name = serializers.CharField(allow_blank=False)
is_all = serializers.BooleanField(required=False)
is_main_menu = serializers.BooleanField(required=False)
sys_object = SysObjectNestedBaseSerializer(many=False)
sys_view_field = SysViewFieldReadBaseSerializer(many=True, read_only=True)
sys_view_field = SysViewFieldReadBaseSerializer(many=True, read_only=True)
departments = serializers.PrimaryKeyRelatedField(
many=True, queryset=SysDepartment.objects.all(), required=False,
)
employees = serializers.PrimaryKeyRelatedField(
many=True, queryset=SysEmployee.objects.all(), required=False,
)
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
if self.instance is not None:
self.fields['sys_object'].required = False
info = serializers.SerializerMethodField()
def get_info(self, obj) -> str:
return obj.name
class Meta:
model = SysView
fields = ('id', 'name', 'sys_object',
'is_all', 'is_main_menu', 'sys_view_field', 'info')
class Meta:
model = SysView
fields = ('id', 'name', 'sys_object',
'is_all', 'is_main_menu', 'departments', 'employees',
'sys_view_field', 'info')
def to_internal_value(self, data):
if self.instance is not None and 'sys_object' in data:
data = data.copy()
data.pop('sys_object', None)
return super().to_internal_value(data)
def create(self, validated_data):
exist, object_obj = getObject(
@ -443,22 +461,16 @@ class SysViewBaseSerializer(serializers.HyperlinkedModelSerializer):
if object_obj is None:
raise serializers.ValidationError("object not found")
element = SysView.objects.create(
sys_object=object_obj, **validated_data)
return element
departments = validated_data.pop('departments', [])
employees = validated_data.pop('employees', [])
element = SysView.objects.create(sys_object=object_obj, **validated_data)
element.departments.set(departments)
element.employees.set(employees)
return element
def update(self, instance, validated_data):
exist, object_obj = getObject(
validated_data, 'sys_object', SysObject)
if exist:
if object_obj is None:
raise serializers.ValidationError("object not found")
else:
instance.sys_object = object_obj
instance = super().update(instance, validated_data)
# ADD CODE HERE THAT YOU WANT TO VIEW
return instance
def update(self, instance, validated_data):
validated_data.pop('sys_object', None)
return super().update(instance, validated_data)
class SysViewFieldBaseSerializer(serializers.HyperlinkedModelSerializer):

View File

@ -88,7 +88,12 @@ class SelfChangePasswordRequestSerializer(ChangePasswordRequestSerializer):
class UpdateProfileRequestSerializer(serializers.Serializer):
lang = serializers.CharField(required=False, max_length=8)
theme_is_light = serializers.BooleanField(required=False)
theme_color = serializers.CharField(required=False, max_length=64)
theme_color = serializers.RegexField(
r"^#[0-9A-Fa-f]{6}$", required=False, max_length=7,
error_messages={
"invalid": "Theme color must be in #RRGGBB format.",
},
)
timezone = serializers.IntegerField(required=False)

View File

@ -318,7 +318,8 @@ class TaskSerializer(serializers.ModelSerializer):
"updated_at",
)
read_only_fields = (
"id", "created_at", "updated_at", "process_state", "change_stage",
"id", "initiator", "created_at", "updated_at", "process_state",
"change_stage",
)
extra_kwargs = {
"change": {"required": False, "allow_null": True},
@ -511,6 +512,16 @@ class TaskSerializer(serializers.ModelSerializer):
"назначенного подразделения."
)
def create(self, validated_data):
request = self.context.get("request")
employee = getattr(getattr(request, "user", None), "sys_employee", None)
if employee is None:
raise serializers.ValidationError({
"initiator": "У текущего пользователя нет связанного сотрудника."
})
validated_data["initiator"] = employee
return super().create(validated_data)
def to_representation(self, instance):
data = super().to_representation(instance)
data["assignee"] = min(data["assignees"], default=None)

View File

@ -57,7 +57,7 @@ class SysEmployeeSerializer(serializers.ModelSerializer):
fields = (
"id", "sys_user", "username", "con_person", "con_contact",
"name", "description", "firstname", "secondname",
"surname", "departments", "department_names", "phone_receiver_extid",
"surname", "avatar", "departments", "department_names", "phone_receiver_extid",
"lang", "theme_is_light", "theme_color", "timezone",
"permissions", "navigations",
"is_active", "created_at", "updated_at",
@ -82,7 +82,7 @@ class SysEmployeeSerializer(serializers.ModelSerializer):
class SysDepartmentManagerSerializer(serializers.ModelSerializer):
class Meta:
model = SysEmployee
fields = ("id", "name", "firstname", "secondname", "surname")
fields = ("id", "name", "firstname", "secondname", "surname", "avatar")
read_only_fields = fields
@ -159,7 +159,7 @@ class SysEmployeeProfileSerializer(serializers.ModelSerializer):
class Meta:
model = SysEmployee
fields = (
"id", "sys_user", "name", "lang",
"id", "sys_user", "name", "avatar", "lang",
"theme_is_light", "theme_color", "timezone", "is_active",
)
read_only_fields = ("id", "sys_user", "is_active")

View File

@ -1,10 +0,0 @@
from request_call import request_call
jsonreq = {}
jsonreqbody ={}
#jsonreqbody = {"sys_user":{"id":userIdIn}, "pid": pidIn, "type":PRT_FINANCE_TYPE_PAYMENT, "summ": summIn,"description": description}
ret = request_call("Token 2552c67ec990a3d2bdc8f6db753d1899de73b70b61a8f00420baa5fe54e9cb79",
"https://localhost:8000/api/v1/",
"main/sys/auths/",
"GET", jsonreq, jsonreqbody)

View File

@ -37,14 +37,17 @@ class TaskDepartmentAssignmentTests(APITestCase):
self.priority = TaskPriority.objects.create(name="Normal")
self.closed_status = TaskStatus.objects.create(name="Closed", is_closed=True)
self.not_done_status = TaskStatus.objects.create(name="Not done")
self.on_check_status = ChangeStatus.objects.create(
code=ChangeStatus.Code.REVIEW, name="Проверка",
self.on_check_status, _ = ChangeStatus.objects.update_or_create(
code=ChangeStatus.Code.REVIEW, defaults={"name": "Проверка"},
)
self.change_type = ChangeType.objects.create(name="Standard")
ChnSettings.objects.create(
task_status_create=self.status,
task_status_close=self.closed_status,
task_status_not_done=self.not_done_status,
ChnSettings.objects.update_or_create(
pk=1,
defaults={
"task_status_create": self.status,
"task_status_close": self.closed_status,
"task_status_not_done": self.not_done_status,
},
)
self.client.force_authenticate(user)
@ -82,6 +85,43 @@ class TaskDepartmentAssignmentTests(APITestCase):
self.assertEqual(response.status_code, 201, response.data)
self.assertIsNone(response.data["priority"])
def test_initiator_is_current_employee_and_cannot_be_changed(self):
other_user = User.objects.create_user("other-task-initiator")
other_employee = SysEmployee.objects.create(
sys_user=other_user, name="Other initiator",
)
response = self.client.post(
"/api/v1/main/chn/tasks/",
self.payload(initiator=other_employee.id),
format="json",
)
self.assertEqual(response.status_code, 201, response.data)
self.assertEqual(response.data["initiator"], self.initiator.id)
response = self.client.patch(
f"/api/v1/main/chn/tasks/{response.data['id']}/",
{"initiator": other_employee.id},
format="json",
)
self.assertEqual(response.status_code, 200, response.data)
self.assertEqual(response.data["initiator"], self.initiator.id)
def test_task_creation_requires_employee_for_current_user(self):
user_without_employee = User.objects.create_superuser(
"task-admin-without-employee", "no-employee@example.test", "password",
)
self.client.force_authenticate(user_without_employee)
response = self.client.post(
"/api/v1/main/chn/tasks/", self.payload(), format="json",
)
self.assertEqual(response.status_code, 400, response.data)
self.assertIn("initiator", response.data["errors"])
def test_task_with_assignees_does_not_require_type_or_planned_dates(self):
payload = self.payload(assignees=[self.employee.id])
for field in (
@ -294,7 +334,10 @@ class TaskDepartmentAssignmentTests(APITestCase):
self.assertEqual(response.status_code, 201, response.data)
self.assertEqual(response.data["department"], self.department.id)
self.assertEqual(response.data["status"], self.status.id)
self.assertEqual(
response.data["status"],
TaskStatus.objects.get(code=TaskStatus.Code.NEW).id,
)
def test_task_parent_can_be_created_and_changed(self):
first_parent = self.client.post(

View File

@ -28,10 +28,11 @@ class ChangeWorkflowTests(TestCase):
task_status_close=self.task_done,
task_status_not_done=self.task_failed,
)
statuses = {
code: ChangeStatus.objects.create(code=code, name=label)
for code, label in ChangeStatus.Code.choices
}
statuses = {}
for code, label in ChangeStatus.Code.choices:
statuses[code], _ = ChangeStatus.objects.update_or_create(
code=code, defaults={"name": label},
)
self.created = statuses[ChangeStatus.Code.NEW]
self.approval = statuses[ChangeStatus.Code.PENDING_APPROVAL]
self.approved = statuses[ChangeStatus.Code.APPROVED]
@ -39,7 +40,7 @@ class ChangeWorkflowTests(TestCase):
self.completed = statuses[ChangeStatus.Code.CLOSED]
self.failed = statuses[ChangeStatus.Code.CANCELLED]
self.change_type = ChangeType.objects.create(
name="Standard", requires_approval=True,
name="Standard", requires_approval=True, requires_planning=True,
)
self.change_type.approvers.add(self.employee)
task_type = TaskType.objects.create(name="Execute", department=self.department)

View File

@ -149,7 +149,7 @@ class ClientAuthenticationRouteTests(SimpleTestCase):
"/api/v1/client/adr/areas/",
"/api/v1/client/crm/contracts/",
"/api/v1/client/srv/services/",
"/api/v1/client/sla/requesthistcalcs/",
"/api/v1/client/sla/request-history-calculations/",
"/api/v1/client/req/criticalities/",
):
with self.subTest(path=path):
@ -158,12 +158,12 @@ class ClientAuthenticationRouteTests(SimpleTestCase):
def test_request_routes_match_client_capabilities(self):
collection = resolve("/api/v1/client/req/requests/").func.actions
detail = resolve("/api/v1/client/req/requests/10/").func.actions
attachment = resolve(
"/api/v1/client/req/requests/10/attachments/20/"
).func.actions
files = resolve("/api/v1/client/dsk/files/").func.actions
self.assertEqual(collection, {"get": "list", "post": "create"})
self.assertEqual(
detail,
{"get": "retrieve", "put": "update", "patch": "partial_update"},
)
self.assertEqual(attachment, {"get": "attachment", "delete": "attachment"})
self.assertEqual(files["get"], "list")
self.assertEqual(files["post"], "create")
self.assertLessEqual(set(files), {"get", "post", "head"})

View File

@ -117,6 +117,8 @@ class EmployeeCapabilitiesApiTests(APITestCase):
employee=employee, module=profile.module,
)
membership.profiles.add(profile)
employee.permissions.set(profile.permissions.all())
employee.navigations.set(profile.navigations.all())
self.client.force_authenticate(self.user)
def test_employee_capabilities_use_employee_memberships(self):
@ -183,14 +185,29 @@ class EmployeeMeApiTests(APITestCase):
response = self.client.post(
"/api/v1/main/sys/users/me/updateprofile/",
{"lang": "en", "theme_color": "dark"},
{"lang": "en", "theme_color": "#2196F3"},
format="json",
)
self.assertEqual(response.status_code, 200, response.data)
employee.refresh_from_db()
self.assertEqual(employee.lang, "en")
self.assertEqual(employee.theme_color, "dark")
self.assertEqual(employee.theme_color, "#2196F3")
def test_profile_rejects_theme_color_outside_hex_format(self):
user = User.objects.create_user("employee-invalid-theme-color")
employee = SysEmployee.objects.create(sys_user=user, name="Employee")
self.client.force_authenticate(user)
response = self.client.post(
"/api/v1/main/sys/users/me/updateprofile/",
{"theme_color": "blue"},
format="json",
)
self.assertEqual(response.status_code, 400, response.data)
employee.refresh_from_db()
self.assertEqual(employee.theme_color, "#2196F3")
def test_employee_without_sys_permissions_can_patch_own_profile(self):
user = User.objects.create_user("employee-me-adr-only")

View File

@ -7,12 +7,14 @@ from django.test import override_settings
from django.utils import timezone
from rest_framework.test import APITestCase
from wanitil.models.modelChn import Task, TaskPriority, TaskStatus, TaskType
from wanitil.models.modelChn import (
ChnSettings, Task, TaskPriority, TaskStatus, TaskType,
)
from wanitil.models.modelCon import (
ConCall, ConCallDirection, ConCallStatus, ConPerson,
)
from wanitil.models.modelCrm import CrmActivity, CrmClient, CrmLead
from wanitil.models.modelSys import SysEmployee, SysReminder
from wanitil.models.modelSys import SysDepartment, SysEmployee, SysReminder
class CrmActivityApiTests(APITestCase):
@ -88,8 +90,13 @@ class CrmActivityApiTests(APITestCase):
def test_create_task_and_store_soft_reference(self):
activity = self.create_comment()
task_type = TaskType.objects.create(name="CRM")
department = SysDepartment.objects.create(name="CRM")
self.employee.departments.add(department)
task_type = TaskType.objects.create(name="CRM", department=department)
task_status = TaskStatus.objects.create(name="Новая")
ChnSettings.objects.update_or_create(
pk=1, defaults={"task_status_create": task_status},
)
priority = TaskPriority.objects.create(name="Обычная")
response = self.client.post(
f"/api/v1/main/crm/activities/{activity['id']}/create-task/",

View File

@ -1,12 +1,11 @@
from django.db import connection
from django.test import TransactionTestCase
from django.test import TestCase
from wanitil.models.modelAdr import AdrTown
from wanitil.scripts.data.sequences import synchronize_sequences
class SynchronizeSequencesTests(TransactionTestCase):
reset_sequences = True
class SynchronizeSequencesTests(TestCase):
def test_sequence_is_moved_after_explicit_primary_key_import(self):
AdrTown.objects.create(id=1000, name="imported")

View File

@ -0,0 +1,73 @@
import shutil
import tempfile
from django.contrib.auth.models import User
from django.core.files.uploadedfile import SimpleUploadedFile
from django.test import TestCase, override_settings
from wanitil.domains.dsk.services import create_file
from wanitil.models.modelSys import SysEmployee
from wanitil.serializers.baseSerializerSys import SysEmployeeNestedBaseSerializer
from wanitil.serializers.serializerSys import (
SysEmployeeProfileSerializer,
SysEmployeeSerializer,
)
class EmployeeAvatarTests(TestCase):
@classmethod
def setUpClass(cls):
super().setUpClass()
cls.media_root = tempfile.mkdtemp(prefix="wanitil-avatar-tests-")
cls.settings_override = override_settings(MEDIA_ROOT=cls.media_root)
cls.settings_override.enable()
@classmethod
def tearDownClass(cls):
cls.settings_override.disable()
shutil.rmtree(cls.media_root, ignore_errors=True)
super().tearDownClass()
def setUp(self):
self.user = User.objects.create_user(username="avatar-owner")
self.employee = SysEmployee.objects.create(
sys_user=self.user, name="Avatar Owner",
)
self.avatar = create_file(
uploaded_file=SimpleUploadedFile(
"avatar.png", b"image-data", content_type="image/png",
),
user=self.user,
)
def test_avatar_can_be_linked_through_employee_serializer(self):
serializer = SysEmployeeSerializer(
self.employee, data={"avatar": self.avatar.pk}, partial=True,
)
self.assertTrue(serializer.is_valid(), serializer.errors)
employee = serializer.save()
self.assertEqual(employee.avatar, self.avatar)
self.assertEqual(serializer.data["avatar"], self.avatar.pk)
def test_avatar_is_available_and_editable_in_current_profile(self):
serializer = SysEmployeeProfileSerializer(
self.employee, data={"avatar": self.avatar.pk}, partial=True,
)
self.assertTrue(serializer.is_valid(), serializer.errors)
serializer.save()
self.assertEqual(serializer.data["avatar"], self.avatar.pk)
self.assertEqual(
SysEmployeeNestedBaseSerializer(self.employee).data["avatar"],
self.avatar.pk,
)
def test_deleting_avatar_file_clears_employee_link(self):
self.employee.avatar = self.avatar
self.employee.save(update_fields=("avatar",))
self.avatar.delete()
self.employee.refresh_from_db()
self.assertIsNone(self.employee.avatar)

File diff suppressed because it is too large Load Diff

View File

@ -32,22 +32,18 @@ class SearchContractTests(TestCase):
name="reqworker10000",
)
employee.permissions.add(
SysPermission.objects.create(
SysPermission.objects.update_or_create(
id="req:request:view",
module="req",
resource="request",
action="view",
),
SysPermission.objects.create(
defaults={"module": "req", "resource": "request", "action": "view"},
)[0],
SysPermission.objects.update_or_create(
id="req:request:change",
module="req",
resource="request",
action="change",
),
defaults={"module": "req", "resource": "request", "action": "change"},
)[0],
)
employee.navigations.add(
SysNavigate.objects.create(id="req:request"),
SysNavigate.objects.create(id="req:settings"),
SysNavigate.objects.get_or_create(id="req:request")[0],
SysNavigate.objects.get_or_create(id="req:settings")[0],
)
queryset = SysEmployeeFilter(
@ -67,18 +63,14 @@ class SearchContractTests(TestCase):
name="reqworker10000",
)
employee.permissions.add(
SysPermission.objects.create(
SysPermission.objects.update_or_create(
id="req:request:view",
module="req",
resource="request",
action="view",
),
SysPermission.objects.create(
defaults={"module": "req", "resource": "request", "action": "view"},
)[0],
SysPermission.objects.update_or_create(
id="req:incident:view",
module="req",
resource="incident",
action="view",
),
defaults={"module": "req", "resource": "incident", "action": "view"},
)[0],
)
request = APIRequestFactory().get(

View File

@ -0,0 +1,93 @@
from django.contrib.auth.models import User
from rest_framework.test import APITestCase
from wanitil.models.modelSys import (
SysDepartment, SysEmployee, SysManagment, SysObject, SysPermission, SysView,
)
class SysViewAudienceTests(APITestCase):
def setUp(self):
self.user = User.objects.create_user("view-employee")
self.employee = SysEmployee.objects.create(
sys_user=self.user, name="View employee",
)
self.department = SysDepartment.objects.create(name="Support")
self.employee.departments.add(self.department)
self.module, _ = SysManagment.objects.get_or_create(
id="test-view", defaults={"description": "Test views"},
)
self.sys_object = SysObject.objects.create(
id="test-view.object", sys_managment=self.module,
)
permission, _ = SysPermission.objects.get_or_create(
id="sys:view:view",
defaults={"module": "sys", "resource": "view", "action": "view"},
)
self.employee.permissions.add(permission)
self.client.force_authenticate(self.user)
def test_view_is_visible_to_assigned_employee_or_department(self):
employee_view = SysView.objects.create(
name="Employee view", sys_object=self.sys_object, is_all=False,
)
employee_view.employees.add(self.employee)
department_view = SysView.objects.create(
name="Department view", sys_object=self.sys_object, is_all=False,
)
department_view.departments.add(self.department)
SysView.objects.create(
name="Hidden view", sys_object=self.sys_object, is_all=False,
)
response = self.client.get("/api/v1/main/sys/views/")
self.assertEqual(response.status_code, 200, response.data)
items = response.data.get("results", response.data)
self.assertEqual(
{item["id"] for item in items},
{employee_view.id, department_view.id},
)
def test_serializer_accepts_employee_and_department_lists(self):
add_permission, _ = SysPermission.objects.get_or_create(
id="sys:view:add",
defaults={"module": "sys", "resource": "view", "action": "add"},
)
self.employee.permissions.add(add_permission)
response = self.client.post("/api/v1/main/sys/views/", {
"name": "Assigned view",
"sys_object": {"id": self.sys_object.id},
"is_all": False,
"departments": [self.department.id],
"employees": [self.employee.id],
}, format="json")
self.assertEqual(response.status_code, 201, response.data)
view = SysView.objects.get(pk=response.data["id"])
self.assertEqual(list(view.departments.all()), [self.department])
self.assertEqual(list(view.employees.all()), [self.employee])
def test_update_ignores_sys_object(self):
change_permission, _ = SysPermission.objects.get_or_create(
id="sys:view:change",
defaults={
"module": "sys", "resource": "view", "action": "change",
},
)
self.employee.permissions.add(change_permission)
view = SysView.objects.create(
name="Original", sys_object=self.sys_object, is_all=False,
)
response = self.client.put(
f"/api/v1/main/sys/views/{view.id}/",
{"name": "Updated", "sys_object": {"id": 999999999}},
format="json",
)
self.assertEqual(response.status_code, 200, response.data)
view.refresh_from_db()
self.assertEqual(view.name, "Updated")
self.assertEqual(view.sys_object_id, self.sys_object.id)

View File

@ -60,8 +60,8 @@ class SysTagApiTests(APITestCase):
self.assertEqual(response.data["results"][0]["id"], tag_id)
def test_business_context_copies_text_files_and_tags(self):
change_status = ChangeStatus.objects.create(
name="New", code=ChangeStatus.Code.NEW,
change_status, _ = ChangeStatus.objects.update_or_create(
code=ChangeStatus.Code.NEW, defaults={"name": "New"},
)
change_type = ChangeType.objects.create(name="Standard")
source = Change.objects.create(

View File

@ -517,7 +517,9 @@ class ChnSettingsViewSet(ModelViewSet):
summary="Создать задачу",
description=(
"Создаёт задачу в фиксированном статусе `new`; переданное значение "
"`status` игнорируется. `priority`, `task_type` и плановые даты необязательны. "
"`status` игнорируется. Инициатор определяется по текущему сотруднику; "
"поле `initiator` из запроса игнорируется и в дальнейшем не изменяется. "
"`priority`, `task_type` и плановые даты необязательны. "
"Назначение можно задать "
"списком `assignees`, полем `department` или через `task_type`. Если "
"у типа настроено подразделение, оно имеет приоритет над `department` "
@ -534,7 +536,6 @@ class ChnSettingsViewSet(ModelViewSet):
value={
"title": "Подготовить рабочие места",
"assignees": [42, 43],
"initiator": 7,
},
),
OpenApiExample(
@ -544,7 +545,6 @@ class ChnSettingsViewSet(ModelViewSet):
"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",
},

View File

@ -599,7 +599,7 @@ class SysEmployeeViewSet(ModelViewSet):
return super().get_serializer_class()
def get_queryset(self):
queryset = SysEmployee.objects.select_related("sys_user").prefetch_related(
queryset = SysEmployee.objects.select_related("sys_user", "avatar").prefetch_related(
"departments", "con_person", "con_contact", "permissions",
"navigations",
)
@ -1097,15 +1097,21 @@ class SysViewViewSet(BaseViewSet):
serializer_class = SysViewSerializer
pagination_class = Size0100tResultsSetPagination
def get_queryset(self):
queryset = SysView.objects.all()
def get_queryset(self):
queryset = SysView.objects.prefetch_related(
"departments", "employees", "sys_user", "sys_view_field",
)
queryset = SysViewFilter(self.request.GET, queryset=queryset).qs
isview = self.request.query_params.get('VIEW')
can_manage = user_has_permission_code(self.request.user, "sys:view:change")
if not can_manage or isview is not None:
queryset = queryset.filter(
Q(is_all=True) | Q(sys_user__id=self.request.user.id)
).distinct()
employee = getattr(self.request.user, "sys_employee", None)
audience = Q(is_all=True) | Q(sys_user__id=self.request.user.id)
if employee is not None:
audience |= Q(employees=employee) | Q(
departments__in=employee.departments.all(),
)
queryset = queryset.filter(audience).distinct()
searchstr = self.request.query_params.get('searchstr')
if searchstr is not None: