From 871304fd2e303a6a809bbc2f6d99337922d9c3e5 Mon Sep 17 00:00:00 2001 From: Liviu Anita Date: Mon, 5 Aug 2024 09:29:20 +0100 Subject: [PATCH] Add all models --- api/api/private.py | 13 +++++++++-- api/api/public.py | 23 +++++++++---------- .../tests/{test_dummy.py => test_minimal.py} | 4 ++++ 3 files changed, 26 insertions(+), 14 deletions(-) rename api/api/tests/{test_dummy.py => test_minimal.py} (98%) diff --git a/api/api/private.py b/api/api/private.py index 0a03fe0d..c44933aa 100644 --- a/api/api/private.py +++ b/api/api/private.py @@ -14,10 +14,19 @@ ) models_private = [ shared_data_models.Study, - shared_data_models.ImageAnnotationDataset, + shared_data_models.FileReference, + shared_data_models.ImageRepresentation, shared_data_models.ExperimentalImagingDataset, + shared_data_models.Specimen, + shared_data_models.ExperimentallyCapturedImage, + shared_data_models.ImageAcquisition, + shared_data_models.SpecimenImagingPrepartionProtocol, + shared_data_models.SpecimenGrowthProtocol, + shared_data_models.BioSample, + shared_data_models.ImageAnnotationDataset, shared_data_models.AnnotationFileReference, - shared_data_models.FileReference, + shared_data_models.DerivedImage, + shared_data_models.AnnotationMethod, ] diff --git a/api/api/public.py b/api/api/public.py index 0334c423..466cd2a7 100644 --- a/api/api/public.py +++ b/api/api/public.py @@ -9,10 +9,19 @@ router = APIRouter() models_public = [ shared_data_models.Study, - shared_data_models.ImageAnnotationDataset, + shared_data_models.FileReference, + shared_data_models.ImageRepresentation, shared_data_models.ExperimentalImagingDataset, + shared_data_models.Specimen, + shared_data_models.ExperimentallyCapturedImage, + shared_data_models.ImageAcquisition, + shared_data_models.SpecimenImagingPrepartionProtocol, + shared_data_models.SpecimenGrowthProtocol, + shared_data_models.BioSample, + shared_data_models.ImageAnnotationDataset, shared_data_models.AnnotationFileReference, - shared_data_models.FileReference, + shared_data_models.DerivedImage, + shared_data_models.AnnotationMethod, ] @@ -38,13 +47,3 @@ async def get_item( methods=["GET"], endpoint=make_get_item(t), ) - - -@router.get("/other_resource_no_overwrite") -def not_overwritten(n: int) -> int: - return n - - -# @router.get("/study") -# def yes_overwritten(n: int) -> int: -# return n diff --git a/api/api/tests/test_dummy.py b/api/api/tests/test_minimal.py similarity index 98% rename from api/api/tests/test_dummy.py rename to api/api/tests/test_minimal.py index 2ace3e1a..33fce051 100644 --- a/api/api/tests/test_dummy.py +++ b/api/api/tests/test_minimal.py @@ -1,3 +1,7 @@ +""" +WIP minimal tests +""" + from fastapi.testclient import TestClient import pytest import uuid as uuid_lib