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

* commit '1871a91a':
  removed comment and print

app/applicationlayer/management/batchupload/views.py

@@ -70,7 +70,6 @@ class BatchUploadViewSet(viewsets.ModelViewSet):
         queryset = UserHistory.objects.filter(file_name=code)
         page = self.paginate_queryset(queryset)
 
-        # if page is not None:
         serializer = self.get_serializer(page, many=True)
         message = status_message_response(
             200,
@@ -91,12 +90,10 @@ class BatchUploadViewSet(viewsets.ModelViewSet):
         logged_user_department = request.user.department.name
         logged_user_email = request.user.email
         email_users = []
-        print(csv_file)
         etl = ExtractTransformLoad.objects.create(
             file_name=str(csv_file),
             model_type=enums.GenerateCode.USER.value
         )
-        print(etl.id)
         etl2 = ExtractTransformLoad.objects.get(id=etl.id)
 
         for data, keys in df.iterrows():
@@ -220,15 +217,13 @@ class BatchUploadViewSet(viewsets.ModelViewSet):
                         AllowedCompany.objects.create(**privilege_object)
                     except IntegrityError as e:
                         return Response(
-                            # {"message": f"Duplicate user privilege at row {data + 2}"},
-                            {"message": str(e)},
+                            {"message": f"Duplicate user privilege at row {data + 2}"},
                             status=status.HTTP_400_BAD_REQUEST
                         )
 
             except IntegrityError as e:
                 return Response(
-                    # {"message": f"Record already exist at row {data + 2}"},
-                    {"message": str(e)},
+                    {"message": f"Record already exist at row {data + 2}"},
                     status=status.HTTP_400_BAD_REQUEST
                 )
 
@@ -242,25 +237,18 @@ class BatchUploadViewSet(viewsets.ModelViewSet):
             del users['contact_no']
             del users['default_app']
             del users['user_type']
-            # users['file_name'] = etl.code
 
             users['password'] = password
 
-            # print(users)
-            print(etl2.code)
-
             UserHistory.objects.create(
                 **users,
                 file_name=etl2
             )
             users['admin'] = logged_user_email
 
-            # email_users.push({**users})
-
         send_mail = UserHistory.objects.filter(sent=False)[0:100].values(
             'name', 'username', 'email', 'password'
         )
-        # print(send_mail)
 
         df = pd.DataFrame(send_mail)
         df.to_csv("users.csv", index=False)