Skip to content

Commit 588f58c

Browse files
committed
Update code
1 parent 35230d4 commit 588f58c

File tree

7 files changed

+12
-16
lines changed

7 files changed

+12
-16
lines changed

backend/apps/github/graphql/nodes/user.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import graphene
44

55
from apps.common.graphql.nodes import BaseNode
6-
from apps.github.graphql.nodes.organization import OrganizationNode
76
from apps.github.models.user import User
87

98

@@ -19,7 +18,6 @@ class UserNode(BaseNode):
1918

2019
created_at = graphene.Float()
2120
issues_count = graphene.Int()
22-
organization = graphene.Field(OrganizationNode)
2321
releases_count = graphene.Int()
2422
updated_at = graphene.Float()
2523
url = graphene.String()
@@ -48,10 +46,6 @@ def resolve_issues_count(self, info):
4846
"""Resolve issues count."""
4947
return self.idx_issues_count
5048

51-
def resolve_organization(self, info):
52-
"""Resolve organization."""
53-
return self.organization
54-
5549
def resolve_releases_count(self, info):
5650
"""Resolve releases count."""
5751
return self.idx_releases_count

backend/apps/github/graphql/queries/repository.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ class RepositoryQuery(BaseQuery):
2222
limit=graphene.Int(default_value=12),
2323
)
2424

25-
def resolve_repository(root, info, repository_key, organization_key):
25+
def resolve_repository(root, info, organization_key, repository_key):
2626
"""Resolve repository by key.
2727
2828
Args:
2929
root (Any): The root query object.
3030
info (ResolveInfo): The GraphQL execution context.
31-
repository_key (str): The unique key of the repository.
3231
organization_key (str): The login of the organization.
32+
repository_key (str): The unique key of the repository.
3333
3434
Returns:
3535
Repository or None: The repository object if found, otherwise None.

backend/tests/apps/github/graphql/nodes/user_test.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ def test_meta_configuration(self):
2828
"location",
2929
"login",
3030
"name",
31-
"organization",
3231
"public_repositories_count",
3332
"releases_count",
3433
"updated_at",

backend/tests/apps/github/graphql/queries/repository_test.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,17 @@ def test_resolve_repository_existing(self, mock_repository, mock_info):
3131
return_value=mock_queryset,
3232
) as mock_select_related:
3333
result = RepositoryQuery.resolve_repository(
34-
None, mock_info, repository_key="test-repo", organization_key="test-org"
34+
None,
35+
mock_info,
36+
organization_key="test-org",
37+
repository_key="test-repo",
3538
)
3639

3740
assert result == mock_repository
3841
mock_select_related.assert_called_once_with("organization")
3942
mock_queryset.get.assert_called_once_with(
40-
key__iexact="test-repo",
4143
organization__login__iexact="test-org",
44+
key__iexact="test-repo",
4245
)
4346

4447
def test_resolve_repository_not_found(self, mock_info):
@@ -53,13 +56,13 @@ def test_resolve_repository_not_found(self, mock_info):
5356
result = RepositoryQuery.resolve_repository(
5457
None,
5558
mock_info,
56-
repository_key="non-existent-repo",
5759
organization_key="non-existent-org",
60+
repository_key="non-existent-repo",
5861
)
5962

6063
assert result is None
6164
mock_select_related.assert_called_once_with("organization")
6265
mock_queryset.get.assert_called_once_with(
63-
key__iexact="non-existent-repo",
6466
organization__login__iexact="non-existent-org",
67+
key__iexact="non-existent-repo",
6568
)

frontend/src/components/RecentIssues.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ const RecentIssues: React.FC<RecentIssuesProps> = ({ data, showAvatar = true })
2929
<FontAwesomeIcon icon={faFileCode} className="ml-4 mr-2 h-4 w-4" />
3030
<Link
3131
className="text-gray-600 hover:underline dark:text-gray-400"
32-
href={`/repositories/${item?.repositoryName ? item.repositoryName.toLowerCase() : ''}`}
32+
href={`/repositories/${item?.repositoryName ? item.repositoryName : ''}`}
3333
>
3434
<span>{item.repositoryName}</span>
3535
</Link>{' '}

frontend/src/components/RecentPullRequests.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ const RecentPullRequests: React.FC<RecentPullRequestsProps> = ({ data, showAvata
3131
<FontAwesomeIcon icon={faFileCode} className="ml-4 mr-2 h-4 w-4" />
3232
<Link
3333
className="text-gray-600 hover:underline dark:text-gray-400"
34-
href={`/repositories/${item?.repositoryName ? item.repositoryName.toLowerCase() : ''}`}
34+
href={`/repositories/${item?.repositoryName ? item.repositoryName : ''}`}
3535
>
3636
<span>{item.repositoryName}</span>
3737
</Link>{' '}

frontend/src/components/RecentReleases.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ const RecentReleases: React.FC<RecentReleasesProps> = ({
7171
<FontAwesomeIcon icon={faFileCode} className="ml-4 mr-2 h-4 w-4" />
7272
<Link
7373
className="text-gray-600 hover:underline dark:text-gray-400"
74-
href={`/repositories/${item?.repositoryName ? item.repositoryName.toLowerCase() : ''}`}
74+
href={`/repositories/${item?.repositoryName ? item.repositoryName : ''}`}
7575
>
7676
<span>{item.repositoryName}</span>
7777
</Link>

0 commit comments

Comments
 (0)