Merge branch 'main' of github.com:codecov/codecov-api into joseph/fix-sql-query

Author: joseph-sentry

.github/workflows/ci.yml

@@ -19,19 +19,19 @@ permissions:
 jobs:
   lint:
     name: Run Lint
-    uses: codecov/gha-workflows/.github/workflows/[email protected].23
+    uses: codecov/gha-workflows/.github/workflows/[email protected].24
 
   build:
     name: Build API
-    uses: codecov/gha-workflows/.github/workflows/[email protected].23
+    uses: codecov/gha-workflows/.github/workflows/[email protected].24
     secrets: inherit
     with:
       repo: ${{ vars.CODECOV_IMAGE_V2 || 'codecov/self-hosted-api' }}
 
   codecovstartup:
     name: Codecov Startup
     needs: build
-    uses: codecov/gha-workflows/.github/workflows/[email protected].23
+    uses: codecov/gha-workflows/.github/workflows/[email protected].24
     secrets: inherit
 
   # ats:
@@ -47,15 +47,15 @@ jobs:
   test:
     name: Test
     needs: [build]
-    uses: codecov/gha-workflows/.github/workflows/[email protected].23
+    uses: codecov/gha-workflows/.github/workflows/[email protected].24
     secrets: inherit
     with:
       repo: ${{ vars.CODECOV_IMAGE_V2 || 'codecov/self-hosted-api' }}
 
   build-self-hosted:
     name: Build Self Hosted API
     needs: [build, test]
-    uses: codecov/gha-workflows/.github/workflows/[email protected].23
+    uses: codecov/gha-workflows/.github/workflows/[email protected].24
     secrets: inherit
     with:
       repo: ${{ vars.CODECOV_IMAGE_V2 || 'codecov/self-hosted-api' }}
@@ -64,7 +64,7 @@ jobs:
     name: Push Staging Image
     needs: [build, test]
     if: ${{ github.event_name == 'push' && github.event.ref == 'refs/heads/staging' && github.repository_owner == 'codecov' }}
-    uses: codecov/gha-workflows/.github/workflows/[email protected].23
+    uses: codecov/gha-workflows/.github/workflows/[email protected].24
     secrets: inherit
     with:
       environment: staging
@@ -74,7 +74,7 @@ jobs:
     name: Push Production Image
     needs: [build, test]
     if: ${{ github.event_name == 'push' && github.event.ref == 'refs/heads/main' && github.repository_owner == 'codecov' }}
-    uses: codecov/gha-workflows/.github/workflows/[email protected].23
+    uses: codecov/gha-workflows/.github/workflows/[email protected].24
     secrets: inherit
     with:
       environment: production
@@ -85,7 +85,7 @@ jobs:
     needs: [build-self-hosted, test]
     secrets: inherit
     if: ${{ github.event_name == 'push' && github.event.ref == 'refs/heads/main' && github.repository_owner == 'codecov' }}
-    uses: codecov/gha-workflows/.github/workflows/[email protected].23
+    uses: codecov/gha-workflows/.github/workflows/[email protected].24
     with:
       push_rolling: true
       repo: ${{ vars.CODECOV_IMAGE_V2 || 'codecov/self-hosted-api' }}

api/public/v2/owner/views.py

@@ -63,6 +63,8 @@ class UserSessionViewSet(UserSessionViewSetMixin, mixins.ListModelMixin):
     def list(self, request: Request, *args: Any, **kwargs: Any) -> Response:
         """
         Returns a paginated list of users' login session for the specified owner (org)
+
+        Note: Requires the caller to be an admin of the requested organization
         """
         return super().list(request, *args, **kwargs)
 

graphql_api/tests/test_test_result.py

@@ -76,6 +76,40 @@ def test_fetch_test_result_name(self) -> None:
             0
         ]["node"]["name"] == self.test.name.replace("\x1f", " ")
 
+    def test_fetch_test_result_name_with_computed_name(self) -> None:
+        self.test.computed_name = "Computed Name"
+        self.test.save()
+
+        query = """
+            query {
+               owner(username: "%s") {
+                    repository(name: "%s") {
+                        ... on Repository {
+                            testAnalytics {
+                                testResults {
+                                    edges {
+                                        node {
+                                            name
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                 }
+            }
+        """ % (self.owner.username, self.repository.name)
+
+        result = self.gql_request(query, owner=self.owner)
+
+        assert "errors" not in result
+        assert (
+            result["owner"]["repository"]["testAnalytics"]["testResults"]["edges"][0][
+                "node"
+            ]["name"]
+            == self.test.computed_name
+        )
+
     def test_fetch_test_result_updated_at(self) -> None:
         query = """
             query {

graphql_api/types/test_results/test_results.py

@@ -10,7 +10,7 @@
 
 @test_result_bindable.field("name")
 def resolve_name(test: TestResultsRow, _: GraphQLResolveInfo) -> str:
-    return test.name.replace("\x1f", " ")
+    return test.computed_name or test.name.replace("\x1f", " ")
 
 
 @test_result_bindable.field("updatedAt")

reports/tests/factories.py

@@ -107,6 +107,7 @@ class Meta:
     name = factory.Sequence(lambda n: f"{n}")
     repository = factory.SubFactory(RepositoryFactory)
     commits_where_fail = []
+    computed_name = None
 
 
 class TestInstanceFactory(factory.django.DjangoModelFactory):