Skip to content

Commit

Permalink
issue fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
sorkhemiri committed Feb 22, 2020
1 parent 668482f commit d713a01
Showing 1 changed file with 13 additions and 13 deletions.
26 changes: 13 additions & 13 deletions ahura/serializer.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@ def fields_classifier(fields: list) -> dict:
return data

def single_object_field_resolver(self, obj, field, depth: Optional[int] = None):
if getattr(obj, field.attname, False):
related_object = getattr(obj, field.attname)
if getattr(obj, field.name, False):
related_object = getattr(obj, field.name)
if depth == 0:
return related_object.id
elif depth and depth != 0:
Expand All @@ -101,8 +101,8 @@ def single_object_field_resolver(self, obj, field, depth: Optional[int] = None):
def many_object_field_resolver(
self, obj, field, depth: Optional[int] = None,
):
if getattr(obj, field.attname, False):
related_objects = getattr(obj, field.attname).all()
if getattr(obj, field.name, False):
related_objects = getattr(obj, field.name).all()
if depth == 0:
related_ids = [item.id for item in related_objects]
return related_ids
Expand All @@ -114,7 +114,7 @@ def many_object_field_resolver(
return serializered_model

def timedelta_resolver(self, obj, field):
timedelta_object = getattr(obj, field.attname)
timedelta_object = getattr(obj, field.name)
data = {}
data["y"], remaining = divmod(timedelta_object.days, 365)
data["m"], data["d"] = divmod(remaining, 30)
Expand All @@ -130,16 +130,16 @@ def timedelta_resolver(self, obj, field):
@staticmethod
def value_from_object(field, obj):
"""Return the value of this field in the given model instance."""
return getattr(obj, field.attname)
return getattr(obj, field.name)

def field_name_selector(self, field):
if field.attname in self.rename:
alter_name = self.rename[field.attname]
if field.name in self.rename:
alter_name = self.rename[field.name]
if not isinstance(alter_name, str):
raise ValueError("Alternative Name Must Be String")
return alter_name
else:
return field.attname
return field.name

def field_value_resolver(self, obj, depth: Optional[int] = None, **kwargs) -> dict:
date_time = kwargs.get("date_time", [])
Expand All @@ -160,12 +160,12 @@ def field_value_resolver(self, obj, depth: Optional[int] = None, **kwargs) -> di
# datetime field resolver
for item in date_time:
data[self.field_name_selector(item)] = datetime.datetime.strftime(
getattr(obj, item.attname), self.datetime_format
getattr(obj, item.name), self.datetime_format
)
# date field resolver
for item in date_field:
data[self.field_name_selector(item)] = datetime.datetime.strftime(
getattr(obj, item.attname), self.date_format
getattr(obj, item.name), self.date_format
)
# foreign key resolver
for item in foreign_key:
Expand All @@ -185,12 +185,12 @@ def field_value_resolver(self, obj, depth: Optional[int] = None, **kwargs) -> di

# file field resolver
for item in file:
field_file = getattr(obj, item.attname)
field_file = getattr(obj, item.name)
data[self.field_name_selector(item)] = field_file.url

# image field resolver
for item in image:
field_image = getattr(obj, item.attname)
field_image = getattr(obj, item.name)
data[self.field_name_selector(item)] = field_image.url

# timedelta field resolver
Expand Down

0 comments on commit d713a01

Please sign in to comment.