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

Scrum 4802 - allow null "version" parameter when downloading datasets to get latest version #828

Merged
merged 6 commits into from
Jan 31, 2025
Merged

Scrum 4802 - allow null "version" parameter when downloading datasets to get latest version #828

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d3e0731
Return latest dataset version if no version is provided as parameter
valearna Jan 31, 2025
8e2591f
Made version parameter optional
valearna Jan 31, 2025
b4e0d0c
mypy fix
valearna Jan 31, 2025
be52e61
Added optional parameter
valearna Jan 31, 2025
326a8fa
Removed unused import
valearna Jan 31, 2025
9e47e66
Merge branch 'main' into SCRUM-4802
ianlongden Jan 31, 2025
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
17 changes: 11 additions & 6 deletions agr_literature_service/api/crud/dataset_crud.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,18 @@


def get_dataset(db: Session, mod_abbreviation: str, data_type: str, dataset_type: str,
version: int) -> DatasetModel:
dataset = db.query(DatasetModel).join(DatasetModel.mod).filter(
version: int = None) -> DatasetModel:

dataset_query = db.query(DatasetModel).join(DatasetModel.mod).filter(
DatasetModel.mod.has(abbreviation=mod_abbreviation),
DatasetModel.data_type == data_type,
DatasetModel.dataset_type == dataset_type,
DatasetModel.version == version,
).first()
DatasetModel.dataset_type == dataset_type
)
if version is not None and version > 0:
dataset_query = dataset_query.filter(DatasetModel.version == version)
else:
dataset_query = dataset_query.order_by(DatasetModel.version.desc())
dataset = dataset_query.first()
if not dataset:
raise HTTPException(status_code=404, detail="Dataset not found")
return dataset
Expand Down Expand Up @@ -73,7 +78,7 @@ def delete_dataset(db: Session, mod_abbreviation: str, data_type: str, dataset_t


def download_dataset(db: Session, mod_abbreviation: str, data_type: str,
dataset_type: str, version: int) -> DatasetSchemaDownload:
dataset_type: str, version: int = None) -> DatasetSchemaDownload:
dataset = get_dataset(db, mod_abbreviation, data_type, dataset_type, version)
if not dataset:
raise HTTPException(status_code=404, detail="Dataset not found")
Expand Down
4 changes: 3 additions & 1 deletion agr_literature_service/api/routers/dataset_router.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,9 @@ def patch_dataset(request: DatasetSchemaUpdate, mod_abbreviation: str, data_type

@router.get("/download/{mod_abbreviation}/{data_type}/{dataset_type}/{version}/",
response_model=DatasetSchemaDownload)
def download_dataset(mod_abbreviation: str, data_type: str, dataset_type: str, version: int,
@router.get("/download/{mod_abbreviation}/{data_type}/{dataset_type}/",
response_model=DatasetSchemaDownload)
def download_dataset(mod_abbreviation: str, data_type: str, dataset_type: str, version: int = None,
db: Session = db_session):
db_dataset = dataset_crud.download_dataset(db, mod_abbreviation=mod_abbreviation, data_type=data_type,
dataset_type=dataset_type, version=version)
Expand Down
Loading