fix issues

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

@@ -45,7 +45,7 @@ class ChangeRequestFormHeaderSerializer(
             else:
                 approver = 'No'
 
-            ret['action'] = approver
+            ret['action_required'] = approver
             
             requested_to_user = {
                 "id": instance.requested_to_user.id,

app/applicationlayer/cms/form/header/views.py

@@ -1026,6 +1026,14 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
                 enums.CREnum.SUBMIT.value
             )
         
+        min_level = models.ChangeRequestFormApprovers.objects.filter(
+            form_code=form_code
+        ).aggregate(Min('level'))
+        
+        min_level = min_level.get('level__min')
+        
+        next_approver_email(form_code, min_level)
+        
         serializer = self.get_serializer(instance)
 
         message = status_message_response(

app/applicationlayer/cms/urls_cms.py

@@ -3,7 +3,6 @@ from rest_framework import routers
 from django.conf.urls import url
 from rest_framework.urlpatterns import format_suffix_patterns
 
-from app.applicationlayer.management.notification.views import NotificationsViewset
 
 from app.applicationlayer.cms.form import views as crform_views
 from app.applicationlayer.cms.allowed_company import views as allowed
@@ -36,8 +35,6 @@ from app.applicationlayer.cms.form.download import views as dl
 
 router = routers.DefaultRouter()
 
-router.register(r'notifications', NotificationsViewset)
-
 router.register(r'template', header.ChangeRequestTemplatesViewset)
 router.register(r'template-approvers', approver.ChangeRequestTemplateApproversViewset)
 router.register(r'template-attachments', attachment.ChangeRequestTemplateAttachmentsViewset)

app/applicationlayer/management/notification/views.py

@@ -29,7 +29,7 @@ class NotificationsViewset(meviewsets.ModelViewSet):
     pagination_class = CustomPagination
 
     def list(self, request, *args, **kwargs):
-        try:
+        # try:
         req = self.request
         account_no = req.query_params.get('account_no')
         app = req.query_params.get('app')
@@ -62,6 +62,7 @@ class NotificationsViewset(meviewsets.ModelViewSet):
                         )
             
             return Response(message)
+
         serializer = self.get_serializer(queryset, many=True)
         page = self.paginate_queryset(queryset)
         if page is not None:
@@ -76,12 +77,12 @@ class NotificationsViewset(meviewsets.ModelViewSet):
 
             return self.get_paginated_response(message)
     
-        except Exception as e:
-            message = status_message_response(
-                500, 'failed', 
-                'Request was not able to process' + str(e), [])
-            return Response(message,
-                            status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+        # except Exception as e:
+        #     message = status_message_response(
+        #         500, 'failed',
+        #         'Request was not able to process' + str(e), [])
+        #     return Response(message,
+        #                     status=status.HTTP_500_INTERNAL_SERVER_ERROR)
 
     # comment
     @action(methods=["PATCH"], detail=True)

app/applicationlayer/urls.py

@@ -8,6 +8,7 @@ from app.applicationlayer.management.department.views import DepartmentViewSet
 from app.applicationlayer.management.module.views import ModuleViewSet
 from app.applicationlayer.management.account.views import UserViewSet
 from app.businesslayer.company.views import AdminCompanyViewSet
+from app.applicationlayer.management.notification.views import NotificationsViewset
 
 
 router = routers.DefaultRouter()
@@ -17,6 +18,7 @@ router.register(r'companies', CompanyViewSet)
 router.register(r'departments', DepartmentViewSet)
 router.register(r'modules', ModuleViewSet)
 router.register(r'users', UserViewSet)
+router.register(r'notifications', NotificationsViewset)
 
 urlpatterns = (
     path('', include(router.urls)),

app/helper/email_service/sender.py

@@ -485,7 +485,7 @@ def admin_changepassword(args):
 def routing_table_actions(args):
     name = args[0]
     action_by = args[1]
-    routing_level = args[2]
+    routing_level = str(args[2])
     status = args[3]
     cr_number = args[4]
     cr_name = args[5]

env.template.ini

@@ -40,7 +40,7 @@ FRONT_END_URL = http://devweb.rmsv2.oneberrysystem.com
 AUTH_ACCESSS_TOKEN_TIMEOUT = 
 USER_DEFAULT_PASSWORD = 
 CATCH_EMAIL = gladys@tirsolutions.com
-CR_LINK = http://devweb.rms.oneberrysystem.com/cms/change-request/form/view
+CR_LINK = http://devweb.rmsv2.oneberrysystem.com//cms/change-request/form/view
 REALTIMESERVER_IP = 127.0.0.1:8000
 
 [LOCAL]