nofusscomputing/centurion_erp
1
0
Fork 0
Code Issues Wiki Activity

feat(core): Setup serializer to meet requirements

Browse Source 
ref: #754 #726
This commit is contained in:
Jon Lockwood
2025-05-12 20:11:11 +09:30
parent 1cb028c273
commit 7f49fb2d0e
4 changed files with 137 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/core/models/ticket_comment_base.py
View File

@ -257,9 +257,10 @@ class TicketCommentBase(
def clean(self):
try:
self.organization
if not self.organization:
except:
self.organization = self.ticket.organization

160
app/core/serializers/ticket_comment.py
View File

@ -6,12 +6,12 @@ from rest_framework import serializers
from drf_spectacular.utils import extend_schema_serializer
from access.serializers.entity import BaseSerializer as EntityBaseSerializer
from access.serializers.organization import OrganizationBaseSerializer
from api.serializers import common
from api.exceptions import UnknownTicketType
from app.serializers.user import UserBaseSerializer
from core import exceptions as centurion_exceptions
from core import fields as centurion_field
@ -114,8 +114,6 @@ class ModelSerializer(
model = TicketCommentBase
fields = '__all__'
fields = [
'id',
'organization',
@ -174,21 +172,131 @@ class ModelSerializer(
]
is_triage: bool = False
""" If the serializers is a Triage serializer"""
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
if kwargs['context']['view'].action in ['create', 'partial_update', 'update']:
self.fields.fields['parent'].write_only = True
self.fields.fields['ticket'].write_only = True
self.fields.fields['user'].write_only = True
if self.context.get('view', None) is not None:
read_only_fields = [
'id',
'display_name',
'_urls',
]
if not self.context['view']._has_import:
read_only_fields += [
'created',
'modified',
'organization'
'external_system',
'external_ref',
'duration',
]
if(
not self.context['view']._has_import
and not self.context['view']._has_triage
):
read_only_fields += [
'category',
'source',
]
self.Meta.read_only_fields = read_only_fields
def validate_triage(self, attrs):
return attrs
def validate_new_comment(self, attrs):
# attrs['user'] = self.context['request'].user
if 'ticket_id' in self.context['view'].kwargs:
attrs['ticket_id'] = int(self.context['view'].kwargs['ticket_id'])
if 'parent_id' in self.context['view'].kwargs:
attrs['parent_id'] = int(self.context['view'].kwargs['parent_id'])
comment = self.Meta.model.objects.filter( id = attrs['parent_id'] )
if list(comment)[0].parent_id:
raise centurion_exceptions.ValidationError(
detail = {
'parent': 'Replying to a discussion reply is not possible'
},
code = 'single_discussion_replies_only'
)
else:
raise centurion_exceptions.ValidationError(
detail = {
'parent': 'Replying to a discussion reply is not possible'
},
code = 'single_discussion_replies_only'
)
return attrs
def validate_update_comment(self, attrs):
if self.instance.user != self.context['request'].user: # Owner Edit
if 'private' in attrs:
if self.instance.private:
raise centurion_exceptions.ValidationError(
detail = {
'private': 'Once a comment is made private it can\'t be undone.'
},
code = 'owner_cant_remove_private'
)
return attrs
def validate(self, attrs):
attrs['comment_type'] = self.context['view'].model._meta.sub_model_type
if attrs['comment_type'] == 'comment':
if self.context['view']._has_triage:
attrs['is_closed'] = True
attrs['date_closed'] = datetime.datetime.now(tz=datetime.timezone.utc).replace(microsecond=0).isoformat()
attrs = self.validate_triage( attrs )
if self.is_triage:
attrs = self.validate_triage(attrs)
if self.context['view'].action == 'create':
attrs = self.validate_new_comment( attrs )
elif self.context['view'].action in [ 'partial_update', 'update' ]:
attrs = self.validate_update_comment( attrs )
return attrs
@ -202,36 +310,6 @@ class ModelSerializer(
is_valid = super().is_valid(raise_exception=raise_exception)
if self.context['view'].action == 'create':
if 'ticket_id' in self._kwargs['context']['view'].kwargs:
self.validated_data['ticket_id'] = int(self._kwargs['context']['view'].kwargs['ticket_id'])
if 'parent_id' in self._kwargs['context']['view'].kwargs:
self.validated_data['parent_id'] = int(self._kwargs['context']['view'].kwargs['parent_id'])
comment = self.Meta.model.objects.filter( id = self.validated_data['parent_id'] )
if list(comment)[0].parent_id:
raise centurion_exceptions.ValidationError(
detail = {
'parent': 'Replying to a discussion reply is not possible'
},
code = 'single_discussion_replies_only'
)
else:
raise centurion_exceptions.ValidationError(
detail = {
'ticket': 'Ticket is a required field'
},
code = 'required'
)
return is_valid
@ -249,4 +327,4 @@ class ViewSerializer(ModelSerializer):
ticket = TicketBaseBaseSerializer()
user = UserBaseSerializer()
user = EntityBaseSerializer()

2
app/core/tests/unit/ticket_comment_base/test_unit_ticket_comment_base_api_fields.py
View File

@ -301,7 +301,7 @@ class TicketCommentBaseAPITestCases(
'expected': str
},
'user.url': {
'expected': Hyperlink
'expected': str
},
'is_closed': {

26
app/core/tests/unit/ticket_comment_base/test_unit_ticket_comment_base_model.py
View File

@ -530,25 +530,27 @@ class TicketCommentBaseModelPyTest(
):
def test_function_clean_validation_close_raises_exception(self, ticket):
"""Function Check
# def test_function_clean_validation_close_raises_exception(self, ticket):
# """Function Check
Ensure function `clean` does validation
"""
# Ensure function `clean` does validation
# """
valid_data = self.kwargs_create_item.copy()
# valid_data = self.kwargs_create_item.copy()
valid_data['ticket'] = ticket
# valid_data['ticket'] = ticket
del valid_data['date_closed']
# valid_data['external_ref'] = 9842
with pytest.raises(ValidationError) as err:
# del valid_data['date_closed']
self.model.objects.create(
**valid_data
)
# with pytest.raises(ValidationError) as err:
assert err.value.get_codes()['date_closed'] == 'ticket_closed_no_date'
# self.model.objects.create(
# **valid_data
# )
# assert err.value.get_codes()['date_closed'] == 'ticket_closed_no_date'
def test_function_save_called_slash_command(self, model, mocker, ticket):