Commit 3a6a5bdf authored by Gladys Forte's avatar Gladys Forte

{dev bugfix} convert created_by_user to object template serializer

parent c61e9de8
...@@ -22,7 +22,6 @@ class ChangeRequestTemplatesSerializer( ...@@ -22,7 +22,6 @@ class ChangeRequestTemplatesSerializer(
def to_representation(self, instance): def to_representation(self, instance):
ret = super().to_representation(instance) ret = super().to_representation(instance)
try: try:
# to edit
requested_to_user_object = { requested_to_user_object = {
"id": instance.requested_to_user.id, "id": instance.requested_to_user.id,
"name": instance.requested_to_user.name, "name": instance.requested_to_user.name,
...@@ -46,12 +45,26 @@ class ChangeRequestTemplatesSerializer( ...@@ -46,12 +45,26 @@ class ChangeRequestTemplatesSerializer(
"code": instance.requested_to_department.code, "code": instance.requested_to_department.code,
"name": instance.requested_to_department.name "name": instance.requested_to_department.name
} }
created_by_user_object = {
"id": instance.created_by_user.id,
"name": instance.created_by_user.name,
"username": instance.created_by_user.username,
"code": instance.created_by_user.code,
"email": instance.created_by_user.email,
"contact_no": instance.created_by_user.contact_no,
"company_code": instance.created_by_user.department.company.code,
"company_name": instance.created_by_user.department.company.name,
"department_code": instance.created_by_user.department.code,
"department_name": instance.created_by_user.department.name
}
ret['requested_to_user'] = requested_to_user_object ret['requested_to_user'] = requested_to_user_object
ret['company'] = instance.requested_to_company.name ret['company'] = instance.requested_to_company.name
ret['department'] = instance.requested_to_department.name ret['department'] = instance.requested_to_department.name
ret['point_of_contact'] = instance.requested_to_user.name ret['point_of_contact'] = instance.requested_to_user.name
ret['created_by'] = instance.created_by_user.name ret['created_by_user'] = created_by_user_object
return ret return ret
...@@ -60,11 +73,11 @@ class ChangeRequestTemplatesSerializer( ...@@ -60,11 +73,11 @@ class ChangeRequestTemplatesSerializer(
ret['requested_to_company'] = "none" ret['requested_to_company'] = "none"
ret['requested_to_department'] = "none" ret['requested_to_department'] = "none"
ret['requested_to_user'] = "none" ret['requested_to_user'] = "none"
ret['created_by_user'] = "none"
ret['company'] = "none" ret['company'] = "none"
ret['department'] = "none" ret['department'] = "none"
ret['point_of_contact'] = "none" ret['point_of_contact'] = "none"
ret['created_by'] = "none"
return ret return ret
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment