From 40922843f860ae0ddeef8e120b991539db2f48d5 Mon Sep 17 00:00:00 2001
From: Ehouarn <ehouarn@crans.org>
Date: Fri, 18 Jul 2025 17:08:29 +0200
Subject: [PATCH] API again

---
 apps/api/urls.py         |  4 ++++
 apps/family/api/urls.py  |  8 ++++----
 apps/family/api/views.py | 16 ++++++++--------
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/apps/api/urls.py b/apps/api/urls.py
index c9e0dfa4..4452e4d7 100644
--- a/apps/api/urls.py
+++ b/apps/api/urls.py
@@ -19,6 +19,10 @@ if "activity" in settings.INSTALLED_APPS:
     from activity.api.urls import register_activity_urls
     register_activity_urls(router, 'activity')
 
+if "family" in settings.INSTALLED_APPS:
+    from family.api.urls import register_family_urls
+    register_family_urls(router, 'family')
+
 if "food" in settings.INSTALLED_APPS:
     from food.api.urls import register_food_urls
     register_food_urls(router, 'food')
diff --git a/apps/family/api/urls.py b/apps/family/api/urls.py
index 43c49500..b231ef99 100644
--- a/apps/family/api/urls.py
+++ b/apps/family/api/urls.py
@@ -8,7 +8,7 @@ def register_family_urls(router, path):
     """
     Configure router for Family REST API
     """
-    router.register(path + 'family', FamilyViewSet)
-    router.register(path + 'familymembership', FamilyMembershipViewSet)
-    router.register(path + 'challenge', ChallengeViewSet)
-    router.register(path + 'achievement', AchievementViewSet)
+    router.register(path + '/family', FamilyViewSet)
+    router.register(path + '/familymembership', FamilyMembershipViewSet)
+    router.register(path + '/challenge', ChallengeViewSet)
+    router.register(path + '/achievement', AchievementViewSet)
diff --git a/apps/family/api/views.py b/apps/family/api/views.py
index 0e228718..f2fe0208 100644
--- a/apps/family/api/views.py
+++ b/apps/family/api/views.py
@@ -15,11 +15,11 @@ class FamilyViewSet(ReadProtectedModelViewSet):
     The djangorestframework plugin will get all `Family` objects, serialize it to JSON with the given serializer,
     then render it on /api/family/family/
     """
-    queryset = Family.object.order_by('id')
+    queryset = Family.objects.order_by('id')
     serializer_class = FamilySerializer
     filter_backends = [DjangoFilterBackend, SearchFilter]
     filterset_fields = ['name', ]
-    search_fields = ['§name', ]
+    search_fields = ['$name', ]
 
 
 class FamilyMembershipViewSet(ReadProtectedModelViewSet):
@@ -28,11 +28,11 @@ class FamilyMembershipViewSet(ReadProtectedModelViewSet):
     The djangorestframework plugin will get all `FamilyMembership` objects, serialize it to JSON with the given serializer,
     then render it on /api/family/familymembership/
     """
-    queryset = FamilyMembership.object.order_by('id')
+    queryset = FamilyMembership.objects.order_by('id')
     serializer_class = FamilyMembershipSerializer
     filter_backends = [DjangoFilterBackend, SearchFilter]
     filterset_fields = ['name', ]
-    search_fields = ['§name', ]
+    search_fields = ['$name', ]
 
 
 class ChallengeViewSet(ReadProtectedModelViewSet):
@@ -41,11 +41,11 @@ class ChallengeViewSet(ReadProtectedModelViewSet):
     The djangorestframework plugin will get all `Challenge` objects, serialize it to JSON with the given serializer,
     then render it on /api/family/challenge/
     """
-    queryset = Challenge.object.order_by('id')
+    queryset = Challenge.objects.order_by('id')
     serializer_class = ChallengeSerializer
     filter_backends = [DjangoFilterBackend, SearchFilter]
     filterset_fields = ['name', ]
-    search_fields = ['§name', ]
+    search_fields = ['$name', ]
 
 
 class AchievementViewSet(ReadProtectedModelViewSet):
@@ -54,8 +54,8 @@ class AchievementViewSet(ReadProtectedModelViewSet):
     The djangorestframework plugin will get all `Achievement` objects, serialize it to JSON with the given serializer,
     then render it on /api/family/achievement/
     """
-    queryset = Achievement.object.order_by('id')
+    queryset = Achievement.objects.order_by('id')
     serializer_class = AchievementSerializer
     filter_backends = [DjangoFilterBackend, SearchFilter]
     filterset_fields = ['name', ]
-    search_fields = ['§name', ]
+    search_fields = ['$name', ]