Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 14 additions & 0 deletions backend/apps/github/api/internal/nodes/user.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import strawberry_django

from apps.github.models.user import User
from apps.nest.api.internal.nodes.badge import BadgeNode


@strawberry_django.type(
Expand All @@ -27,6 +28,19 @@
class UserNode:
"""GitHub user node."""

@strawberry.field
def badges(self) -> list[BadgeNode]:
"""Return user badges."""
user_badges = (
self.user_badges.select_related("badge")
.filter(is_active=True)
.order_by(
"badge__weight",
"badge__name",
)
)
return [ub.badge for ub in user_badges]

@strawberry.field
def created_at(self) -> float:
"""Resolve created at."""
Expand Down
20 changes: 20 additions & 0 deletions backend/apps/nest/api/internal/nodes/badge.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
"""GraphQL node for Badge model."""

import strawberry
import strawberry_django

from apps.nest.models.badge import Badge


@strawberry_django.type(
Badge,
fields=[
"css_class",
"description",
"id",
"name",
"weight",
],
)
class BadgeNode(strawberry.relay.Node):
"""GraphQL node for Badge model."""
8 changes: 5 additions & 3 deletions backend/apps/nest/management/commands/nest_update_badges.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,10 @@ def update_owasp_staff_badge(self):
self.stdout.write(f"Created badge: {badge.name}")

# Assign badge to employees who don't have it.
employees_without_badge = User.objects.filter(is_owasp_staff=True).exclude(
badges__badge=badge
employees_without_badge = User.objects.filter(
is_owasp_staff=True,
).exclude(
user_badges__badge=badge,
)
count = employees_without_badge.count()

Expand All @@ -59,7 +61,7 @@ def update_owasp_staff_badge(self):
# Remove badge from non-OWASP employees.
non_employees = User.objects.filter(
is_owasp_staff=False,
badges__badge=badge,
user_badges__badge=badge,
).distinct()
removed_count = non_employees.count()

Expand Down
24 changes: 24 additions & 0 deletions backend/apps/nest/migrations/0005_alter_userbadge_user.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Generated by Django 5.2.5 on 2025-09-06 09:41

import django.db.models.deletion
from django.db import migrations, models


class Migration(migrations.Migration):
dependencies = [
("github", "0035_alter_user_bio_alter_user_is_owasp_staff"),
("nest", "0004_userbadge"),
]

operations = [
migrations.AlterField(
model_name="userbadge",
name="user",
field=models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
related_name="user_badges",
to="github.user",
verbose_name="User",
),
),
]
2 changes: 1 addition & 1 deletion backend/apps/nest/models/user_badge.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class Meta:
)
user = models.ForeignKey(
"github.User",
related_name="badges",
related_name="user_badges",
on_delete=models.CASCADE,
verbose_name="User",
)
Expand Down
44 changes: 43 additions & 1 deletion backend/tests/apps/github/api/internal/nodes/user_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ def test_meta_configuration(self):
field_names = {field.name for field in UserNode.__strawberry_definition__.fields}
expected_field_names = {
"avatar_url",
"badges",
"bio",
"company",
"contributions_count",
Expand All @@ -37,7 +38,8 @@ def test_meta_configuration(self):
"updated_at",
"url",
}
assert field_names == expected_field_names
missing = expected_field_names - field_names
assert not missing, f"Missing fields on UserNode: {sorted(missing)}"

def test_created_at_field(self):
"""Test created_at field resolution."""
Expand Down Expand Up @@ -78,3 +80,43 @@ def test_url_field(self):

result = UserNode.url(mock_user)
assert result == "https://github.com/testuser"

def test_badges_resolver_behavior(self):
"""Unit test verifies the badges method returns badges sorted by weight."""
badge_high = Mock()
badge_high.weight = 1
badge_high.name = "High Priority Badge"

badge_medium = Mock()
badge_medium.weight = 5
badge_medium.name = "Medium Priority Badge"

badge_low = Mock()
badge_low.weight = 10
badge_low.name = "Low Priority Badge"

user_badge_high = Mock()
user_badge_high.badge = badge_high

user_badge_medium = Mock()
user_badge_medium.badge = badge_medium

user_badge_low = Mock()
user_badge_low.badge = badge_low

sorted_user_badges = [user_badge_high, user_badge_medium, user_badge_low]

mock_user = Mock()
mock_queryset = Mock()
mock_queryset.filter.return_value.order_by.return_value = sorted_user_badges
mock_user.user_badges.select_related.return_value = mock_queryset

result = UserNode.badges(mock_user)

mock_user.user_badges.select_related.assert_called_once_with("badge")
mock_queryset.filter.assert_called_once_with(is_active=True)
mock_queryset.filter.return_value.order_by.assert_called_once_with(
"badge__weight", "badge__name"
)

assert result == [ub.badge for ub in sorted_user_badges]