Skip to content
This repository was archived by the owner on Jun 13, 2025. It is now read-only.

Commit a4d04bc

Browse files
chore: Cleanup unused graphql fields - coverageAnalytics (#843)
1 parent c24ddc5 commit a4d04bc

File tree

4 files changed

+26
-203
lines changed

4 files changed

+26
-203
lines changed

graphql_api/tests/test_repository.py

Lines changed: 24 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,6 @@
5252

5353
default_fields = """
5454
name
55-
coverage
56-
coverageSha
57-
hits
58-
misses
59-
lines
6055
active
6156
private
6257
updatedAt
@@ -116,16 +111,22 @@ def test_when_repository_has_no_coverage(self):
116111
repository_id=repo.repoid, token_type="profiling"
117112
).key
118113
graphToken = repo.image_token
119-
assert self.fetch_repository(repo.name) == {
114+
assert self.fetch_repository(
115+
repo.name,
116+
default_fields
117+
+ "coverageAnalytics { percentCovered commitSha hits misses lines },",
118+
) == {
120119
"__typename": "Repository",
121120
"name": "a",
122121
"active": True,
123122
"private": True,
124-
"coverage": None,
125-
"coverageSha": None,
126-
"hits": None,
127-
"misses": None,
128-
"lines": None,
123+
"coverageAnalytics": {
124+
"percentCovered": None,
125+
"commitSha": None,
126+
"hits": None,
127+
"misses": None,
128+
"lines": None,
129+
},
129130
"latestCommitAt": None,
130131
"oldestCommitAt": None,
131132
"updatedAt": "2021-01-01T00:00:00+00:00",
@@ -174,18 +175,24 @@ def test_when_repository_has_coverage(self):
174175
repository_id=repo.repoid, token_type="profiling"
175176
).key
176177
graphToken = repo.image_token
177-
assert self.fetch_repository(repo.name) == {
178+
assert self.fetch_repository(
179+
repo.name,
180+
default_fields
181+
+ "coverageAnalytics { percentCovered commitSha hits misses lines },",
182+
) == {
178183
"__typename": "Repository",
179184
"name": "b",
180185
"active": True,
181186
"latestCommitAt": None,
182187
"oldestCommitAt": "2020-12-31T23:00:00", # hour ago
183188
"private": True,
184-
"coverage": 75,
185-
"coverageSha": coverage_commit.commitid,
186-
"hits": 30,
187-
"misses": 10,
188-
"lines": 40,
189+
"coverageAnalytics": {
190+
"percentCovered": 75,
191+
"commitSha": coverage_commit.commitid,
192+
"hits": 30,
193+
"misses": 10,
194+
"lines": 40,
195+
},
189196
"updatedAt": "2021-01-01T00:00:00+00:00",
190197
"uploadToken": repo.upload_token,
191198
"defaultBranch": "master",

graphql_api/tests/test_repository_measurements.py

Lines changed: 0 additions & 116 deletions
This file was deleted.

graphql_api/types/repository/repository.graphql

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,6 @@ type Repository {
77
active: Boolean!
88
activated: Boolean!
99
private: Boolean!
10-
# coverage to be removed with #2282
11-
coverage: Float
12-
# coverageSha to be removed with #2282
13-
coverageSha: String
14-
# hits to be removed with #2282
15-
hits: Int
16-
# misses to be removed with #2282
17-
misses: Int
18-
# lines to be removed with #2282
19-
lines: Int
2010
oldestCommitAt: DateTime
2111
latestCommitAt: DateTime
2212
updatedAt: DateTime
@@ -67,13 +57,6 @@ type Repository {
6757
componentsMeasurementsActive: Boolean!
6858
componentsMeasurementsBackfilled: Boolean!
6959
componentsCount: Int!
70-
# (coverage) measurements to be removed with #2282
71-
measurements(
72-
interval: MeasurementInterval!
73-
after: DateTime
74-
before: DateTime
75-
branch: String
76-
): [Measurement!]!
7760
repositoryConfig: RepositoryConfig
7861
staticAnalysisToken: String
7962
isATSConfigured: Boolean

graphql_api/types/repository/repository.py

Lines changed: 2 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import logging
22
from datetime import datetime
3-
from typing import Iterable, List, Mapping, Optional
3+
from typing import List, Mapping, Optional
44

55
import shared.rate_limits as rate_limits
66
import yaml
@@ -10,7 +10,6 @@
1010
from graphql.type.definition import GraphQLResolveInfo
1111
from shared.yaml import UserYaml
1212

13-
import timeseries.helpers as timeseries_helpers
1413
from codecov.db import sync_to_async
1514
from codecov_auth.models import SERVICE_GITHUB, SERVICE_GITHUB_ENTERPRISE
1615
from core.models import Branch, Repository
@@ -35,8 +34,7 @@
3534
from services.components import ComponentMeasurements
3635
from services.profiling import CriticalFile, ProfilingSummary
3736
from services.redis_configuration import get_redis_connection
38-
from timeseries.helpers import fill_sparse_measurements
39-
from timeseries.models import Dataset, Interval, MeasurementName, MeasurementSummary
37+
from timeseries.models import Dataset, Interval, MeasurementName
4038
from utils.test_results import aggregate_test_results
4139

4240
log = logging.getLogger(__name__)
@@ -62,31 +60,6 @@ def resolve_oldest_commit_at(
6260
return None
6361

6462

65-
@repository_bindable.field("coverage")
66-
def resolve_coverage(repository: Repository, info: GraphQLResolveInfo):
67-
return repository.recent_coverage
68-
69-
70-
@repository_bindable.field("coverageSha")
71-
def resolve_coverage_sha(repository: Repository, info: GraphQLResolveInfo):
72-
return repository.coverage_sha
73-
74-
75-
@repository_bindable.field("hits")
76-
def resolve_hits(repository: Repository, info: GraphQLResolveInfo) -> Optional[int]:
77-
return repository.hits
78-
79-
80-
@repository_bindable.field("misses")
81-
def resolve_misses(repository: Repository, info: GraphQLResolveInfo) -> Optional[int]:
82-
return repository.misses
83-
84-
85-
@repository_bindable.field("lines")
86-
def resolve_lines(repository: Repository, info: GraphQLResolveInfo) -> Optional[int]:
87-
return repository.lines
88-
89-
9063
@repository_bindable.field("branch")
9164
def resolve_branch(
9265
repository: Repository, info: GraphQLResolveInfo, name: str
@@ -374,30 +347,6 @@ def resolve_is_ats_configured(repository: Repository, info: GraphQLResolveInfo)
374347
return individual_flags.get("carryforward_mode") == "labels"
375348

376349

377-
@repository_bindable.field("measurements")
378-
@sync_to_async
379-
def resolve_measurements(
380-
repository: Repository,
381-
info: GraphQLResolveInfo,
382-
interval: Interval,
383-
before: Optional[datetime] = None,
384-
after: Optional[datetime] = None,
385-
branch: Optional[str] = None,
386-
) -> Iterable[MeasurementSummary]:
387-
return fill_sparse_measurements(
388-
timeseries_helpers.repository_coverage_measurements_with_fallback(
389-
repository,
390-
interval,
391-
start_date=after,
392-
end_date=before,
393-
branch=branch,
394-
),
395-
interval,
396-
start_date=after,
397-
end_date=before,
398-
)
399-
400-
401350
@repository_bindable.field("repositoryConfig")
402351
def resolve_repository_config(repository: Repository, info: GraphQLResolveInfo):
403352
return repository

0 commit comments

Comments
 (0)