fix:groups maps

Author: remigermain

apps/accounts/migrations/0005_alter_peoplegroup_location.py

@@ -0,0 +1,25 @@
+# Generated by Django 5.2.10 on 2026-02-02 16:10
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("accounts", "0004_peoplegrouplocation_peoplegroup_location"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="peoplegroup",
+            name="location",
+            field=models.OneToOneField(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                related_name="people_group",
+                to="accounts.peoplegrouplocation",
+            ),
+        ),
+    ]

apps/accounts/models.py

@@ -153,12 +153,12 @@ class PublicationStatus(models.TextChoices):
     permissions_up_to_date = models.BooleanField(default=False)
 
     tags = models.ManyToManyField("skills.Tag", related_name="people_groups")
-    location = models.ForeignKey(
+    location = models.OneToOneField(
         PeopleGroupLocation,
         on_delete=models.SET_NULL,
         null=True,
         blank=True,
-        related_name="people_groups",
+        related_name="people_group",
     )
     # links
 

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, TagRelatedField
+from services.crisalid.serializers import ResearcherSerializerLight
+from services.translator.serializers import AutoTranslatedModelSerializer
 
 from .exceptions import (
     FeaturedProjectPermissionDeniedError,
@@ -248,7 +248,7 @@ class PeopleGroupSuperLightSerializer(
 
     class Meta:
         model = PeopleGroup
-        read_only_fields = ["id", "slug", "name", "organization"]
+        read_only_fields = ["id", "slug", "name", "short_description", "organization"]
         fields = read_only_fields
 
 
@@ -590,6 +590,16 @@ class Meta:
         ]
 
 
+class LocationPeopleGroupSerializer(
+    AutoTranslatedModelSerializer, serializers.ModelSerializer
+):
+    group = PeopleGroupSuperLightSerializer(source="people_group", read_only=True)
+
+    class Meta:
+        model = PeopleGroupLocation
+        fields = "__all__"
+
+
 @extend_schema_serializer(exclude_fields=("roles",))
 class UserSerializer(
     StringsImagesSerializer, AutoTranslatedModelSerializer, serializers.ModelSerializer

apps/accounts/views.py

@@ -25,31 +25,15 @@
 from rest_framework.decorators import action
 from rest_framework.filters import OrderingFilter
 from rest_framework.parsers import JSONParser
-from rest_framework.permissions import (
-    IsAuthenticated,
-    IsAuthenticatedOrReadOnly,
-)
+from rest_framework.permissions import IsAuthenticated, IsAuthenticatedOrReadOnly
 from rest_framework.response import Response
 from rest_framework.serializers import BooleanField
 from rest_framework.views import APIView
-from services.google.models import GoogleAccount, GoogleGroup
-from services.google.tasks import (
-    create_google_account,
-    create_google_group,
-    suspend_google_account,
-    update_google_account,
-    update_google_group,
-)
-from services.keycloak.exceptions import KeycloakAccountNotFound
-from services.keycloak.interface import KeycloakService
 
 from apps.commons.filters import UnaccentSearchFilter
 from apps.commons.models import GroupData
 from apps.commons.permissions import IsOwner, ReadOnly, WillBeOwner
-from apps.commons.serializers import (
-    EmailAddressSerializer,
-    RetrieveUpdateModelViewSet,
-)
+from apps.commons.serializers import EmailAddressSerializer, RetrieveUpdateModelViewSet
 from apps.commons.utils import map_action_to_permission
 from apps.commons.views import DetailOnlyViewsetMixin, MultipleIDViewsetMixin
 from apps.files.models import Image
@@ -58,6 +42,16 @@
 from apps.organizations.permissions import HasOrganizationPermission
 from apps.projects.serializers import LocationSerializer, ProjectLightSerializer
 from apps.skills.models import Skill
+from services.google.models import GoogleAccount, GoogleGroup
+from services.google.tasks import (
+    create_google_account,
+    create_google_group,
+    suspend_google_account,
+    update_google_account,
+    update_google_group,
+)
+from services.keycloak.exceptions import KeycloakAccountNotFound
+from services.keycloak.interface import KeycloakService
 
 from .exceptions import EmailTypeMissingError, PermissionNotFoundError
 from .filters import PeopleGroupFilter, UserFilter

apps/modules/group.py

@@ -4,7 +4,7 @@
 
 from apps.accounts.models import PeopleGroup, ProjectUser
 from apps.modules.base import AbstractModules, register_module
-from apps.projects.models import Project
+from apps.projects.models import Location, Project
 from apps.skills.models import Skill
 from services.crisalid.models import Document, DocumentTypeCentralized
 
@@ -67,6 +67,9 @@ def similars(self) -> QuerySet[PeopleGroup]:
     def subgroups(self) -> QuerySet[PeopleGroup]:
         return self.instance.children.all()
 
+    def locations(self) -> QuerySet[Location]:
+        return Location.objects.filter(project__in=self.featured_projects())
+
     @cached_property
     def _is_structure(self):
         try:

apps/projects/urls.py

@@ -1,7 +1,7 @@
 from rest_framework.routers import DefaultRouter
 
 from apps.announcements.views import AnnouncementViewSet
-from apps.commons.urls import project_router_register
+from apps.commons.urls import organization_router_register, project_router_register
 from apps.feedbacks.views import (
     CommentImagesView,
     CommentViewSet,
@@ -12,6 +12,7 @@
 from .views import (
     BlogEntryImagesView,
     BlogEntryViewSet,
+    GeneralLocationView,
     GoalViewSet,
     HistoricalProjectViewSet,
     LinkedProjectViewSet,
@@ -25,11 +26,13 @@
     ProjectTabItemViewset,
     ProjectTabViewset,
     ProjectViewSet,
-    ReadLocationViewSet,
 )
 
 router = DefaultRouter()
-router.register(r"location", ReadLocationViewSet, basename="Read-location")
+
+organization_router_register(
+    router, r"location", GeneralLocationView, basename="General-location"
+)
 router.register(r"project", ProjectViewSet, basename="Project")
 
 project_router_register(

apps/projects/views.py

@@ -17,7 +17,9 @@
 from rest_framework.response import Response
 from simple_history.utils import update_change_reason
 
+from apps.accounts.models import PeopleGroupLocation
 from apps.accounts.permissions import HasBasePermission
+from apps.accounts.serializers import LocationPeopleGroupSerializer
 from apps.analytics.models import Stat
 from apps.commons.cache import clear_cache_with_key, redis_cache_view
 from apps.commons.permissions import IsOwner, ReadOnly
@@ -43,7 +45,7 @@
 )
 from services.mistral.models import ProjectEmbedding
 
-from .filters import LocationFilter, ProjectFilter
+from .filters import ProjectFilter
 from .models import (
     BlogEntry,
     Goal,
@@ -612,11 +614,6 @@ def dispatch(self, request, *args, **kwargs):
         return super(LocationViewSet, self).dispatch(request, *args, **kwargs)
 
 
-class ReadLocationViewSet(LocationViewSet):
-    http_method_names = ["get", "list"]
-    filterset_class = LocationFilter
-
-
 class HistoricalProjectViewSet(MultipleIDViewsetMixin, viewsets.ReadOnlyModelViewSet):
     lookup_field = "pk"
     permission_classes = [ReadOnly]
@@ -1004,3 +1001,22 @@ def add_image_to_model(self, image, *args, **kwargs):
                 tab_item.save()
             return f"/v1/project/{self.kwargs['project_id']}/tab/{self.kwargs['tab_id']}/item-image/{image.id}"
         return None
+
+
+class GeneralLocationView(viewsets.GenericViewSet):
+    http_method_names = ["get", "list"]
+
+    def list(self, request, *args, **kwargs):
+        qs_project = self.request.user.get_project_related_queryset(
+            Location.objects
+        ).select_related("project")
+
+        qs_group = self.request.user.get_people_group_related_queryset(
+            PeopleGroupLocation.objects
+        ).select_related("people_group")
+
+        data = {
+            "groups": LocationPeopleGroupSerializer(qs_group, many=True).data,
+            "projects": LocationSerializer(qs_project, many=True).data,
+        }
+        return Response(data, status=status.HTTP_200_OK)