Commit 40cd526c authored by John Red Medrano's avatar John Red Medrano

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

* commit '327611a2':
  rms31 bugfix removed transaction atomic and transaction.savepoint do manual the acid
parents 8ba97793 327611a2
...@@ -294,7 +294,7 @@ class BatchUploadViewSet(viewsets.ModelViewSet): ...@@ -294,7 +294,7 @@ class BatchUploadViewSet(viewsets.ModelViewSet):
# @transaction.atomic # @transaction.atomic
def create(self, request, **kwargs): def create(self, request, **kwargs):
sp1 = transaction.savepoint() # nothing will save to db # sp1 = transaction.savepoint() # nothing will save to db
csv_file = request.FILES['file'] csv_file = request.FILES['file']
extension_file = str(csv_file).split('.')[1] extension_file = str(csv_file).split('.')[1]
...@@ -342,7 +342,8 @@ class BatchUploadViewSet(viewsets.ModelViewSet): ...@@ -342,7 +342,8 @@ class BatchUploadViewSet(viewsets.ModelViewSet):
Q(company=user_company) Q(company=user_company)
) )
if not request_department: if not request_department:
transaction.savepoint_rollback(sp1) etl2.delete()
# transaction.savepoint_rollback(sp1)
return Response( return Response(
{"message": company_error}, {"message": company_error},
# {"message": str(e)}, # {"message": str(e)},
...@@ -351,7 +352,8 @@ class BatchUploadViewSet(viewsets.ModelViewSet): ...@@ -351,7 +352,8 @@ class BatchUploadViewSet(viewsets.ModelViewSet):
elif request.user.user_type == enums_department: elif request.user.user_type == enums_department:
if keys['Department_Code'] != request.user.department.code: if keys['Department_Code'] != request.user.department.code:
transaction.savepoint_rollback(sp1) etl2.delete()
# transaction.savepoint_rollback(sp1)
return Response( return Response(
{"message": department_error}, {"message": department_error},
# {"message": str(e)}, # {"message": str(e)},
...@@ -451,7 +453,8 @@ class BatchUploadViewSet(viewsets.ModelViewSet): ...@@ -451,7 +453,8 @@ class BatchUploadViewSet(viewsets.ModelViewSet):
AllowedCompany.objects.create(**privilege_object) AllowedCompany.objects.create(**privilege_object)
except IntegrityError as e: except IntegrityError as e:
transaction.savepoint_rollback(sp1) etl2.delete()
# transaction.savepoint_rollback(sp1)
return Response( return Response(
{"message": f"Duplicate user privilege at row {data + 2}"}, {"message": f"Duplicate user privilege at row {data + 2}"},
# {"message": str(e)}, # {"message": str(e)},
...@@ -459,28 +462,32 @@ class BatchUploadViewSet(viewsets.ModelViewSet): ...@@ -459,28 +462,32 @@ class BatchUploadViewSet(viewsets.ModelViewSet):
) )
except ObjectDoesNotExist as e: except ObjectDoesNotExist as e:
transaction.savepoint_rollback(sp1) etl2.delete()
# transaction.savepoint_rollback(sp1)
return Response( return Response(
{"message": f"Department Does not Exist at Privilege row {data + 2}"}, {"message": f"Department Does not Exist at Privilege row {data + 2}"},
status=status.HTTP_400_BAD_REQUEST status=status.HTTP_400_BAD_REQUEST
) )
except IntegrityError as e: except IntegrityError as e:
transaction.savepoint_rollback(sp1) etl2.delete()
# transaction.savepoint_rollback(sp1)
return Response( return Response(
{"message": f"Record already exist at row {data + 2}"}, {"message": f"Record already exist at row {data + 2}"},
status=status.HTTP_400_BAD_REQUEST status=status.HTTP_400_BAD_REQUEST
) )
except KeyError as e: except KeyError as e:
transaction.savepoint_rollback(sp1) etl2.delete()
# transaction.savepoint_rollback(sp1)
return Response( return Response(
{"message": f"Missing column {e.args[0]}"}, {"message": f"Missing column {e.args[0]}"},
status=status.HTTP_400_BAD_REQUEST status=status.HTTP_400_BAD_REQUEST
) )
except ObjectDoesNotExist as e: except ObjectDoesNotExist as e:
transaction.savepoint_rollback(sp1) etl2.delete()
# transaction.savepoint_rollback(sp1)
return Response( return Response(
{"message": f"Department Does not Exist at row {data + 2}"}, {"message": f"Department Does not Exist at row {data + 2}"},
status=status.HTTP_400_BAD_REQUEST status=status.HTTP_400_BAD_REQUEST
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment