Skip to content

Return the first org if lead org doesn't exist #5697

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tomodwyer merged 2 commits into from
Mar 20, 2026
Merged

Return the first org if lead org doesn't exist #5697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9dd5bf7
Return the first org if lead org doesn't exist
tomodwyer Mar 16, 2026
e369b08
Reduce queries to check for lead org
tomodwyer Mar 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion jobserver/models/project.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,10 @@ def title(self):

@functional.cached_property
def org(self):
return self.orgs.filter(collaborations__is_lead=True).first()
collaboration = (
self.collaborations.select_related("org").order_by("-is_lead", "pk").first()
)
return collaboration.org if collaboration else None

@classmethod
def next_project_identifier(cls):
Expand Down
10 changes: 10 additions & 0 deletions tests/unit/jobserver/models/test_project.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,16 @@ def test_project_org():
assert project.org == lead_org


def test_project_org_returns_first_org_when_no_lead():
project = ProjectFactory()
first_org = OrgFactory()
second_org = OrgFactory()
ProjectCollaborationFactory(org=first_org, project=project, is_lead=False)
ProjectCollaborationFactory(org=second_org, project=project, is_lead=False)

assert project.org == first_org


def test_next_project_identifier():
ProjectFactory(number="100")
ProjectFactory(number="102")
Expand Down
Loading