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

* commit '10ddff20':
  when user is deleted it will also delete the record on UserHistory

app/applicationlayer/management/account/views.py

@@ -150,6 +150,8 @@ class UserViewSet(viewsets.ModelViewSet):
 
         instance = self.get_object()
         new_instance = model_to_dict(instance)
+        UserHistory.objects.filter(username=instance.username).delete()
+        AllowedCompany.objects.filter(id_number=instance.code).delete()
         self.perform_destroy(instance)
 
         log_save(
@@ -250,7 +252,7 @@ class UserViewSet(viewsets.ModelViewSet):
         email_users = []
 
         for data, keys in df.iterrows():
-            # try:
+            try:
                 user_department = Department.objects.filter(
                     Q(name__icontains=keys['department']) &
                     Q(company__name__icontains=logged_user_company)
@@ -357,7 +359,7 @@ class UserViewSet(viewsets.ModelViewSet):
                         privilege_list[4] = True
 
                     current_user = User.objects.get(id=current_user.id)
-                # try:
+                    try:
                         privilege_object = {
                             "id_number": current_user,
                             "company_pivot": this_company,
@@ -368,23 +370,23 @@ class UserViewSet(viewsets.ModelViewSet):
                             "approve_cr": privilege_list[5]
                         }
                         AllowedCompany.objects.create(**privilege_object)
-                    # except IntegrityError as e:
-                    #     return Response(
-                    #         {"message": f"Duplicate user privilege at row {data + 2}"},
-                    #         status=status.HTTP_201_CREATED
-                    #     )
-
-            # except IntegrityError as e:
-            #     return Response(
-            #         {"message": f"Record already exist at row {data + 2}"},
-            #         status=status.HTTP_201_CREATED
-            #     )
-
-            # except KeyError as e:
-            #     return Response(
-            #         {"message": "Missing column user_type"},
-            #         status=status.HTTP_201_CREATED
-            #     )
+                    except IntegrityError as e:
+                        return Response(
+                            {"message": f"Duplicate user privilege at row {data + 2}"},
+                            status=status.HTTP_201_CREATED
+                        )
+
+            except IntegrityError as e:
+                return Response(
+                    {"message": f"Record already exist at row {data + 2}"},
+                    status=status.HTTP_201_CREATED
+                )
+
+            except KeyError as e:
+                return Response(
+                    {"message": "Missing column user_type"},
+                    status=status.HTTP_201_CREATED
+                )
 
             del users['department']
             del users['contact_no']