update serializerholder

app/applicationlayer/cms/form/serializers.py

@@ -3,9 +3,6 @@ from rest_framework import serializers
 from django.db.models import Q
 from drf_writable_nested import WritableNestedModelSerializer
 from django.forms.models import model_to_dict
-from app.applicationlayer.cms.utils_cr import (get_account_details,
-                                               get_dept_details,
-                                               get_companies_details)
 
 
 class ChangeRequestFormApproversSerializer(
@@ -14,29 +11,21 @@ class ChangeRequestFormApproversSerializer(
     def to_representation(self, instance):
         ret = super().to_representation(instance)
         try:
-            user = instance.user
-            
-            user_details = get_account_details(user.code)
-            name = user_details.values_list('name', flat=True)[0]
-            dept_code = user_details.values_list('department', flat=True)[0]
-            department_details = get_dept_details(dept_code)
-            department = department_details.values_list('name', flat=True)[0]
-            comp_code = department_details.values_list('company', flat=True)[0]
-            company_details = get_companies_details(comp_code)
-            company = company_details.values_list('name', flat=True)[0]
-            
-            ret['name'] = name
-            ret['department'] = department
-            ret['company'] = company
-            
-            # ret['company'] = model_to_dict(instance.user.department.company)
-            # ret['department'] = model_to_dict(instance.user.department)
-            # ret['name'] = model_to_dict(instance.user)
-            
+            ret['company'] = model_to_dict(instance.user.department.company)
+            ret['department'] = model_to_dict(instance.user.department)
+            user_object = {
+                "id": instance.user.id,
+                "name": instance.user.name,
+                "username": instance.user.username,
+                "code": instance.user.code,
+                "email": instance.user.email,
+                "contact_no": instance.user.contact_no
+            }
+            ret['user'] = user_object
             return ret
         
         except Exception as e:
-            ret['name'] = "none"
+            ret['user'] = "none"
             ret['department'] = "none"
             ret['company'] = "none"
             return ret

app/applicationlayer/cms/form/views.py

@@ -27,7 +27,8 @@ from app.applicationlayer.cms.utils_cr import (number_generator,
                                                next_approver_email,
                                                crhistory_save,
                                                send_mail_vendor,
-                                               get_max_batchno)
+                                               get_max_batchno,
+                                               generate_template_id)
 from app.entities import enums
 from django.forms.models import model_to_dict
 import json
@@ -718,6 +719,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
         batchno = get_max_batchno("batch")
 
         # generate requested_to_template_id
+        generate_template_id(CR_Prefix, form_code, template_no)
 
         data_update = {
             "status": 'Pendsing',
@@ -999,14 +1001,11 @@ class ChangeRequestFormPost(APIView):
                 serializer.save()
             
             template_no = serializer.data['template_no']
-
             CR_Prefix = serializer.data['requested_to_template_id']
-
-            frm_id = serializer.data['form_code']
+            form_code = serializer.data['form_code']
 
             # generate requested template id
-
-            
+            generate_template_id(CR_Prefix, form_code, template_no)
             
             # create template approvers
             frm_approvers = form_header['frm_approvers']

app/applicationlayer/cms/template/serializers.py

@@ -9,7 +9,7 @@ from app.applicationlayer.cms.utils_cr import (get_account_details,
 
 
 from app.applicationlayer.cms.template.approver.serializers import ChangeRequestTemplateApproversSerializer
-from app.applicationlayer.cms.template.stakeholder.serializers import ChangeRequestTemplateStakeholdersSerializer
+from app.applicationlayer.cms.template.stakeholder.serializers import ChangeRequestTemplateStakeHoldersSerializer
 
 
 class ChangeRequestTemplateAttachmentsSerializer(
@@ -35,7 +35,7 @@ class ChangeRequestTemplatesSerializer(
 ):
     tmp_approvers = ChangeRequestTemplateApproversSerializer(
         many=True, read_only=True)
-    tmp_stakes = ChangeRequestTemplateStakeholdersSerializer(
+    tmp_stakes = ChangeRequestTemplateStakeHoldersSerializer(
         many=True, read_only=True)
     tmp_attachments = ChangeRequestTemplateAttachmentsSerializer(
         many=True, read_only=True)

app/applicationlayer/cms/template/stakeholder/serializers.py

@@ -3,7 +3,7 @@ from app.entities import models
 from django.forms.models import model_to_dict
 
 
-class ChangeRequestTemplateStakeholdersSerializer(
+class ChangeRequestTemplateStakeHoldersSerializer(
     serializers.ModelSerializer
 ):
     def to_representation(self, instance):

app/applicationlayer/cms/template/stakeholder/views.py

@@ -14,7 +14,7 @@ from app.applicationlayer.utils import (
 class ChangeRequestTemplateStakeholdersViewset(viewsets.ModelViewSet):
 
     queryset = models.ChangeRequestTemplateStakeHolders.objects.all()
-    serializer_class = serializers.ChangeRequestTemplateStakeholdersSerializer
+    serializer_class = serializers.ChangeRequestTemplateStakeHoldersSerializer
     pagination_class = CustomPagination
     lookup_field = "code"
     filter_backends = (DjangoFilterBackend, SearchFilter, OrderingFilter)

app/applicationlayer/cms/template/views.py

@@ -3,6 +3,7 @@ from django.shortcuts import render
 from rest_framework import viewsets as meviewsets
 from rest_framework.views import APIView
 from app.applicationlayer.cms.template import serializers
+
 from app.entities import models
 from app.applicationlayer import paginators
 

app/applicationlayer/cms/utils_cr.py

@@ -481,5 +481,5 @@ def generate_template_id(prefix, form_code, template_no):
     generate_tmp = number_generator(prefix, tmp_counter)
 
     models.ChangeRequestFormHeader.objects.filter(
-        form_code=frm_id).update(
+        form_code=form_code).update(
             requested_to_template_id=generate_tmp)
\ No newline at end of file