Merge pull request #212 from Mosquito-Alert/add_photos_in_report_endpoint

Added photos in Report endpoint

Author: epou

tigaserver_app/serializers.py

@@ -168,7 +168,10 @@ class Meta:
         model = ReportResponse
         fields = ['question', 'answer', 'question_id', 'answer_id', 'answer_value']
 
-
+class DetailedPhotoSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Photo
+        fields = ['id', 'photo', 'uuid']
 class ReportSerializer(AutoTimeZoneOrInstantUploadSerializerMixin, serializers.ModelSerializer):
 
     # For AutoTimeZoneOrInstantUploadSerializerMixin
@@ -199,6 +202,7 @@ class ReportSerializer(AutoTimeZoneOrInstantUploadSerializerMixin, serializers.M
     app_language = serializers.CharField(required=False)
     responses = ReportResponseSerializer(many=True)
     session = SessionListingField
+    photos = DetailedPhotoSerializer(many=True, read_only=True)
 
     def _get_dict_applied_tz(self, data: OrderedDict, *args, **kwargs) -> OrderedDict:
         data_result = super()._get_dict_applied_tz(data=data, *args, **kwargs)
@@ -314,10 +318,6 @@ class Meta:
         model = Configuration
         fields = '__all__'
 
-class DetailedPhotoSerializer(serializers.ModelSerializer):
-    class Meta:
-        model = Photo
-        fields = ['id', 'photo', 'uuid']
 
 class NearbyReportSerializer(serializers.ModelSerializer):
     user = UserListingField

tigaserver_app/views.py

@@ -283,7 +283,7 @@ class ReportViewSet(ReadWriteOnlyModelViewSet):
 * report_id: The 4-digit report ID.
 * type: The report type (adult, site, or mission).
     """
-    queryset = Report.objects.all().prefetch_related("responses")
+    queryset = Report.objects.all().prefetch_related("responses", "photos")
     serializer_class = ReportSerializer
     filter_fields = ('user', 'version_number', 'report_id', 'type')