Skip to content

Commit c73d866

Browse files
authored
Merge pull request #803 from DataIntegrationGroup/hotfix/v1.2.1
fix(api/asset): update access from admin to editor
2 parents 416f0c8 + fa47bbf commit c73d866

5 files changed

Lines changed: 18 additions & 12 deletions

File tree

.release-please-manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
".": "1.2.0"
2+
".": "1.2.1"
33
}

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# Changelog
22

3+
## [1.2.1](https://github.com/DataIntegrationGroup/OcotilloAPI/compare/v1.2.0...v1.2.1) (2026-07-29)
4+
5+
6+
### Bug Fixes
7+
8+
* **api/asset:** update access from admin to editor ([3bed220](https://github.com/DataIntegrationGroup/OcotilloAPI/commit/3bed220a84b129bc65fbb4b97441c35e518f7414))
9+
310
## [1.2.0](https://github.com/DataIntegrationGroup/OcotilloAPI/compare/v1.1.5...v1.2.0) (2026-07-22)
411

512

api/asset.py

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
from core.dependencies import (
3434
session_dependency,
3535
viewer_dependency,
36-
admin_dependency,
3736
editor_dependency,
3837
)
3938
from db import Thing
@@ -141,7 +140,7 @@ def database_error_handler(payload: CreateAsset, error: ProgrammingError) -> Non
141140
status_code=HTTP_201_CREATED,
142141
)
143142
async def upload_asset(
144-
user: admin_dependency,
143+
user: editor_dependency,
145144
bucket=Depends(get_storage_bucket),
146145
file: UploadFile = File(...),
147146
) -> dict:
@@ -171,7 +170,7 @@ async def upload_asset(
171170

172171
@router.post("/upload-and-record", status_code=HTTP_201_CREATED)
173172
async def upload_and_record_asset(
174-
user: admin_dependency,
173+
user: editor_dependency,
175174
session: session_dependency,
176175
bucket=Depends(get_storage_bucket),
177176
file: UploadFile = File(...),
@@ -188,7 +187,7 @@ async def upload_and_record_asset(
188187
returned instead of creating a duplicate.
189188
190189
Args:
191-
user: Authenticated admin user performing the upload.
190+
user: Authenticated editor user performing the upload.
192191
session: Active database session.
193192
bucket: GCS storage bucket resolved via dependency injection.
194193
file: The file to upload. Accepted MIME types: JPEG, PNG, GIF, WebP,
@@ -384,10 +383,10 @@ async def upload_and_record_asset(
384383

385384
@router.post("", status_code=HTTP_201_CREATED)
386385
async def add_asset(
387-
user: admin_dependency,
386+
user: editor_dependency,
388387
session: session_dependency,
389388
asset_data: CreateAsset,
390-
) -> AssetResponse:
389+
) -> AssetResponse | None:
391390

392391
try:
393392
data = asset_data.model_dump()
@@ -446,7 +445,7 @@ async def add_asset(
446445
async def list_assets(
447446
user: viewer_dependency,
448447
session: session_dependency,
449-
thing_id: int = None,
448+
thing_id: int | None = None,
450449
) -> CustomPage[AssetResponse]:
451450
"""
452451
List all assets or assets associated with a specific thing.
@@ -579,7 +578,7 @@ async def update_asset(
579578

580579
@router.delete("/{asset_id}", status_code=HTTP_204_NO_CONTENT)
581580
async def delete_asset(
582-
asset_id: int, session: session_dependency, user: admin_dependency
581+
asset_id: int, session: session_dependency, user: editor_dependency
583582
):
584583
return model_deleter(session, Asset, asset_id, user=user)
585584

@@ -589,7 +588,7 @@ async def delete_asset(
589588
status_code=HTTP_204_NO_CONTENT,
590589
)
591590
async def remove_asset(
592-
user: admin_dependency,
591+
user: editor_dependency,
593592
asset_id: int,
594593
session: session_dependency,
595594
bucket=Depends(get_storage_bucket),

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[project]
22
name = "OcotilloAPI"
3-
version = "1.2.0"
3+
version = "1.2.1"
44
description = "FastAPI backend and CLI for managing Ocotillo groundwater locations, wells, assets, and bulk water-level data transfers."
55
readme = "README.md"
66
requires-python = ">=3.13"

uv.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)