Merge branch 'RMSv2' of http://42.61.118.105:7990/scm/rms/api-main-service into gladys-dev2

app/applicationlayer/management/account/views.py

@@ -148,7 +148,7 @@ class UserViewSet(viewsets.ModelViewSet):
         log_save(
             enums.LogEnum.DELETED.value,
             enums.LogEntitiesEnum.USER.value,
-            new_instance['id'],
+            instance.id,
             new_instance,
             ''
         )
@@ -192,7 +192,7 @@ class UserViewSet(viewsets.ModelViewSet):
         log_save(
             enums.LogEnum.UPDATE.value,
             enums.LogEntitiesEnum.USER.value,
-            new_instance['id'],
+            instance.id,
             old_instance,
             new_instance
         )

app/applicationlayer/management/application/views.py

@@ -94,7 +94,7 @@ class ApplicationViewSet(viewsets.ModelViewSet):
         log_save(
             enums.LogEnum.UPDATE.value,
             enums.LogEntitiesEnum.APPLICATION.value,
-            new_instance['id'],
+            instance.id,
             old_instance,
             new_instance
         )

app/applicationlayer/management/company/views.py

@@ -72,7 +72,7 @@ class CompanyViewSet(viewsets.ModelViewSet):
         log_save(
             enums.LogEnum.DELETED.value,
             enums.LogEntitiesEnum.COMPANY.value,
-            new_instance['id'],
+            instance.id,
             new_instance,
             ''
         )
@@ -95,7 +95,7 @@ class CompanyViewSet(viewsets.ModelViewSet):
         log_save(
             enums.LogEnum.DELETED.value,
             enums.LogEntitiesEnum.COMPANY.value,
-            new_instance['id'],
+            instance.id,
             old_instance,
             new_instance
         )

app/applicationlayer/management/department/views.py

@@ -73,7 +73,7 @@ class DepartmentViewSet(viewsets.ModelViewSet):
         log_save(
             enums.LogEnum.DELETED.value,
             enums.LogEntitiesEnum.DEPARTMENT.value,
-            new_instance['id'],
+            instance.id,
             new_instance,
             ''
         )
@@ -95,7 +95,7 @@ class DepartmentViewSet(viewsets.ModelViewSet):
         log_save(
             enums.LogEnum.DELETED.value,
             enums.LogEntitiesEnum.DEPARTMENT.value,
-            new_instance['id'],
+            instance.id,
             old_instance,
             new_instance
         )

app/applicationlayer/management/module/views.py

@@ -150,7 +150,7 @@ class ModuleViewSet(viewsets.ModelViewSet):
         log_save(
             enums.LogEnum.UPDATE.value,
             enums.LogEntitiesEnum.MODULE.value,
-            new_instance['id'],
+            instance.id,
             old_instance,
             new_instance
         )
@@ -173,7 +173,7 @@ class ModuleViewSet(viewsets.ModelViewSet):
         log_save(
             enums.LogEnum.DELETED.value,
             enums.LogEntitiesEnum.MODULE.value,
-            new_instance['id'],
+            instance.id,
             new_instance,
             ''
         )

app/applicationlayer/management/user/views.py

@@ -59,7 +59,7 @@ class UsersManagementViewSet(viewsets.ModelViewSet):
         log_save(
             enums.LogEnum.DELETED.value,
             enums.LogEntitiesEnum.USER.value,
-            new_instance['id'],
+            instance.id,
             new_instance,
             ''
         )

app/applicationlayer/utils.py

@@ -23,13 +23,9 @@ def model_to_dict(instance):
 
         mySerializer.Meta.model = instance.__class__
 
-        dataPre = mySerializer(instance).data
+        return mySerializer(instance).data
         
-        strData = json.dumps(dataPre)
-
-        return strData
-        
-    except expression as identifier:
+    except Exception as e:
         return 'Serialization Error'
 
 

app/businesslayer/changerequest/change_request_template.py

@@ -87,7 +87,7 @@ def tmp_add_edit_delete(tmp_request_body,
             log_save(
                 enums.LogEnum.ADD.value,
                 enum_type,
-                new_instance['id'],
+                old_instance['id'],
                 '',
                 new_instance
             )