Skip to content

Commit

Permalink
patch: construct full url path for site and observation images (#1067)
Browse files Browse the repository at this point in the history
* patch: construct full url path for site and observation images

* patch: construct full url for site and observation images
  • Loading branch information
tinashechiraya authored Aug 2, 2024
1 parent 6f49351 commit dde4ad5
Showing 1 changed file with 21 additions and 8 deletions.
29 changes: 21 additions & 8 deletions django_project/monitor/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
Assessment,
Pest
)
from django.contrib.sites.models import Site


class ObservationsAllFieldsSerializer(serializers.ModelSerializer):
Expand Down Expand Up @@ -214,10 +215,16 @@ def get_collector_name(self, obj):
)

def get_images(self, obj: Observations):
"""Return images of site."""
return ObservationPestImageSerializer(
obj.observationpestimage_set.all().order_by('pest__name', '-id'), many=True
).data
"""Return images of observation with full URL paths."""
domain = Site.objects.get_current().domain
images = obj.observationpestimage_set.all().order_by('pest__name', '-id')
serialized_images = ObservationPestImageSerializer(images, many=True).data

for image in serialized_images:
if 'image' in image:
image['image'] = f'https://{domain}{image["image"]}'

return serialized_images

comment = serializers.CharField(allow_blank=True, default='')

Expand All @@ -236,10 +243,16 @@ class SitesAndObservationsSerializer(serializers.ModelSerializer):
images = serializers.SerializerMethodField()

def get_images(self, obj: Sites):
"""Return images of site."""
return SiteImageSerializer(
obj.siteimage_set.all(), many=True
).data
"""Return images of site with full URL paths."""
domain = Site.objects.get_current().domain
images = obj.siteimage_set.all()
serialized_images = SiteImageSerializer(images, many=True).data

for image in serialized_images:
if 'image' in image:
image['image'] = f'https://{domain}{image["image"]}'

return serialized_images

class Meta:
model = Sites
Expand Down

0 comments on commit dde4ad5

Please sign in to comment.