feat: subgroups in modules

Author: remigermain

apps/accounts/serializers.py

@@ -6,6 +6,8 @@
 from django.shortcuts import get_object_or_404
 from drf_spectacular.utils import extend_schema_serializer
 from rest_framework import serializers
+from services.crisalid.serializers import ResearcherSerializerLight
+from services.translator.serializers import AutoTranslatedModelSerializer
 
 from apps.commons.fields import (
     HiddenPrimaryKeyRelatedField,
@@ -28,8 +30,6 @@
 from apps.projects.models import Project
 from apps.skills.models import Skill
 from apps.skills.serializers import SkillLightSerializer, TagSerializer
-from services.crisalid.serializers import ResearcherSerializerLight
-from services.translator.serializers import AutoTranslatedModelSerializer
 
 from .exceptions import (
     FeaturedProjectPermissionDeniedError,
@@ -432,7 +432,7 @@ class PeopleGroupSerializer(
         slug_field="code", queryset=Organization.objects.all()
     )
     hierarchy = serializers.SerializerMethodField()
-    children = serializers.SerializerMethodField()
+    # children = serializers.SerializerMethodField()
     parent = serializers.PrimaryKeyRelatedField(
         queryset=PeopleGroup.objects.all(),
         required=False,
@@ -466,19 +466,6 @@ def get_hierarchy(self, obj: PeopleGroup) -> list[dict[str, str | int]]:
                 )
         return [{"order": i, **h} for i, h in enumerate(hierarchy[::-1])]
 
-    def get_children(self, obj: PeopleGroup) -> list[dict[str, str | int]]:
-        request = self.context.get("request")
-        queryset = (
-            request.user.get_people_group_queryset()
-            .select_related("organization")
-            .filter(parent=obj)
-            .order_by("name")
-            .distinct()
-        )
-        return PeopleGroupSuperLightSerializer(
-            queryset, many=True, context=self.context
-        ).data
-
     def validate_featured_projects(self, projects: list[Project]) -> list[Project]:
         request = self.context.get("request")
         if not all(request.user.can_see_project(project) for project in projects):
@@ -556,7 +543,6 @@ class Meta:
             "parent",
             "organization",
             "hierarchy",
-            "children",
             "header_image",
             "logo_image",
             "roles",

apps/accounts/views.py

@@ -803,15 +803,35 @@ def hierarchy(self, request, *args, **kwargs):
             status=status.HTTP_200_OK,
         )
 
+    @action(
+        detail=True,
+        methods=["GET"],
+        url_path="subgroups",
+        permission_classes=[ReadOnly],
+    )
+    def subgroups(self, request, *args, **kwargs):
+        group = self.get_object()
+        modules_manager = group.get_related_module()
+        modules = modules_manager(group, request.user)
+        queryset = modules.subgroups()
+
+        queryset_page = self.paginate_queryset(queryset)
+        data = self.serializer_class(
+            queryset_page, many=True, context={"request": request}
+        )
+        return self.get_paginated_response(data.data)
+
     @action(
         detail=True,
         methods=["GET"],
         url_path="similars",
         permission_classes=[ReadOnly],
     )
     def similars(self, request, *args, **kwargs):
-        obj: PeopleGroup = self.get_object()
-        queryset = obj.similars()
+        group = self.get_object()
+        modules_manager = group.get_related_module()
+        modules = modules_manager(group, request.user)
+        queryset = modules.similars()
 
         queryset_page = self.paginate_queryset(queryset)
         data = self.serializer_class(

apps/modules/group.py

@@ -11,6 +11,8 @@
 
 @register_module(PeopleGroup)
 class PeopleGroupModules(AbstractModules):
+    instance: PeopleGroup
+
     def members(self) -> QuerySet[ProjectUser]:
         managers_ids = self.instance.managers.all().values_list("id", flat=True)
         leaders_ids = self.instance.leaders.all().values_list("id", flat=True)
@@ -62,6 +64,9 @@ def featured_projects(self) -> QuerySet[Project]:
     def similars(self) -> QuerySet[PeopleGroup]:
         return self.instance.similars()
 
+    def subgroups(self) -> QuerySet[PeopleGroup]:
+        return self.instance.children.all()
+
     @cached_property
     def _is_structure(self):
         try: