Merge branch 'master' into enhancement/update_incident_cost

Netflix · Mar 30, 2024 · a516b50 · a516b50
2 parents 7f68c48 + 4a61ae7
commit a516b50
Show file tree

Hide file tree

Showing 5 changed files with 71 additions and 70 deletions.
diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
@@ -8,7 +8,7 @@ jobs:
       # Minimum code coverage per file
       COVERAGE_SINGLE: 50
       # Minimum total code coverage
-      COVERAGE_TOTAL: 70
+      COVERAGE_TOTAL: 54
     runs-on: ubuntu-latest
     services:
       postgres:
@@ -57,10 +57,9 @@ jobs:
             # exit 1
           fi
       - name: Coverage total
-        # TODO: Change this recommendation into a requirement.
         run: |
           export COVERAGE_TOTAL=$(python -c "import json;print(json.load(open('coverage.json'))['totals']['percent_covered_display'])")
           if [[ $COVERAGE_TOTAL < ${{ env.COVERAGE_TOTAL }} ]]; then
             echo "FAIL Recommended total test coverage of ${{ env.COVERAGE_TOTAL }}% not reached. Total coverage: $COVERAGE_TOTAL%"
-            # exit 1
+            exit 1
           fi
diff --git a/requirements-base.txt b/requirements-base.txt
@@ -124,7 +124,7 @@ frozenlist==1.4.1
     #   aiosignal
 google-api-core==2.15.0
     # via google-api-python-client
-google-api-python-client==2.123.0
+google-api-python-client==2.124.0
     # via -r requirements-base.in
 google-auth==2.26.1
     # via
@@ -376,7 +376,7 @@ scipy==1.11.4
     # via statsmodels
 sentry-asgi==0.2.0
     # via -r requirements-base.in
-sentry-sdk==1.43.0
+sentry-sdk==1.44.0
     # via
     #   -r requirements-base.in
     #   sentry-asgi

diff --git a/src/dispatch/participant/flows.py b/src/dispatch/participant/flows.py
@@ -77,7 +77,7 @@ def add_participant(
         event_service.log_case_event(
             db_session=db_session,
             source="Dispatch Core App",
-            description=f"{individual.name} added to incident with {participant_role.role} role",
+            description=f"{individual.name} added to case with {participant_role.role} role",
             case_id=subject.id,
         )
     if subject_type == "incident":

diff --git a/src/dispatch/plugins/dispatch_slack/case/interactive.py b/src/dispatch/plugins/dispatch_slack/case/interactive.py
@@ -837,6 +837,8 @@ def handle_case_participant_role_activity(
             previous_status=case.status,
             organization_slug=context["subject"].organization_slug,
         )
+        case.status = CaseStatus.triage
+        db_session.commit()
 
     case_flows.update_conversation(case, db_session)
 

diff --git a/src/dispatch/static/dispatch/package-lock.json b/src/dispatch/static/dispatch/package-lock.json