Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

hard delete the participant #618

Open
wants to merge 2 commits into
base: fs_kenya_dev
Choose a base branch
from
Open

hard delete the participant #618

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
49f3163
hard delete the participant
Oct 5, 2023
04f3ba1
commit
Oct 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 39 additions & 33 deletions datahub/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,11 +274,11 @@ def create(self, request, *args, **kwargs):
"organization": org_serializer.data,
}
return Response(data, status=status.HTTP_201_CREATED)

except ValidationError as e:
return Response(e.detail, status=status.HTTP_400_BAD_REQUEST)
except Exception as e:
LOGGER.error(e,exc_info=True)
LOGGER.error(e, exc_info=True)
return Response(str(e), status=status.HTTP_500_INTERNAL_SERVER_ERROR)

def list(self, request, *args, **kwargs):
Expand Down Expand Up @@ -350,7 +350,7 @@ def update(self, request, pk):
except ValidationError as e:
return Response(e.detail, status=status.HTTP_400_BAD_REQUEST)
except Exception as e:
LOGGER.error(e,exc_info=True)
LOGGER.error(e, exc_info=True)
return Response(str(e), status=status.HTTP_500_INTERNAL_SERVER_ERROR)

def destroy(self, request, pk):
Expand Down Expand Up @@ -442,7 +442,7 @@ def create(self, request, *args, **kwargs):
except ValidationError as e:
return Response(e.detail, status=status.HTTP_400_BAD_REQUEST)
except Exception as e:
LOGGER.error(e,exc_info=True)
LOGGER.error(e, exc_info=True)
return Response(str(e), status=status.HTTP_500_INTERNAL_SERVER_ERROR)

return Response(user_org_serializer.data, status=status.HTTP_201_CREATED)
Expand Down Expand Up @@ -553,10 +553,9 @@ def update(self, request, *args, **kwargs):
except ValidationError as e:
return Response(e.detail, status=status.HTTP_400_BAD_REQUEST)
except Exception as e:
LOGGER.error(e,exc_info=True)
LOGGER.error(e, exc_info=True)
return Response(str(e), status=status.HTTP_500_INTERNAL_SERVER_ERROR)


@authenticate_user(model=Organization)
def destroy(self, request, pk):
"""DELETE method: delete an object"""
Expand Down Expand Up @@ -601,6 +600,9 @@ def destroy(self, request, pk):
# Set the on_boarded_by_id to null if co_steward is deleted
User.objects.filter(on_boarded_by=pk).update(on_boarded_by=None)

# hard delete the participant
User.objects.filter(pk=pk).delete()

return Response(
{"message": ["Participant deleted"]},
status=status.HTTP_204_NO_CONTENT,
Expand Down Expand Up @@ -1013,7 +1015,7 @@ def create(self, request, *args, **kwargs):
except ValidationError as e:
return Response(e.detail, status=status.HTTP_400_BAD_REQUEST)
except Exception as e:
LOGGER.error(e,exc_info=True)
LOGGER.error(e, exc_info=True)
return Response(str(e), status=status.HTTP_500_INTERNAL_SERVER_ERROR)

@action(detail=False, methods=["post"])
Expand Down Expand Up @@ -1050,7 +1052,7 @@ def update(self, request, *args, **kwargs):
except ValidationError as e:
return Response(e.detail, status=status.HTTP_400_BAD_REQUEST)
except Exception as e:
LOGGER.error(e,exc_info=True)
LOGGER.error(e, exc_info=True)
return Response(str(e), status=status.HTTP_500_INTERNAL_SERVER_ERROR)

def list(self, request, *args, **kwargs):
Expand Down Expand Up @@ -1158,7 +1160,7 @@ def create(self, request, *args, **kwargs):
except ValidationError as e:
return Response(e.detail, status=status.HTTP_400_BAD_REQUEST)
except Exception as e:
LOGGER.error(e,exc_info=True)
LOGGER.error(e, exc_info=True)
return Response(str(e), status=status.HTTP_500_INTERNAL_SERVER_ERROR)

@http_request_mutation
Expand Down Expand Up @@ -1823,7 +1825,7 @@ def create(self, request, *args, **kwargs):
except ValidationError as e:
return Response(e.detail, status=status.HTTP_400_BAD_REQUEST)
except Exception as e:
LOGGER.error(e,exc_info=True)
LOGGER.error(e, exc_info=True)
return Response(str(e), status=status.HTTP_500_INTERNAL_SERVER_ERROR)

@authenticate_user(model=DatasetV2)
Expand Down Expand Up @@ -1855,7 +1857,7 @@ def update(self, request, pk, *args, **kwargs):
except ValidationError as e:
return Response(e.detail, status=status.HTTP_400_BAD_REQUEST)
except Exception as e:
LOGGER.error(e,exc_info=True)
LOGGER.error(e, exc_info=True)
return Response(str(e), status=status.HTTP_500_INTERNAL_SERVER_ERROR)

# not being used
Expand Down Expand Up @@ -2309,7 +2311,7 @@ def create(self, request, *args, **kwargs):
except ValidationError as e:
return Response(e.detail, status=status.HTTP_400_BAD_REQUEST)
except Exception as e:
LOGGER.error(e,exc_info=True)
LOGGER.error(e, exc_info=True)
return Response(str(e), status=status.HTTP_500_INTERNAL_SERVER_ERROR)

@action(detail=False, methods=["put"])
Expand Down Expand Up @@ -2379,7 +2381,7 @@ def create(self, request, *args, **kwargs):
except ValidationError as e:
return Response(e.detail, status=status.HTTP_400_BAD_REQUEST)
except Exception as e:
LOGGER.error(e,exc_info=True)
LOGGER.error(e, exc_info=True)
return Response(str(e), status=status.HTTP_500_INTERNAL_SERVER_ERROR)

def retrieve(self, request, *args, **kwargs):
Expand All @@ -2400,7 +2402,7 @@ def update(self, request, *args, **kwargs):
except ValidationError as e:
return Response(e.detail, status=status.HTTP_400_BAD_REQUEST)
except Exception as e:
LOGGER.error(e,exc_info=True)
LOGGER.error(e, exc_info=True)
return Response(str(e), status=status.HTTP_500_INTERNAL_SERVER_ERROR)

@authenticate_user(model=DatasetV2)
Expand Down Expand Up @@ -2546,13 +2548,13 @@ def get_dashboard_chart_data(self, request, pk, *args, **kwargs):
dataset_file = str(dataset_file_obj.file)
if role_id != str(1):
if UsagePolicy.objects.filter(
user_organization_map=map_id,
dataset_file_id=pk,
approval_status="approved"
).order_by("-updated_at").first():
filters=True
user_organization_map=map_id,
dataset_file_id=pk,
approval_status="approved"
).order_by("-updated_at").first():
filters = True
elif DatasetV2File.objects.select_related("dataset").filter(id=pk, dataset__user_map_id=map_id).first():
filters = True
filters = True
else:
filters = False
# Create a dictionary mapping dataset types to dashboard generation functions
Expand Down Expand Up @@ -2705,9 +2707,9 @@ def get_dashboard_chart_data(self, request, pk, *args, **kwargs):
f"Something went wrong, please try again. {e}",
status=status.HTTP_400_BAD_REQUEST,
)

def get_consolidated_file(self, name):
consolidated_file = f"consolidated_{name}.csv"
consolidated_file = f"consolidated_{name}.csv"
dataframes = []
thread_list = []
combined_df = pd.DataFrame([])
Expand All @@ -2722,6 +2724,7 @@ def get_consolidated_file(self, name):
.filter(dataset__name__icontains=name, file__iendswith=".csv")
.values_list('file', flat=True).distinct() # Flatten the list of values
)

def read_csv_file(file_path):
chunk_size = 50000
chunk_df = pd.DataFrame([])
Expand All @@ -2731,11 +2734,12 @@ def read_csv_file(file_path):
for chunk in pd.read_csv(file_path, chunksize=chunk_size):
# Append the processed chunk to the combined DataFrame
chunk_df = pd.concat([chunk_df, chunk], ignore_index=True)
chunks = chunks+1
chunks = chunks + 1
LOGGER.info(f"{file_path} Consolidated {chunks} chunks")
dataframes.append(chunk_df)
except Exception as e:
LOGGER.error(f"Error reading CSV file {file_path}", exc_info=True)

for csv_file in dataset_file_objects:
file_path = os.path.join(settings.DATASET_FILES_URL, csv_file)
thread = threading.Thread(target=read_csv_file, args=(file_path,))
Expand All @@ -2752,9 +2756,10 @@ def read_csv_file(file_path):
except Exception as e:
LOGGER.error(f"Error occoured while creating {consolidated_file}", exc_info=True)
return Response(
"Requested resource is currently unavailable. Please try again later.",
status=500,
)
"Requested resource is currently unavailable. Please try again later.",
status=500,
)


class DatasetFileV2View(GenericViewSet):
queryset = DatasetV2File.objects.all()
Expand Down Expand Up @@ -2783,7 +2788,7 @@ def create(self, request, *args, **kwargs):
except ValidationError as e:
return Response(e.detail, status=status.HTTP_400_BAD_REQUEST)
except Exception as e:
LOGGER.error(e,exc_info=True)
LOGGER.error(e, exc_info=True)
return Response(str(e), status=status.HTTP_500_INTERNAL_SERVER_ERROR)

@authenticate_user(model=DatasetV2File)
Expand Down Expand Up @@ -2833,7 +2838,8 @@ def update(self, request, *args, **kwargs):
) # type: ignore
# data = request.data
standardised_file_path = os.path.join(instance.dataset.name, instance.source, file_name)
data["file_size"] = os.path.getsize(os.path.join(settings.DATASET_FILES_URL, str(standardised_file_path)))
data["file_size"] = os.path.getsize(
os.path.join(settings.DATASET_FILES_URL, str(standardised_file_path)))
else:
file_name = os.path.basename(file_path)
standardised_file_path = os.path.join(instance.dataset.name, instance.source, file_name)
Expand All @@ -2847,7 +2853,7 @@ def update(self, request, *args, **kwargs):
except ValidationError as e:
return Response(e.detail, status=status.HTTP_400_BAD_REQUEST)
except Exception as e:
LOGGER.error(e,exc_info=True)
LOGGER.error(e, exc_info=True)
return Response(str(e), status=status.HTTP_500_INTERNAL_SERVER_ERROR)

def list(self, request, *args, **kwargs):
Expand Down Expand Up @@ -3143,7 +3149,7 @@ def create(self, request, *args, **kwargs):
except ValidationError as e:
return Response(e.detail, status=status.HTTP_400_BAD_REQUEST)
except Exception as e:
LOGGER.error(e,exc_info=True)
LOGGER.error(e, exc_info=True)
return Response(str(e), status=status.HTTP_500_INTERNAL_SERVER_ERROR)

def update(self, request, *args, **kwargs):
Expand Down Expand Up @@ -3189,12 +3195,12 @@ def retrieve(self, request, *args, **kwargs):
serializer = self.get_serializer(resource)
# serializer.is_valid(raise_exception=True)
return Response(serializer.data, status=status.HTTP_200_OK)

@http_request_mutation
@action(detail=False, methods=["post"])
def resources_filter(self, request, *args, **kwargs):
try:
data =request.data
data = request.data
user_map = request.META.get("map_id")
categories = data.pop(Constants.CATEGORY, None)
others = data.pop(Constants.OTHERS, "")
Expand Down Expand Up @@ -3239,7 +3245,7 @@ def create(self, request, *args, **kwargs):
except ValidationError as e:
return Response(e.detail, status=status.HTTP_400_BAD_REQUEST)
except Exception as e:
LOGGER.error(e,exc_info=True)
LOGGER.error(e, exc_info=True)
return Response(str(e), status=status.HTTP_500_INTERNAL_SERVER_ERROR)

def destroy(self, request, *args, **kwargs):
Expand Down