Merge pull request #749 in RMS/api-main-service from core-dev-red-develop to RMSv2

* commit '4c3e4a87':
  {dev bugfix} added validation on update of user and application

app/applicationlayer/management/account/views.py

@@ -175,6 +175,7 @@ class UserViewSet(viewsets.ModelViewSet):
             return Response(message,
                             status=status.HTTP_400_BAD_REQUEST)
 
+    @rms.AccountValidation
     @rms.user_create
     @transaction.atomic
     def update(self, request, *args, **kwargs):

app/applicationlayer/management/application/views.py

@@ -13,6 +13,7 @@ from app.applicationlayer.utils import (
 from django_filters.rest_framework import DjangoFilterBackend
 from app.applicationlayer.management.application import serializer
 from app.applicationlayer.management.application.table_filters import ApplicationFilterSet
+from django.db import IntegrityError
 
 
 class ApplicationViewSet(viewsets.ModelViewSet):
@@ -82,25 +83,32 @@ class ApplicationViewSet(viewsets.ModelViewSet):
 
         return Response(status=status.HTTP_204_NO_CONTENT)
 
+    @decorators.rms.ApplicationValidation
     @decorators.rms.application_crate
     @transaction.atomic
     def update(self, request, *args, **kwargs):
+        try:
+            
+            partial = kwargs.pop('partial', False)
+            instance = self.get_object()
+            serializer = self.get_serializer(instance, data=request.data, partial=partial)
+            serializer.is_valid(raise_exception=True)
+
+            old_instance = model_to_dict(instance)
+            self.perform_update(serializer)
+            new_instance = serializer.data
+
+            log_save(
+                enums.LogEnum.UPDATE.value,
+                enums.LogEntitiesEnum.APPLICATION.value,
+                old_instance['id'],
+                old_instance,
+                new_instance
+            )
 
-        partial = kwargs.pop('partial', False)
-        instance = self.get_object()
-        serializer = self.get_serializer(instance, data=request.data, partial=partial)
-        serializer.is_valid(raise_exception=True)
-
-        old_instance = model_to_dict(instance)
-        self.perform_update(serializer)
-        new_instance = serializer.data
-
-        log_save(
-            enums.LogEnum.UPDATE.value,
-            enums.LogEntitiesEnum.APPLICATION.value,
-            old_instance['id'],
-            old_instance,
-            new_instance
-        )
-
-        return Response(serializer.data)
+            return Response(serializer.data)
+        except IntegrityError as e:
+            return Response(
+                {"message": "Cannot delete or update this reocrd it has foreign key constraint to other tables"},
+                status=status.HTTP_400_BAD_REQUEST
+            )