fix locations

Author: remigermain

apps/accounts/serializers.py

@@ -237,10 +237,24 @@ def get_can_mentor_on(self, user: ProjectUser) -> list[dict]:
 
 
 class PeopleGroupLocationSerializer(BaseLocationSerializer):
+
     class Meta(BaseLocationSerializer.Meta):
         model = PeopleGroupLocation
 
 
+class PeopleGroupLocationRelated(serializers.RelatedField):
+    def get_queryset(self):
+        return PeopleGroupLocation.objects.all()
+
+    def to_representation(self, instance: PeopleGroupLocation) -> dict:
+        return PeopleGroupLocationSerializer(instance=instance).data
+
+    def to_internal_value(self, element: dict) -> PeopleGroupLocation:
+        if element.get("pk"):
+            return PeopleGroupLocation.objects.get(pk=element["pk"])
+        return PeopleGroupLocation(**element)
+
+
 class PeopleGroupSuperLightSerializer(
     AutoTranslatedModelSerializer, serializers.ModelSerializer
 ):
@@ -478,7 +492,7 @@ class PeopleGroupSerializer(
         child=serializers.IntegerField(min_value=1, max_value=17),
         required=False,
     )
-    location = PeopleGroupLocationSerializer()
+    location = PeopleGroupLocationRelated(required=False, allow_null=True)
 
     def get_hierarchy(self, obj: PeopleGroup) -> list[dict[str, str | int]]:
         request = self.context.get("request")
@@ -540,7 +554,11 @@ def validate_parent(self, value):
     def create(self, validated_data):
         team = validated_data.pop("team", {})
         featured_projects = validated_data.pop("featured_projects", [])
-        tags = validated_data.pop("tags", [])
+        location = validated_data.pop("location", {})
+
+        if location:
+            location.save()
+            validated_data["id"] = location
 
         people_group = super(PeopleGroupSerializer, self).create(validated_data)
         PeopleGroupAddTeamMembersSerializer().create(
@@ -549,23 +567,25 @@ def create(self, validated_data):
         PeopleGroupAddFeaturedProjectsSerializer().create(
             {"people_group": people_group, "featured_projects": featured_projects}
         )
-
-        people_group.tags.set(tags)
         return people_group
 
     def update(self, instance, validated_data):
         validated_data.pop("team", {})
         validated_data.pop("featured_projects", [])
-        tags = validated_data.pop("tags", [])
+        location = validated_data.pop("location")
+
+        if not location and getattr(instance, "location", None):
+            instance.location.delete()
+            validated_data["location"] = None
+        elif location:
+            location.save()
+            validated_data["location"] = location
+
         people_group = super(PeopleGroupSerializer, self).update(
             instance, validated_data
         )
-        people_group.tags.set(tags)
         return people_group
 
-    def save(self, **kwargs):
-        return super().save(**kwargs)
-
     class Meta:
         model = PeopleGroup
         read_only_fields = ["is_root", "slug", "modules"]

apps/projects/models.py

@@ -864,7 +864,6 @@ def duplicate(self, project: "Project") -> "Goal":
 
 class AbstractLocation(
     HasAutoTranslatedFields,
-    ProjectRelated,
     DuplicableModel,
     models.Model,
 ):
@@ -910,10 +909,6 @@ class Meta:
         default=LocationType.TEAM,
     )
 
-    def get_related_project(self) -> Optional["Project"]:
-        """Return the projects related to this model."""
-        return self.project
-
     def get_related_organizations(self) -> list["Organization"]:
         """Return the organizations related to this model."""
         return self.project.get_related_organizations()
@@ -924,7 +919,7 @@ def duplicate(self) -> Self:
         return copy
 
 
-class Location(AbstractLocation):
+class Location(ProjectRelated, AbstractLocation):
     """A project location on Earth.
 
     Attributes
@@ -939,6 +934,10 @@ class Location(AbstractLocation):
         Project, on_delete=models.CASCADE, related_name="locations"
     )
 
+    def get_related_project(self) -> Optional["Project"]:
+        """Return the projects related to this model."""
+        return self.project
+
     def duplicate(self, project: Project) -> "Location":
         copy = super().duplicate()
         copy.project = project