Commit 2d47ffc8 authored by John Red Medrano's avatar John Red Medrano

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

* commit 'ab2eb4ec':
  removed catch
parents 8feef048 ab2eb4ec
...@@ -250,7 +250,7 @@ class UserViewSet(viewsets.ModelViewSet): ...@@ -250,7 +250,7 @@ class UserViewSet(viewsets.ModelViewSet):
email_users = [] email_users = []
for data, keys in df.iterrows(): for data, keys in df.iterrows():
try: # try:
user_department = Department.objects.filter( user_department = Department.objects.filter(
Q(name__icontains=keys['department']) & Q(name__icontains=keys['department']) &
Q(company__name__icontains=logged_user_company) Q(company__name__icontains=logged_user_company)
...@@ -374,17 +374,17 @@ class UserViewSet(viewsets.ModelViewSet): ...@@ -374,17 +374,17 @@ class UserViewSet(viewsets.ModelViewSet):
# status=status.HTTP_201_CREATED # status=status.HTTP_201_CREATED
# ) # )
except IntegrityError as e: # except IntegrityError as e:
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_201_CREATED # status=status.HTTP_201_CREATED
) # )
except KeyError as e: # except KeyError as e:
return Response( # return Response(
{"message": "Missing column user_type"}, # {"message": "Missing column user_type"},
status=status.HTTP_201_CREATED # status=status.HTTP_201_CREATED
) # )
del users['department'] del users['department']
del users['contact_no'] del users['contact_no']
......
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