Skip to content

Update name field for new django version #96

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

Merged
MialLewis merged 2 commits into from
Jan 30, 2026
Merged

Update name field for new django version #96

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
39d4112
update name field
MialLewis Jan 28, 2026
a697afa
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 28, 2026
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
28 changes: 14 additions & 14 deletions web/services/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ def filter(self, queryset, value):
if value:
# date_value = value.replace(hour=0, minute=0, second=0)
filter_lookups = {
"%s__range" % (self.name,): (
"%s__range" % (self.field_name,): (
value,
value + timedelta(days=1),
),
Expand All @@ -76,18 +76,18 @@ def filter(self, queryset, value):
if value:
if len(value) != 32:
value = hashlib.md5(value).hexdigest()
filter_lookups = {self.name: value}
filter_lookups = {self.field_name: value}
queryset = queryset.filter(**filter_lookups)
return queryset


class UsageFilter(django_filters.FilterSet):
date = WithinDateFilter(name="dateTime")
datemin = django_filters.DateFilter(name="dateTime", lookup_expr="gte")
datemax = django_filters.DateFilter(name="dateTime", lookup_expr="lt")
uid = MD5Filter(name="uid")
host = MD5Filter(name="host")
ip = MD5Filter(name="ip")
date = WithinDateFilter(field_name="dateTime")
datemin = django_filters.DateFilter(field_name="dateTime", lookup_expr="gte")
datemax = django_filters.DateFilter(field_name="dateTime", lookup_expr="lt")
uid = MD5Filter(field_name="uid")
host = MD5Filter(field_name="host")
ip = MD5Filter(field_name="ip")

class Meta:
model = Usage
Expand Down Expand Up @@ -160,14 +160,14 @@ def filterByDate(queryset, request=None, datemin=None, datemax=None):
# datemax = request.data.get("datemax", datemax)

if datemin:
queryset = django_filters.DateFilter(name="dateTime", lookup_expr="gte").filter(
queryset, datemin
)
queryset = django_filters.DateFilter(
field_name="dateTime", lookup_expr="gte"
).filter(queryset, datemin)

if datemax:
queryset = django_filters.DateFilter(name="dateTime", lookup_expr="lt").filter(
queryset, datemax
)
queryset = django_filters.DateFilter(
field_name="dateTime", lookup_expr="lt"
).filter(queryset, datemax)

return (queryset, datemin, datemax)

Expand Down