Skip to content

Fix/plat 2584 #610

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

Merged
merged 6 commits into from
Apr 3, 2023
Merged

Fix/plat 2584 #610

Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ae25fe1
add type in esClient.delete
ThomasKranitsas Mar 30, 2023
e9b50a7
update ci configs
ThomasKranitsas Mar 30, 2023
c5cd021
check if challenge exists before trying to delete
ThomasKranitsas Mar 30, 2023
39428ec
refactor delete
ThomasKranitsas Mar 30, 2023
1312233
clean up access checks
ThomasKranitsas Mar 30, 2023
e70f513
change error message in delete challenge
ThomasKranitsas Apr 3, 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
9 changes: 8 additions & 1 deletion src/services/ChallengeService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2282,6 +2282,9 @@ function sanitizeData(data, challenge) {
*/
async function deleteChallenge(currentUser, challengeId) {
const challenge = await challengeDomain.lookup(getLookupCriteria("id", challengeId));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's use a scanCriteria here with

  1. id: challengeId
  2. status: New

We don't need to fetch a challenge that's not New.

if (!challenge) {
throw new errors.NotFoundError(`Challenge with id: ${challengeId} doesn't exist`);
}
if (challenge.status !== constants.challengeStatuses.New) {
throw new errors.BadRequestError(
`Challenge with status other than "${constants.challengeStatuses.New}" cannot be removed`
Expand All @@ -2292,11 +2295,15 @@ async function deleteChallenge(currentUser, challengeId) {
// check if user are allowed to delete the challenge
await ensureAccessibleForChallenge(currentUser, challenge);
// delete DB record
await challengeDomain.delete(getLookupCriteria("id", challengeId));
const { items } = await challengeDomain.delete(getLookupCriteria("id", challengeId));
if (!_.find(items, { id: challengeId })) {
throw new errors.Internal(`There was an error deleting the challenge with id: ${challengeId} from dynamo`);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't need to specifically mention dynamo. Just that there was an error deleting the challenge with id ${challengeId} is fine.

}
// delete ES document
await esClient.delete({
index: config.get("ES.ES_INDEX"),
refresh: config.get("ES.ES_REFRESH"),
type: config.get("ES.OPENSEARCH") == "false" ? config.get("ES.ES_TYPE") : undefined,
id: challengeId,
});
await helper.postBusEvent(constants.Topics.ChallengeDeleted, {
Expand Down