Skip to content
Merged
Show file tree
Hide file tree
Changes from 11 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
15 changes: 15 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 @@ -28,6 +29,20 @@ 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."""
return self.idx_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."""
3 changes: 2 additions & 1 deletion backend/apps/nest/api/internal/queries/__init__.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import strawberry

from apps.nest.api.internal.queries.api_key import ApiKeyQueries
from apps.nest.api.internal.queries.badge import BadgeQueries


@strawberry.type
class NestQuery(ApiKeyQueries):
class NestQuery(ApiKeyQueries, BadgeQueries):
"""Nest query."""
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
28 changes: 26 additions & 2 deletions backend/tests/apps/github/api/internal/nodes/user_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,12 @@ def test_user_node_inheritance(self):

def test_meta_configuration(self):
"""Test if Meta is properly configured."""
field_names = {field.name for field in UserNode.__strawberry_definition__.fields}
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 +40,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 +82,23 @@ def test_url_field(self):

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

def test_badges_resolution_orders_and_filters_active(self):
"""Badges resolution should filter active and order by badge weight/name."""

user = Mock()
user_badge_qs = Mock()
user.user_badges.select_related.return_value = user_badge_qs

ordered_qs = Mock()
ub1 = Mock()
ub1.badge = Mock()
user_badge_qs.filter.return_value = ordered_qs
ordered_qs.order_by.return_value = [ub1]

result = UserNode.badges(user)

user.user_badges.select_related.assert_called_once_with("badge")
user_badge_qs.filter.assert_called_once_with(is_active=True)
ordered_qs.order_by.assert_called_once_with("badge__weight", "badge__name")
assert result == [ub1.badge]
Loading