Release v0.1.4
This commit is contained in:
@@ -44,7 +44,7 @@ from govoplan_files.backend.schemas import (
|
||||
_conflict_resolutions,
|
||||
)
|
||||
from govoplan_core.db.models import Group, UserGroupMembership
|
||||
from govoplan_files.backend.db.models import FileAsset, FileFolder, FileShare
|
||||
from govoplan_files.backend.db.models import CampaignAttachmentUse, FileAsset, FileBlob, FileFolder, FileShare, FileVersion
|
||||
from govoplan_core.db.session import get_session
|
||||
from govoplan_files.backend.runtime import settings
|
||||
from govoplan_files.backend.storage.paths import UnsafeFilePathError, filename_from_path, normalize_logical_path
|
||||
@@ -195,6 +195,92 @@ def _asset_response(session: Session, asset: FileAsset, *, include_shares: bool
|
||||
)
|
||||
|
||||
|
||||
def _asset_list_response(session: Session, assets: list[FileAsset], *, include_shares: bool = False) -> list[FileAssetResponse]:
|
||||
if not assets:
|
||||
return []
|
||||
|
||||
asset_ids = [asset.id for asset in assets]
|
||||
version_ids = [asset.current_version_id for asset in assets if asset.current_version_id]
|
||||
if len(version_ids) != len(assets):
|
||||
raise FileStorageError("File has no current version")
|
||||
|
||||
version_blob_rows: list[tuple[FileVersion, FileBlob]] = []
|
||||
for chunk in _chunks(version_ids):
|
||||
version_blob_rows.extend(
|
||||
session.query(FileVersion, FileBlob)
|
||||
.join(FileBlob, FileBlob.id == FileVersion.blob_id)
|
||||
.filter(FileVersion.id.in_(chunk))
|
||||
.all()
|
||||
)
|
||||
versions_by_id = {version.id: version for version, _blob in version_blob_rows}
|
||||
blobs_by_version_id = {version.id: blob for version, blob in version_blob_rows}
|
||||
|
||||
shares_by_asset_id: dict[str, list[FileShareResponse]] = {asset_id: [] for asset_id in asset_ids}
|
||||
if include_shares:
|
||||
for chunk in _chunks(asset_ids):
|
||||
share_rows = (
|
||||
session.query(FileShare)
|
||||
.filter(FileShare.file_asset_id.in_(chunk))
|
||||
.order_by(FileShare.created_at.desc())
|
||||
.all()
|
||||
)
|
||||
for row in share_rows:
|
||||
shares_by_asset_id.setdefault(row.file_asset_id, []).append(
|
||||
FileShareResponse(
|
||||
id=row.id,
|
||||
target_type=row.target_type,
|
||||
target_id=row.target_id,
|
||||
permission=row.permission,
|
||||
created_at=row.created_at.isoformat(),
|
||||
revoked_at=row.revoked_at.isoformat() if row.revoked_at else None,
|
||||
)
|
||||
)
|
||||
|
||||
sent_asset_ids: set[str] = set()
|
||||
for chunk in _chunks(asset_ids):
|
||||
sent_rows = (
|
||||
session.query(CampaignAttachmentUse.file_asset_id)
|
||||
.filter(CampaignAttachmentUse.file_asset_id.in_(chunk), CampaignAttachmentUse.use_stage == "sent")
|
||||
.distinct()
|
||||
.all()
|
||||
)
|
||||
sent_asset_ids.update(row[0] for row in sent_rows)
|
||||
|
||||
responses: list[FileAssetResponse] = []
|
||||
for asset in assets:
|
||||
version = versions_by_id.get(asset.current_version_id or "")
|
||||
blob = blobs_by_version_id.get(asset.current_version_id or "")
|
||||
if not version or not blob:
|
||||
raise FileStorageError("File version not found")
|
||||
responses.append(
|
||||
FileAssetResponse(
|
||||
id=asset.id,
|
||||
tenant_id=asset.tenant_id,
|
||||
owner_type=asset.owner_type,
|
||||
owner_id=_owner_id(asset),
|
||||
display_path=asset.display_path,
|
||||
filename=asset.filename,
|
||||
description=asset.description,
|
||||
size_bytes=blob.size_bytes,
|
||||
content_type=blob.content_type,
|
||||
checksum_sha256=blob.checksum_sha256,
|
||||
version_id=version.id,
|
||||
created_at=asset.created_at.isoformat(),
|
||||
updated_at=asset.updated_at.isoformat(),
|
||||
deleted_at=asset.deleted_at.isoformat() if asset.deleted_at else None,
|
||||
audit_relevant=asset.id in sent_asset_ids,
|
||||
metadata=asset.metadata_ or {},
|
||||
shares=shares_by_asset_id.get(asset.id, []),
|
||||
)
|
||||
)
|
||||
return responses
|
||||
|
||||
|
||||
def _chunks(values: list[str], size: int = 900):
|
||||
for index in range(0, len(values), size):
|
||||
yield values[index:index + size]
|
||||
|
||||
|
||||
def _folder_owner_id(folder: FileFolder) -> str:
|
||||
return folder.owner_user_id if folder.owner_type == "user" else folder.owner_group_id # type: ignore[return-value]
|
||||
|
||||
@@ -349,7 +435,7 @@ def list_files(
|
||||
path_prefix=path_prefix,
|
||||
is_admin=_is_admin(principal),
|
||||
)
|
||||
return FileListResponse(files=[_asset_response(session, asset, include_shares=True) for asset in assets])
|
||||
return FileListResponse(files=_asset_list_response(session, assets, include_shares=True))
|
||||
|
||||
|
||||
@router.post("/upload", response_model=FileUploadResponse)
|
||||
|
||||
Reference in New Issue
Block a user