Merge pull request #421 in RMS/api-main-service from gladys-dev2 to RMSv2

* commit '2bf02a28':
  try cron

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

@@ -17,8 +17,16 @@ class ChangeRequestTemplateApproversSerializer(
                 "email": instance.user.email,
                 "contact_no": instance.user.contact_no
             }
-            ret['company'] = model_to_dict(instance.user.department.company)
-            ret['department'] = model_to_dict(instance.user.department)
+            ret['company'] = {
+                "id": instance.user.department.company.id,
+                "code": instance.user.department.company.code,
+                "name": instance.user.department.company.name
+            }
+            ret['department'] = {
+                "id": instance.user.department.id,
+                "code": instance.user.department.code,
+                "name": instance.user.department.name
+            }
             ret['user'] = user_object
 
             if instance.user or instance.delegation.lower() == 'requestor':
@@ -46,16 +54,26 @@ class ChangeRequestTemplateApproversSerializer(
                 ret['editable_user'] = True
 
             if instance.company or instance.delegation.lower() == 'requestor':
-                ret['company'] = model_to_dict(
-                    instance.company)
+                # ret['company'] = model_to_dict(
+                #     instance.company)
+                ret['company'] = {
+                    "id": instance.company.id,
+                    "code": instance.company.code,
+                    "name": instance.company.name
+                }
                 ret['editable_comp'] = False
             else:
                 ret['company'] = None
                 ret['editable_comp'] = True
 
             if instance.department  or instance.delegation.lower() == 'requestor':
-                ret['department'] = model_to_dict(
-                    instance.department)
+                # ret['department'] = model_to_dict(
+                #     instance.department)
+                ret['department'] = {
+                    "id": instance.department.id,
+                    "code": instance.department.code,
+                    "name": instance.department.name
+                }
                 ret['editable_dept'] = False
             else:
                 ret['department'] = None

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

@@ -46,8 +46,16 @@ class ChangeRequestTemplatesSerializer(
                 "contact_no": instance.requested_to_user.contact_no
             }
 
-            ret['requested_to_company'] = model_to_dict(instance.requested_to_company)
-            ret['requested_to_department'] = model_to_dict(instance.requested_to_department)
+            ret['requested_to_company'] = {
+                "id": instance.requested_to_company.id,
+                "code": instance.requested_to_company.code,
+                "name": instance.requested_to_company.name
+            }
+            ret['requested_to_department'] = {
+                "id": instance.requested_to_department.id,
+                "code": instance.requested_to_department.code,
+                "name": instance.requested_to_department.name
+            }
             ret['requested_to_user'] = requested_to_user_object
 
             ret['company'] = instance.requested_to_company.name
@@ -72,7 +80,6 @@ class ChangeRequestTemplatesSerializer(
     
     class Meta:
         model = models.ChangeRequestTemplateHeader
-        # fields = '__all__'
         fields = ('template_no', 'requested_to_template_name',
                   'requested_to_objective', 'requested_to_target_date',
                   'requested_to_priority', 'description', 'created',
@@ -83,53 +90,6 @@ class ChangeRequestTemplatesSerializer(
                   'tmp_details')
 
         read_only_fields = ['created', 'template_no']
-        # extra_kwargs = {
-        #      "requested_to_template_id": {
-        #             "error_messages": {
-        #                 "unique": "ssCR prefix should be unique"
-        #                 }
-        #             }
-        #         }
-
-    # def is_valid(self, raise_exception=False):
-
-    #     assert not hasattr(self, 'restore_object'), (
-    #         'Serializer `%s.%s` has old-style version 2 `.restore_object()` '
-    #         'that is no longer compatible with REST framework 3. '
-    #         'Use the new-style `.create()` and `.update()` methods instead.' %
-    #         (self.__class__.__module__, self.__class__.__name__)
-    #     )
-
-    #     assert hasattr(self, 'initial_data'), (
-    #         'Cannot call `.is_valid()` as no `data=` keyword argument was '
-    #         'passed when instantiating the serializer instance.'
-    #     )
-
-    #     if not hasattr(self, '_validated_data'):
-    #         try:
-    #             self._validated_data = self.run_validation(self.initial_data)
-    #         except ValidationError as exc:
-    #             self._validated_data = {}
-    #             self._errors = exc.detail
-    #         else:
-    #             self._errors = {}
-
-    #     # if validation failed
-    #     if self._errors and raise_exception:
-    #         error_message = {}
-    #         message = str(self.errors)
-
-    #         for k, v in self.errors.items():
-    #             message = str(v)
-    #             start = message.find('string=') + 8
-    #             end = message.find(', code=') - 1
-    #             message = message[start:end]
-
-    #             error_message[str(k)] = message
-
-    #         raise BadRequestException(error_message)
-
-    #     return not bool(self._errors)
 
 
 class ChangeRequestTemplatesSerializerList(

app/helper/email_service/sender.py

@@ -70,7 +70,7 @@ def cronjob(args):
             subject='Resource Management System: Welcome!',
             message='',
             from_email=settings.EMAIL_DEFAULT_SENDER,
-            recipient_list=('red@tirsolutions.com',),
+            recipient_list=('gladys@tirsolutions.com',),
             html_message="FC",
             fail_silently=False
         )