Feat(crisalid) add structure

apps/accounts/admin.py

@@ -16,7 +16,7 @@
 from services.keycloak.interface import KeycloakService
 
 from .exports import UserResource
-from .models import PeopleGroup, ProjectUser
+from .models import PeopleGroup, PeopleGroupLocation, ProjectUser
 from .utils import get_group_permissions
 
 
@@ -163,6 +163,12 @@ class PeopleGroupAdmin(TranslateObjectAdminMixin, admin.ModelAdmin):
     list_filter = ("organization",)
 
 
+@admin.register(PeopleGroupLocation)
+class PeopleGroupLocationAdmin(admin.ModelAdmin):
+    list_display = ("title", "description", "type")
+    search_fields = ("title", "description", "type")
+
+
 class PermissionAdmin(admin.ModelAdmin):
     list_display = ("name", "codename", "content_type")
     search_fields = ("name", "codename", "content_type__model")

apps/accounts/migrations/0003_peoplegroup_tags.py

@@ -0,0 +1,19 @@
+# Generated by Django 5.2.10 on 2026-01-21 06:35
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("accounts", "0002_initial"),
+        ("skills", "0001_initial"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="peoplegroup",
+            name="tags",
+            field=models.ManyToManyField(related_name="people_groups", to="skills.tag"),
+        ),
+    ]

apps/accounts/migrations/0004_peoplegrouplocation_peoplegroup_location.py

@@ -0,0 +1,88 @@
+# Generated by Django 5.2.10 on 2026-01-21 10:52
+
+import apps.commons.mixins
+import django.db.models.deletion
+import services.translator.mixins
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("accounts", "0003_peoplegroup_tags"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="PeopleGroupLocation",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("title", models.CharField(blank=True, max_length=255)),
+                ("description", models.TextField(blank=True)),
+                ("lat", models.FloatField()),
+                ("lng", models.FloatField()),
+                (
+                    "type",
+                    models.CharField(
+                        choices=[
+                            ("team", "Team"),
+                            ("impact", "Impact"),
+                            ("address", "Address"),
+                        ],
+                        default="team",
+                        max_length=10,
+                    ),
+                ),
+                (
+                    "title_detected_language",
+                    models.CharField(blank=True, max_length=10, null=True),
+                ),
+                ("title_en", models.CharField(blank=True, max_length=1020, null=True)),
+                ("title_fr", models.CharField(blank=True, max_length=1020, null=True)),
+                ("title_de", models.CharField(blank=True, max_length=1020, null=True)),
+                ("title_nl", models.CharField(blank=True, max_length=1020, null=True)),
+                ("title_et", models.CharField(blank=True, max_length=1020, null=True)),
+                ("title_ca", models.CharField(blank=True, max_length=1020, null=True)),
+                ("title_es", models.CharField(blank=True, max_length=1020, null=True)),
+                (
+                    "description_detected_language",
+                    models.CharField(blank=True, max_length=10, null=True),
+                ),
+                ("description_en", models.TextField(blank=True, null=True)),
+                ("description_fr", models.TextField(blank=True, null=True)),
+                ("description_de", models.TextField(blank=True, null=True)),
+                ("description_nl", models.TextField(blank=True, null=True)),
+                ("description_et", models.TextField(blank=True, null=True)),
+                ("description_ca", models.TextField(blank=True, null=True)),
+                ("description_es", models.TextField(blank=True, null=True)),
+            ],
+            options={
+                "abstract": False,
+            },
+            bases=(
+                services.translator.mixins.HasAutoTranslatedFields,
+                apps.commons.mixins.ProjectRelated,
+                apps.commons.mixins.DuplicableModel,
+                models.Model,
+            ),
+        ),
+        migrations.AddField(
+            model_name="peoplegroup",
+            name="location",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                related_name="people_groups",
+                to="accounts.peoplegrouplocation",
+            ),
+        ),
+    ]

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

@@ -2,7 +2,7 @@
 import uuid
 from datetime import date
 from functools import cached_property
-from typing import Any, List, Optional, Union
+from typing import Any, Optional
 
 from django.contrib.auth.models import AbstractUser, Group, Permission
 from django.contrib.contenttypes.models import ContentType
@@ -25,6 +25,8 @@
 )
 from apps.commons.enums import SDG, Language
 from apps.commons.mixins import (
+    HasEmbending,
+    HasModulesRelated,
     HasMultipleIDs,
     HasOwner,
     HasPermissionsSetup,
@@ -33,14 +35,20 @@
 from apps.commons.models import GroupData
 from apps.newsfeed.models import Event, Instruction, News
 from apps.organizations.models import Organization
-from apps.projects.models import Project
+from apps.projects.models import AbstractLocation, Project
 from services.keycloak.exceptions import RemoteKeycloakAccountNotFound
 from services.keycloak.interface import KeycloakService
 from services.keycloak.models import KeycloakAccount
 from services.translator.mixins import HasAutoTranslatedFields
 
 
+class PeopleGroupLocation(AbstractLocation):
+    """base location for group"""
+
+
 class PeopleGroup(
+    HasEmbending,
+    HasModulesRelated,
     HasAutoTranslatedFields,
     HasMultipleIDs,
     HasPermissionsSetup,
@@ -81,12 +89,12 @@ class PeopleGroup(
             The visibility setting of the group.
     """
 
-    _auto_translated_fields: List[str] = [
+    _auto_translated_fields: list[str] = [
         "name",
         "html:description",
         "short_description",
     ]
-    slugified_fields: List[str] = ["name"]
+    slugified_fields: list[str] = ["name"]
     slug_prefix: str = "group"
 
     class PublicationStatus(models.TextChoices):
@@ -144,6 +152,16 @@ class PublicationStatus(models.TextChoices):
     updated_at = models.DateTimeField(auto_now=True)
     permissions_up_to_date = models.BooleanField(default=False)
 
+    tags = models.ManyToManyField("skills.Tag", related_name="people_groups")
+    location = models.OneToOneField(
+        PeopleGroupLocation,
+        on_delete=models.SET_NULL,
+        null=True,
+        blank=True,
+        related_name="people_group",
+    )
+    # links
+
     def __str__(self) -> str:
         return str(self.name)
 
@@ -156,7 +174,7 @@ def get_id_field_name(cls, object_id: Any) -> str:
         except ValueError:
             return "slug"
 
-    def get_related_organizations(self) -> List["Organization"]:
+    def get_related_organizations(self) -> list["Organization"]:
         """Return the organizations related to this model."""
         return [self.organization] if self.organization else []
 
@@ -265,23 +283,23 @@ class ProjectUser(
     """
 
     organization_query_string: str = "groups__organizations"
-    _auto_translated_fields: List[str] = [
+    _auto_translated_fields: list[str] = [
         "html:description",
         "short_description",
         "job",
     ]
-    slugified_fields: List[str] = ["given_name", "family_name"]
+    slugified_fields: list[str] = ["given_name", "family_name"]
     slug_prefix: str = "user"
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        self._project_queryset: Optional[QuerySet["Project"]] = None
-        self._user_queryset: Optional[QuerySet["ProjectUser"]] = None
-        self._people_group_queryset: Optional[QuerySet["PeopleGroup"]] = None
-        self._news_queryset: Optional[QuerySet["News"]] = None
-        self._event_queryset: Optional[QuerySet["Event"]] = None
-        self._instruction_queryset: Optional[QuerySet["Instruction"]] = None
-        self._related_organizations: list["Organization"] = None
+        self._project_queryset: QuerySet[Project] | None = None
+        self._user_queryset: QuerySet[ProjectUser] | None = None
+        self._people_group_queryset: QuerySet[PeopleGroup] | None = None
+        self._news_queryset: QuerySet[News] | None = None
+        self._event_queryset: QuerySet[Event] | None = None
+        self._instruction_queryset: QuerySet[Instruction] | None = None
+        self._related_organizations: list[Organization] = None
 
     # AbstractUser unused fields
     username_validator = None
@@ -358,7 +376,7 @@ class Meta:
         permissions = (("get_user_by_email", "Can retrieve a user by email"),)
 
     @property
-    def keycloak_id(self) -> Optional[uuid.UUID]:
+    def keycloak_id(self) -> uuid.UUID | None:
         if hasattr(self, "keycloak_account"):
             return str(self.keycloak_account.keycloak_id)
         return None
@@ -384,7 +402,7 @@ def is_staff(self) -> bool:
         )
 
     @classmethod
-    def get_id_field_name(cls, object_id: Union[uuid.UUID, int, str]) -> str:
+    def get_id_field_name(cls, object_id: uuid.UUID | int | str) -> str:
         """Get the name of the field which contains the given ID."""
         try:
             uuid.UUID(object_id)
@@ -398,7 +416,7 @@ def get_id_field_name(cls, object_id: Union[uuid.UUID, int, str]) -> str:
 
     @classmethod
     def get_main_id(
-        cls, object_id: Union[uuid.UUID, int, str], returned_field: str = "id"
+        cls, object_id: uuid.UUID | int | str, returned_field: str = "id"
     ) -> Any:
         try:
             return super().get_main_id(object_id, returned_field)
@@ -470,7 +488,7 @@ def get_owner(self) -> "ProjectUser":
         """Get the owner of the object."""
         return self
 
-    def get_related_organizations(self) -> List["Organization"]:
+    def get_related_organizations(self) -> list["Organization"]:
         """Return the organizations related to this model."""
         if self._related_organizations is None:
             self._related_organizations = list(
@@ -678,7 +696,7 @@ def can_see_project(self, project: "Project") -> bool:
         """Whether the user can see the project."""
         return self.get_project_queryset().contains(project)
 
-    def get_permissions_representations(self) -> List[str]:
+    def get_permissions_representations(self) -> list[str]:
         """Return a list of the permissions representations."""
         groups_permissions = [
             get_group_permissions(group)
@@ -693,7 +711,7 @@ def get_permissions_representations(self) -> List[str]:
         ]
         return list(set(groups_permissions))
 
-    def get_instance_permissions_representations(self) -> List[str]:
+    def get_instance_permissions_representations(self) -> list[str]:
         """Return a list of the instance permissions representations."""
         groups = self.groups.exclude(
             projects=None, people_groups=None, organizations=None
@@ -967,7 +985,7 @@ def get_permissions_representations(self):
         """Return a list of the permissions representations."""
         return []
 
-    def get_related_organizations(self) -> List["Organization"]:
+    def get_related_organizations(self) -> list["Organization"]:
         """Return the organizations related to this model."""
         return []