Skip to content

Commit

Permalink
Flake8 issues fix
Browse files Browse the repository at this point in the history
  • Loading branch information
thenav56 committed Dec 4, 2023
1 parent 4be8038 commit aadd13f
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion apps/common/schema.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import graphene
from graphene_django import DjangoObjectType
from graphene_django_extras import DjangoObjectField, PageGraphqlPagination
from django.db.models import Sum, Count, F, Q, Case, When, Max, Value
from django.db.models import Sum, Count, F, Q

from utils.graphene.types import CustomDjangoListObjectType, FileFieldType
from utils.graphene.fields import DjangoPaginatedListObjectField
Expand Down
4 changes: 2 additions & 2 deletions apps/helpdesk/filters.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@


class FaqFilter(django_filters.FilterSet):
search = django_filters.CharFilter(method='search')
search = django_filters.CharFilter(method='filter_search')

class Meta:
model = Faq
fields = ()

def search(self, queryset, name, value):
def filter_search(self, queryset, name, value):
if not value:
return queryset
return queryset.filter(Q(question__icontains=value) | Q(answer__icontains=value))
10 changes: 5 additions & 5 deletions utils/graphene/enums.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,20 +41,20 @@ def get_enum_name_from_django_field(
model_name=None,
):
if field_name is None and model_name is None:
if type(field) == serializers.ChoiceField:
if type(field.parent) == serializers.ListField:
if isinstance(field, serializers.ChoiceField):
if isinstance(field.parent, serializers.ListField):
model_name = field.parent.parent.Meta.model.__name__
field_name = field.parent.field_name
else:
model_name = field.parent.Meta.model.__name__
field_name = field.field_name
elif type(field) == ArrayField:
elif isinstance(field, ArrayField):
model_name = field.model.__name__
field_name = field.base_field.name
elif type(field) in [models.CharField, models.IntegerField]:
elif isinstance(field, models.CharField) or isinstance(field, models.IntegerField):
model_name = field.model.__name__
field_name = field.name
elif type(field) == models.query_utils.DeferredAttribute:
elif isinstance(field, models.query_utils.DeferredAttribute):
model_name = field.field.model.__name__
field_name = field.field.name
if model_name is None or field_name is None:
Expand Down
2 changes: 1 addition & 1 deletion utils/graphene/fields.py
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ def list_resolver(

if getattr(self, "pagination", None):
ordering = kwargs.pop(self.pagination.ordering_param, None) or self.pagination.ordering
if type(self.pagination) == NoOrderingPageGraphqlPagination:
if isinstance(self.pagination, NoOrderingPageGraphqlPagination):
# This is handled in filterset
kwargs[self.pagination.ordering_param] = None
else:
Expand Down
2 changes: 1 addition & 1 deletion utils/graphene/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ def _include(key):
assert _filter_by_keys(excepted, keys=only_keys) == _filter_by_keys(real, keys=only_keys), message
elif ignore_keys:
assert _filter_by_keys(excepted, keys=ignore_keys, exclude=True) \
== _filter_by_keys(real, keys=ignore_keys, exclude=True),\
== _filter_by_keys(real, keys=ignore_keys, exclude=True), \
message
else:
assert excepted == real, message
Expand Down

0 comments on commit aadd13f

Please sign in to comment.