From ddab0aa542f5564d2b61d55cbca0ff45e23a76eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexa=20Valentov=C3=A1?= <git@imaniti.org>
Date: Mon, 4 Nov 2024 11:42:10 +0100
Subject: [PATCH] fix team imports
---
district/models.py | 6 +++++-
shared/people_import.py | 3 +++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/district/models.py b/district/models.py
index 578ef32a..601200c4 100644
--- a/district/models.py
+++ b/district/models.py
@@ -813,7 +813,11 @@ class DistrictPeoplePage(MainPeoplePageMixin):
if team["roles"] is None:
continue
- unique_teams[position]["roles"] = team["roles"].split(",")
+ unique_teams[position]["roles"] = (
+ team["roles"].split(",")
+ if team["roles"]
+ else None
+ )
return unique_teams
diff --git a/shared/people_import.py b/shared/people_import.py
index 7c7b64be..18239f75 100644
--- a/shared/people_import.py
+++ b/shared/people_import.py
@@ -38,6 +38,7 @@ class ImporterMixin:
"username": profile["person"]["username"],
"email": profile["email"],
"phone": profile["phone"],
+ "position": profile.get("position"),
"facebook_url": profile["facebookUrl"],
"flickr_url": profile["flickrUrl"],
"instagram_url": profile["instagramUrl"],
@@ -459,6 +460,8 @@ class PeopleTeamImporter(ImporterMixin):
key=lambda membership: int(membership.get("roleOrder", 0)),
reverse=True
):
+ print(self.team_roles, membership)
+
# Can't do this in the query (yet), so just filter here
if len(self.team_roles) != 0 and membership["roleDisplay"] not in self.team_roles:
--
GitLab