Merge pull request #532 in RMS/api-main-service from gladys-dev2 to RMSv2

* commit 'd60cfa5a':
  batch upload exception

app/applicationlayer/cms/master/template/account/views.py

@@ -23,14 +23,11 @@ class UserListTemplate(APIView):
                 Q(create_change_request_template=True)
             ).values_list('id_number')
 
-            
-
             user_list = models.User.objects.filter(
                 code__in=verified_users
             )
             print(user_list)
 
-
             page = self.paginate_queryset(user_list)
 
             if page is not None:

app/applicationlayer/management/batchupload/views.py

@@ -43,6 +43,7 @@ from django.http import HttpResponse
 from django.template.loader import get_template
 from xhtml2pdf import pisa
 from django.core.files.storage import FileSystemStorage
+from django.core.exceptions import ObjectDoesNotExist
 import sys
 import os
 import zipfile
@@ -401,6 +402,12 @@ class BatchUploadViewSet(viewsets.ModelViewSet):
                         status=status.HTTP_400_BAD_REQUEST
                     )
 
+                except ObjectDoesNotExist as e:
+                    return Response(
+                        {"message": f"Department Does not Exist at Privilege row {data + 2}"},
+                        status=status.HTTP_400_BAD_REQUEST
+                    )
+
             except IntegrityError as e:
                 # etl2.delete()
                 # transaction.set_rollback(True)
@@ -414,6 +421,12 @@ class BatchUploadViewSet(viewsets.ModelViewSet):
                     {"message": f"Missing column {e.args[0]}"},
                     status=status.HTTP_400_BAD_REQUEST
                 )
+            
+            except ObjectDoesNotExist as e:
+                return Response(
+                    {"message": f"Department Does not Exist at row {data + 2}"},
+                    status=status.HTTP_400_BAD_REQUEST
+                )
 
             # except ValueError as e:
             #     return Response(