feat; beeter subgroups

Author: remigermain

apps/accounts/serializers.py

@@ -6,8 +6,6 @@
 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,
@@ -30,6 +28,8 @@
 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,
@@ -253,10 +253,9 @@ class Meta:
 
 
 class PeopleGroupLightSerializer(
-    AutoTranslatedModelSerializer, serializers.ModelSerializer
+    ModulesSerializers, AutoTranslatedModelSerializer, serializers.ModelSerializer
 ):
     header_image = ImageSerializer(read_only=True)
-    members_count = serializers.SerializerMethodField()
     roles = serializers.SlugRelatedField(
         many=True,
         slug_field="name",
@@ -265,10 +264,6 @@ class PeopleGroupLightSerializer(
     )
     organization = serializers.SlugRelatedField(read_only=True, slug_field="code")
 
-    # TODO(remi): replace this by modules
-    def get_members_count(self, group: PeopleGroup) -> int:
-        return group.get_all_members().count()
-
     class Meta:
         model = PeopleGroup
         read_only_fields = ["organization", "is_root", "publication_status"]
@@ -280,12 +275,25 @@ class Meta:
             "short_description",
             "email",
             "header_image",
-            "members_count",
             "roles",
+            "modules",
         ]
 
+    def get_modules(self, people_group: PeopleGroup):
+        context = self.context
+        request = context.get("request")
+
+        modules_manager = people_group.get_related_module()
+        modules = modules_manager(people_group, request.user)
+
+        return {
+            "members": modules.members().count(),
+            "subgroups": modules.subgroups().count(),
+        }
+
 
 class PeopleGroupHierarchySerializer(
+    ModulesSerializers,
     AutoTranslatedModelSerializer,
     serializers.ModelSerializer,
 ):
@@ -308,13 +316,27 @@ class Meta:
             "header_image",
             "children",
             "roles",
+            "modules",
         ]
         fields = read_only_fields
 
+    def get_modules(self, people_group: PeopleGroup):
+        context = self.context
+        request = context.get("request")
+
+        modules_manager = people_group.get_related_module()
+        modules = modules_manager(people_group, request.user)
+
+        return {
+            "members": modules.members().count(),
+            "subgroups": modules.subgroups().count(),
+        }
+
     def get_children(self, people_group: PeopleGroup) -> list[dict[str, str | int]]:
         context = self.context
         request = context.get("request")
         mapping = context.get("mapping")
+
         if not mapping:
             base_queryset = request.user.get_people_group_queryset().filter(
                 organization=people_group.organization
@@ -432,7 +454,6 @@ class PeopleGroupSerializer(
         slug_field="code", queryset=Organization.objects.all()
     )
     hierarchy = serializers.SerializerMethodField()
-    # children = serializers.SerializerMethodField()
     parent = serializers.PrimaryKeyRelatedField(
         queryset=PeopleGroup.objects.all(),
         required=False,

apps/accounts/views.py

@@ -834,7 +834,7 @@ def similars(self, request, *args, **kwargs):
         queryset = modules.similars()
 
         queryset_page = self.paginate_queryset(queryset)
-        data = self.serializer_class(
+        data = PeopleGroupLightSerializer(
             queryset_page, many=True, context={"request": request}
         )
         return self.get_paginated_response(data.data)

apps/modules/base.py

@@ -10,21 +10,24 @@ def __init__(self, instance, /, user, **kw):
         self.instance = instance
         self.user = user
 
-    def count(self):
+    def _items(self):
         members = inspect.getmembers(
             self,
             predicate=inspect.ismethod,
         )
 
-        modules = {}
         for name, func in members:
             # ignore private_method and "count" method (this method :D)
             if name.startswith("_") or name in ("count",):
                 continue
 
+            yield name, func
+
+    def count(self):
+        modules = {}
+        for name, func in self._items():
             # func return queryset
             modules[name] = func().count()
-
         return modules