Skip to content

Commit 4babd73

Browse files
authored
Merge branch 'main' into feature/integrate-graphql-codegen
2 parents bcf8d26 + 217ef1a commit 4babd73

22 files changed

+248
-163
lines changed

.coderabbit.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@ reviews:
99
assess_linked_issues: true
1010
auto_apply_labels: false
1111
auto_review:
12-
enabled: true
12+
base_branches:
13+
- feature/*
1314
drafts: true
15+
enabled: true
1416
collapse_walkthrough: false
1517
high_level_summary: true
1618
high_level_summary_in_walkthrough: true

backend/apps/github/api/internal/nodes/repository_contributor.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ class RepositoryContributorNode:
99

1010
avatar_url: str
1111
contributions_count: int
12+
id: strawberry.ID
1213
login: str
1314
name: str
1415
project_key: str

backend/apps/github/api/internal/queries/repository_contributor.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ def top_contributors(
5454
RepositoryContributorNode(
5555
avatar_url=tc["avatar_url"],
5656
contributions_count=tc["contributions_count"],
57+
id=tc["id"],
5758
login=tc["login"],
5859
name=tc["name"],
5960
project_key=tc.get("project_key"),

backend/apps/github/models/repository_contributor.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,7 @@ def get_top_contributors(
183183
"user__avatar_url",
184184
"user__login",
185185
"user__name",
186+
"id",
186187
)
187188
.annotate(
188189
total_contributions=Sum("contributions_count"),
@@ -194,6 +195,7 @@ def get_top_contributors(
194195
{
195196
"avatar_url": tc["user__avatar_url"],
196197
"contributions_count": tc["total_contributions"],
198+
"id": tc["id"],
197199
"login": tc["user__login"],
198200
"name": tc["user__name"],
199201
}

backend/poetry.lock

Lines changed: 133 additions & 146 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

backend/tests/apps/github/api/internal/queries/repository_contributor_test.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ def mock_contributor_data(self):
1717
{
1818
"avatar_url": "https://example.com/avatar1.jpg",
1919
"contributions_count": 50,
20+
"id": "1",
2021
"login": "alice",
2122
"name": "Alice Smith",
2223
"project_key": "www-project-test",
@@ -25,6 +26,7 @@ def mock_contributor_data(self):
2526
{
2627
"avatar_url": "https://example.com/avatar2.jpg",
2728
"contributions_count": 30,
29+
"id": "2",
2830
"login": "bob",
2931
"name": "Bob Jones",
3032
"project_key": None,
@@ -124,6 +126,7 @@ def test_top_contributors_node_creation(self, mock_get_top_contributors):
124126
{
125127
"avatar_url": "https://example.com/avatar.jpg",
126128
"contributions_count": 25,
129+
"id": "3",
127130
"login": "testuser",
128131
"name": "Test User",
129132
"project_key": "www-project-example",

backend/tests/apps/github/models/repository_contributor_test.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ def test_has_full_name_filter_valid_names(self):
100100
"user__avatar_url": MOCK_AVATAR_URL,
101101
"user__login": "testuser",
102102
"user__name": name,
103+
"id": "test-id",
103104
}
104105
]
105106

cspell/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"devDependencies": {
33
"@cspell/dict-aws": "^4.0.15",
44
"@cspell/dict-data-science": "^2.0.9",
5-
"@cspell/dict-en_us": "^4.4.17",
5+
"@cspell/dict-en_us": "^4.4.18",
66
"@cspell/dict-fullstack": "^3.2.7",
77
"@cspell/dict-golang": "^6.0.23",
88
"@cspell/dict-k8s": "^1.0.12",

cspell/pnpm-lock.yaml

Lines changed: 14 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

frontend/src/server/queries/apiKeyQueries.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ export const GET_API_KEYS = gql`
44
query GetApiKeys {
55
activeApiKeyCount
66
apiKeys {
7+
id
78
createdAt
89
expiresAt
910
isRevoked
@@ -17,6 +18,7 @@ export const CREATE_API_KEY = gql`
1718
mutation CreateApiKey($name: String!, $expiresAt: DateTime!) {
1819
createApiKey(name: $name, expiresAt: $expiresAt) {
1920
apiKey {
21+
id
2022
createdAt
2123
expiresAt
2224
isRevoked

0 commit comments

Comments
 (0)