Skip to content

🐛 [BUG] Fix missing Structures in APIv2 #4435

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

Draft
Chatewgne wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

🐛 [BUG] Fix missing Structures in APIv2 #4435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions docs/changelog.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@ CHANGELOG
- Fix typo in documentation
- Update and homogenize README.rst

**Bug fixes**

- Fix missing Structures in APIv2


2.111.0 (2024-12-05)
----------------------------

Expand Down
16 changes: 15 additions & 1 deletion geotrek/api/v2/filters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1106,13 +1106,27 @@ def filter_queryset(self, request, qs, view):
return (set_1 | set_2).distinct()


class RelatedPortalStructureOrReservationSystemFilter(RelatedObjectsPublishedNotDeletedByPortalFilter):
class RelatedPortalReservationSystemFilter(RelatedObjectsPublishedNotDeletedByPortalFilter):
def filter_queryset(self, request, qs, view):
set_1 = self.filter_queryset_related_objects_published_not_deleted_by_portal(qs, request, 'trek')
set_2 = self.filter_queryset_related_objects_published_not_deleted_by_portal(qs, request, 'touristiccontent')
return (set_1 | set_2).distinct()


class RelatedPortalStructureFilter(RelatedObjectsPublishedNotDeletedByPortalFilter):
def filter_queryset(self, request, qs, view):
set_1 = self.filter_queryset_related_objects_published_not_deleted_by_portal(qs, request, 'trek')
set_2 = self.filter_queryset_related_objects_published_not_deleted_by_portal(qs, request, 'touristiccontent')
set_3 = self.filter_queryset_related_objects_published_not_deleted_by_portal(qs, request, 'poi')
set_4 = self.filter_queryset_related_objects_published_not_deleted_by_portal(qs, request, 'service')
set_5 = self.filter_queryset_related_objects_published_not_deleted_by_portal(qs, request, 'infrastructure')
set_6 = self.filter_queryset_related_objects_published_not_deleted_by_portal(qs, request, 'signage')
set_7 = self.filter_queryset_related_objects_published_not_deleted_by_portal(qs, request, 'touristicevent')
set_8 = self.filter_queryset_related_objects_published_not_deleted_by_portal(qs, request, 'site')
set_9 = self.filter_queryset_related_objects_published_not_deleted_by_portal(qs, request, 'course')
return (set_1 | set_2 | set_3 | set_4 | set_5 | set_6 | set_7 | set_8 | set_9).distinct()


class TouristicContentRelatedPortalFilter(RelatedObjectsPublishedNotDeletedByPortalFilter):
def filter_queryset(self, request, qs, view):
return self.filter_queryset_related_objects_published_not_deleted_by_portal(qs, request, 'contents')
Expand Down
2 changes: 1 addition & 1 deletion geotrek/api/v2/views/authent.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@


class StructureViewSet(api_viewsets.GeotrekViewSet):
filter_backends = api_viewsets.GeotrekViewSet.filter_backends + (api_filters.RelatedPortalStructureOrReservationSystemFilter,)
filter_backends = api_viewsets.GeotrekViewSet.filter_backends + (api_filters.RelatedPortalStructureFilter,)
serializer_class = api_serializers.StructureSerializer
queryset = authent_models.Structure.objects.all()

Expand Down
2 changes: 1 addition & 1 deletion geotrek/api/v2/views/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ def retrieve(self, request, pk=None, format=None):


class ReservationSystemViewSet(api_viewsets.GeotrekViewSet):
filter_backends = api_viewsets.GeotrekViewSet.filter_backends + (api_filters.RelatedPortalStructureOrReservationSystemFilter,)
filter_backends = api_viewsets.GeotrekViewSet.filter_backends + (api_filters.RelatedPortalReservationSystemFilter,)
serializer_class = api_serializers.ReservationSystemSerializer
queryset = common_models.ReservationSystem.objects.all()

Expand Down
Loading