Skip to content

Fix delete collection versioning #438

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
Corpratespaz merged 1 commit into from
Jul 19, 2023
Merged

Fix delete collection versioning #438

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 16 additions & 9 deletions api/src/main/kotlin/edu/wgu/osmt/collection/CollectionController.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,24 +310,31 @@ class CollectionController @Autowired constructor(
}

@DeleteMapping(path = [
"${RoutePaths.API}/{apiVersion}${RoutePaths.COLLECTION_REMOVE}"
"${RoutePaths.API}${RoutePaths.API_V3}${RoutePaths.COLLECTION_REMOVE}",
],
produces = [MediaType.APPLICATION_JSON_VALUE])
fun removeCollection(
@PathVariable(name = "apiVersion", required = false) apiVersion: String?,
@PathVariable uuid: String
): HttpEntity<TaskResult> {
val task = if (RoutePaths.API_V3 == "/${apiVersion}") {
RemoveCollectionSkillsTask(collectionUuid = uuid, apiResultPath = "${RoutePaths.API}${RoutePaths.API_V3}${RoutePaths.TASK_DETAIL_BATCH}")
} else if (RoutePaths.API_V2 == "/${apiVersion}" || RoutePaths.UNVERSIONED == apiVersion) {
RemoveCollectionSkillsTask(collectionUuid = uuid, apiResultPath = "${RoutePaths.API}${RoutePaths.API_V2}${RoutePaths.TASK_DETAIL_BATCH}")
} else {
throw ResponseStatusException(HttpStatus.NOT_FOUND)
}
val task = RemoveCollectionSkillsTask(collectionUuid = uuid, apiResultPath = "${RoutePaths.API}${RoutePaths.API_V3}${RoutePaths.TASK_DETAIL_BATCH}")
taskMessageService.enqueueJob(TaskMessageService.removeCollectionSkills, task)

return Task.processingResponse(task)
}

@DeleteMapping(path = [
"${RoutePaths.API}${RoutePaths.API_V2}${RoutePaths.COLLECTION_REMOVE}",
"${RoutePaths.API}${RoutePaths.UNVERSIONED}${RoutePaths.COLLECTION_REMOVE}"
],
produces = [MediaType.APPLICATION_JSON_VALUE])
fun removeCollectionV2(
@PathVariable uuid: String
): HttpEntity<TaskResult> {
val task = RemoveCollectionSkillsTask(collectionUuid = uuid, apiResultPath = "${RoutePaths.API}${RoutePaths.API_V2}${RoutePaths.TASK_DETAIL_BATCH}")
taskMessageService.enqueueJob(TaskMessageService.removeCollectionSkills, task)

return Task.processingResponse(task)
}

@GetMapping(path = [
"${RoutePaths.API}${RoutePaths.API_V2}${RoutePaths.COLLECTION_AUDIT_LOG}",
Expand Down