Merge branch 'main' into oct_11_bam

Author: JerrySentry

.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' }}

codecov_auth/commands/owner/interactors/save_terms_agreement.py

@@ -21,14 +21,11 @@ class SaveTermsAgreementInteractor(BaseInteractor):
     requires_service = False
 
     def validate(self, input: TermsAgreementInput):
-        if input.terms_agreement is None:
-            raise ValidationError("Terms of agreement cannot be null")
-        if input.customer_intent and input.customer_intent not in [
-            "Business",
-            "BUSINESS",
-            "Personal",
-            "PERSONAL",
-        ]:
+        valid_customer_intents = ["Business", "BUSINESS", "Personal", "PERSONAL"]
+        if (
+            input.customer_intent
+            and input.customer_intent not in valid_customer_intents
+        ):
             raise ValidationError("Invalid customer intent provided")
         if not self.current_user.is_authenticated:
             raise Unauthenticated()
@@ -37,13 +34,15 @@ def update_terms_agreement(self, input: TermsAgreementInput):
         self.current_user.terms_agreement = input.terms_agreement
         self.current_user.terms_agreement_at = timezone.now()
         self.current_user.customer_intent = input.customer_intent
+        self.current_user.email_opt_in = input.marketing_consent
         self.current_user.save()
 
-        if input.business_email is not None and input.business_email != "":
+        if input.business_email and input.business_email != "":
             self.current_user.email = input.business_email
             self.current_user.save()
 
-        self.send_data_to_marketo()
+        if input.marketing_consent:
+            self.send_data_to_marketo()
 
     def send_data_to_marketo(self):
         event_data = {

codecov_auth/commands/owner/interactors/tests/test_save_terms_agreement.py

@@ -1,3 +1,5 @@
+from unittest.mock import patch
+
 import pytest
 from asgiref.sync import async_to_sync
 from django.contrib.auth.models import AnonymousUser
@@ -24,6 +26,7 @@ def execute(
         input={
             "business_email": None,
             "terms_agreement": False,
+            "marketing_consent": False,
         },
     ):
         return SaveTermsAgreementInteractor(None, "github", current_user).execute(
@@ -75,13 +78,6 @@ def test_update_owner_and_user_when_email_is_not_empty(self):
         self.current_user.refresh_from_db()
         assert self.current_user.email == "[email protected]"
 
-    def test_validation_error_when_terms_is_none(self):
-        with pytest.raises(ValidationError):
-            self.execute(
-                current_user=self.current_user,
-                input={"terms_agreement": None, "customer_intent": "Business"},
-            )
-
     def test_validation_error_when_customer_intent_invalid(self):
         with pytest.raises(ValidationError):
             self.execute(
@@ -99,3 +95,45 @@ def test_user_is_not_authenticated(self):
                     "customer_intent": "Business",
                 },
             )
+
+    def test_email_opt_in_saved_in_db(self):
+        self.execute(
+            current_user=self.current_user,
+            input={
+                "terms_agreement": True,
+                "marketing_consent": True,
+                "customer_intent": "Business",
+            },
+        )
+        self.current_user.refresh_from_db()
+        assert self.current_user.email_opt_in == True
+
+    @patch(
+        "codecov_auth.commands.owner.interactors.save_terms_agreement.SaveTermsAgreementInteractor.send_data_to_marketo"
+    )
+    def test_marketo_called_only_with_consent(self, mock_send_data_to_marketo):
+        self.execute(
+            current_user=self.current_user,
+            input={
+                "terms_agreement": True,
+                "marketing_consent": True,
+                "customer_intent": "Business",
+            },
+        )
+
+        mock_send_data_to_marketo.assert_called_once()
+
+    @patch(
+        "codecov_auth.commands.owner.interactors.save_terms_agreement.SaveTermsAgreementInteractor.send_data_to_marketo"
+    )
+    def test_marketo_not_called_without_consent(self, mock_send_data_to_marketo):
+        self.execute(
+            current_user=self.current_user,
+            input={
+                "terms_agreement": True,
+                "marketing_consent": False,
+                "customer_intent": "Business",
+            },
+        )
+
+        mock_send_data_to_marketo.assert_not_called()

graphql_api/tests/test_test_result.py

@@ -31,13 +31,15 @@ def setUp(self):
             date=date.today() - timedelta(days=2),
             avg_duration_seconds=0.6,
             latest_run=datetime.now() - timedelta(days=2),
+            flaky_fail_count=0,
         )
         _ = DailyTestRollupFactory(
             test=self.test,
             commits_where_fail=["123", "456"],
             date=datetime.now() - timedelta(days=1),
             avg_duration_seconds=2,
             latest_run=datetime.now() - timedelta(days=1),
+            flaky_fail_count=1,
         )
         _ = DailyTestRollupFactory(
             test=self.test,
@@ -46,6 +48,7 @@ def setUp(self):
             last_duration_seconds=5.0,
             avg_duration_seconds=3,
             latest_run=datetime.now(),
+            flaky_fail_count=1,
         )
 
     def test_fetch_test_result_name(self) -> None:
@@ -76,6 +79,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 {
@@ -320,3 +357,34 @@ def test_fetch_test_result_total_pass_count(self) -> None:
             ]["totalPassCount"]
             == 3
         )
+
+    def test_fetch_test_result_total_flaky_fail_count(self) -> None:
+        query = """
+            query {
+               owner(username: "%s") {
+                    repository(name: "%s") {
+                        ... on Repository {
+                            testAnalytics {
+                                testResults {
+                                    edges {
+                                        node {
+                                            totalFlakyFailCount
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                 }
+            }
+        """ % (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"
+            ]["totalFlakyFailCount"]
+            == 2
+        )

graphql_api/types/test_results/test_results.graphql

@@ -7,6 +7,7 @@ type TestResult {
   avgDuration: Float!
   lastDuration: Float!
   totalFailCount: Int!
+  totalFlakyFailCount: Int!
   totalSkipCount: Int!
   totalPassCount: Int!
 }

graphql_api/types/test_results/test_results.py

@@ -14,16 +14,18 @@ class TestDict(TypedDict):
     last_duration: float
     flake_rate: float
     total_fail_count: int
+    total_flaky_fail_count: int
     total_skip_count: int
     total_pass_count: int
+    computed_name: str | None
 
 
 test_result_bindable = ObjectType("TestResult")
 
 
 @test_result_bindable.field("name")
 def resolve_name(test: TestDict, _: GraphQLResolveInfo) -> str:
-    return test["name"].replace("\x1f", " ")
+    return test.get("computed_name") or test["name"].replace("\x1f", " ")
 
 
 @test_result_bindable.field("updatedAt")
@@ -61,6 +63,11 @@ def resolve_total_fail_count(test: TestDict, _: GraphQLResolveInfo) -> int:
     return test["total_fail_count"]
 
 
+@test_result_bindable.field("totalFlakyFailCount")
+def resolve_total_flaky_fail_count(test: TestDict, _: GraphQLResolveInfo) -> int:
+    return test["total_flaky_fail_count"]
+
+
 @test_result_bindable.field("totalSkipCount")
 def resolve_total_skip_count(test: TestDict, _: GraphQLResolveInfo) -> int:
     return test["total_skip_count"]

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):

utils/test_results.py

@@ -197,6 +197,7 @@ def generate_test_results(
         last_duration=Value(0.0),
         avg_duration=Avg("avg_duration_seconds"),
         name=F("test__name"),
+        computed_name=F("test__computed_name"),
     )
 
     return aggregation_of_test_results