Merge pull request #646 in RMS/api-main-service from red-develop to product-dev

* commit '5170adbe':
  added delete and email notification on cms settings

app/applicationlayer/cms/cms_settings/views.py

@@ -2,7 +2,6 @@ from rest_framework import status, viewsets
 from rest_framework.response import Response
 from app.entities import enums
 from app.entities.models import ChangeRequestSettings, User
-from app.applicationlayer.utils import CustomPagination,status_message_response
 from django_filters import rest_framework as filters
 from django_filters.rest_framework import DjangoFilterBackend
 from rest_framework.filters import SearchFilter, OrderingFilter
@@ -15,7 +14,10 @@ from app.applicationlayer.cms.cms_settings.table_filter import (
 from django.db import transaction
 from rest_framework.exceptions import ValidationError
 from django.db import IntegrityError
-from app.applicationlayer.utils import main_threading
+from app.applicationlayer.utils import (
+    main_threading, log_save, model_to_dict,
+    CustomPagination,status_message_response
+)
 from app.helper.email_service import sender
 
 
@@ -59,6 +61,37 @@ class CMSSettingsViewSet(viewsets.ModelViewSet):
             status=status.HTTP_200_OK
         )
 
+    @transaction.atomic
+    def destroy(self, request, *args, **kwargs):
+
+        instance = self.get_object()
+        logged_user = self.request.user.name
+        new_instance = model_to_dict(instance)
+        # behalf = ChangeRequestSettings.objects.filter(code=str(instance)).first()
+        # print(behalf)
+
+
+        behalf_name = instance.behalf_user.name
+        behalf_email = instance.behalf_user.email
+        
+        self.perform_destroy(instance)
+
+        log_save(
+            enums.LogEnum.DELETED.value,
+            enums.LogEntitiesEnum.ChangeRequestSettings.value,
+            new_instance['id'],
+            new_instance,
+            ''
+        )
+
+        active_user = self.request.user.name
+        admin = request.user.email
+
+        args = [behalf_name, 'removed', active_user, behalf_email, admin]
+        main_threading(args, sender.on_behalf)
+
+        return Response(status=status.HTTP_204_NO_CONTENT)
+
     @transaction.atomic
     def create(self, request, *args, **kwargs):
         try:

app/entities/enums.py

@@ -78,6 +78,7 @@ class LogEntitiesEnum(Enum):
     ChangeRequestFormStakeHolders = "ChangeRequestFormStakeHolders"
     ChangeRequestFormAttachments = "ChangeRequestFormAttachments"
     ChangeRequestFormDetails = "ChangeRequestFormDetails"
+    ChangeRequestSettings = 'ChangeRequestSettings'
 
     # BRAND = "Brand"
     # CATEGORY = "Category"

app/helper/email_service/templates/RMS-ONBEHALF.html

@@ -9,7 +9,8 @@
 <h3 style="color:#888888;">{action} on Behalf</h3><br>
 
 <p>Dear {name},</p><br>
-<p>Please be informed that {active_user} {action} you as on behalf user for change request. </p><br>
+<p>Please be informed that {active_user} {action} you on their behalf for change requests under Actions on Behalf. </p><br>
+<!-- <p>Please be informed that {active_user} {action} you as on behalf user for change request. </p><br> -->
     
 <p>Sincerely,</p>
 <p>RMS Team</p><br><br>