diff --git a/atlas/api.py b/atlas/api.py index 4a89bccf..5938cceb 100644 --- a/atlas/api.py +++ b/atlas/api.py @@ -49,12 +49,12 @@ def upload_dicom(request, files: List[UploadedFile] = File(...)): ud.save() - uploaded.append(ud) + uploaded.append((file.name, ud.image_md5_hash)) except DuplicateDicom: - duplicate.append(ud) + duplicate.append((file.name, ud.image_md5_hash)) pass - return {"uploaded": len(uploaded), "duplicates": len(duplicate)} + return {"uploaded": uploaded, "duplicates": duplicate} @router.get("/clear_dicoms", auth=django_auth) @@ -156,6 +156,7 @@ def series_remove_duplicate_images(request, series_id: int): @router.get("/get_cases_user", auth=django_auth, response=List[CaseSchema]) def get_cases_user(request): + print("HELLO") return Case.objects.filter(author=request.user) @router.get("/check_image_hash/{hash}", auth=django_auth) diff --git a/atlas/models.py b/atlas/models.py index 3b4f3457..020fc61c 100644 --- a/atlas/models.py +++ b/atlas/models.py @@ -828,6 +828,9 @@ class UncategorisedDicom(models.Model): if UncategorisedDicom.objects.filter(image_md5_hash=image_hash): raise DuplicateDicom + + if SeriesImage.objects.filter(image_md5_hash=image_hash): + raise DuplicateDicom # Hack for tests if image_hash != "12345ABCD":