Skip to content

Commit

Permalink
Fixes linting / mypy.
Browse files Browse the repository at this point in the history
  • Loading branch information
cyrillkuettel committed Dec 15, 2024
1 parent d33d3b5 commit c04bdd0
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion src/privatim/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ def get_previous_versions(
.all()
)
try:
return (
return list(
session.execute(
select(Consultation)
.where(Consultation.id.in_(version_ids))
Expand Down
9 changes: 4 additions & 5 deletions src/privatim/views/activities.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

from sqlalchemy import select
from pyramid.httpexceptions import HTTPFound
from sqlalchemy.orm import joinedload
from sqlalchemy.orm import joinedload, QueryableAttribute
from privatim.models import Consultation, Meeting
from privatim.models.comment import Comment
from privatim.i18n import _
Expand All @@ -17,22 +17,21 @@
from sqlalchemy.orm import Session
from pyramid.interfaces import IRequest
from privatim.types import RenderDataOrRedirect, Activity
from sqlalchemy.orm import InstrumentedAttribute


def maybe_apply_date_filter(
query: 'Select[Any]',
start_datetime: datetime | None,
end_datetime: datetime | None,
date_column: 'InstrumentedAttribute[datetime]'
datetime_column: 'QueryableAttribute[datetime]',
) -> 'Select[Any]':
"""
Apply start and end date filters to a given query.
"""
if start_datetime:
query = query.filter(date_column >= start_datetime)
query = query.filter(datetime_column >= start_datetime)
if end_datetime:
query = query.filter(date_column <= end_datetime)
query = query.filter(datetime_column <= end_datetime)
return query


Expand Down
3 changes: 2 additions & 1 deletion tests/cli/test_data_retention_policy.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ def create_consultation(
session.add(file)
consultation.files.append(file)

consultation.updated = utcnow() - timedelta(days=days_old)
# updated will be accesssed
consultation.created = utcnow() - timedelta(days=days_old)
consultation.deleted = is_deleted
session.add(consultation)
session.flush()
Expand Down

0 comments on commit c04bdd0

Please sign in to comment.