misc: Code review feedback

Author: rboni-dk

testgen/__main__.py

@@ -46,6 +46,7 @@
 from testgen.common.models.profiling_run import ProfilingRun
 from testgen.common.models.test_run import TestRun
 from testgen.common.models.test_suite import TestSuite
+from testgen.common.notifications.profiling_run import send_profiling_run_notifications
 from testgen.common.notifications.test_run import send_test_run_notifications
 from testgen.scheduler import register_scheduler_job, run_scheduler
 from testgen.utils import plugins
@@ -648,7 +649,8 @@ def run_ui():
     @with_database_session
     def cancel_all_running():
         try:
-            ProfilingRun.cancel_all_running()
+            for profiling_run_id in ProfilingRun.cancel_all_running():
+                send_profiling_run_notifications(ProfilingRun.get(profiling_run_id))
             for test_run_id in TestRun.cancel_all_running():
                 send_test_run_notifications(TestRun.get(test_run_id))
         except Exception:

testgen/common/models/hygiene_issue.py

@@ -107,11 +107,10 @@ def select_with_diff(
         order_weight = case(
             (cls.priority == "Definite", 1),
             (cls.priority == "Likely", 2),
-            (cls.priority == "Possible", 5),
-            (cls.priority == "High", 2),
-            (cls.priority == "Moderate", 4),
-            (cls.priority == "Low", 6),
-            else_=7,
+            (cls.priority == "Possible", 3),
+            (cls.priority == "High", 4),
+            (cls.priority == "Moderate", 5),
+            else_=6,
         )
         is_new_col = (other.id.is_(None) if other_profiling_run_id else null()).label("is_new")
         query = (

testgen/common/models/profiling_run.py

@@ -237,14 +237,18 @@ def has_running_process(cls, ids: list[str]) -> bool:
         return process_count > 0
 
     @classmethod
-    def cancel_all_running(cls) -> None:
+    def cancel_all_running(cls) -> list[UUID]:
         query = (
-            update(cls).where(cls.status == "Running").values(status="Cancelled", profiling_endtime=datetime.now(UTC))
+            update(cls)
+            .where(cls.status == "Running")
+            .values(status="Cancelled", profiling_endtime=datetime.now(UTC))
+            .returning(cls.id)
         )
         db_session = get_current_session()
-        db_session.execute(query)
+        rows = db_session.execute(query)
         db_session.commit()
         cls.clear_cache()
+        return [r.id for r in rows]
 
     @classmethod
     def cancel_run(cls, run_id: str | UUID) -> None:

testgen/common/notifications/profiling_run.py

@@ -24,8 +24,8 @@ class ProfilingRunEmailTemplate(BaseNotificationTemplate):
     def get_subject_template(self) -> str:
         return (
             "[TestGen] Profiling Run {{format_status profiling_run.status}}: {{table_groups_name}}"
-            "{{#if new_issue_count}}"
-            ' | {{format_number new_issue_count}} new hygiene {{pluralize new_issue_count "issue" "issues"}}'
+            "{{#if issue_count}}"
+            ' | {{format_number issue_count}} hygiene {{pluralize issue_count "issue" "issues"}}'
             "{{/if}}"
         )
 
@@ -313,8 +313,7 @@ def send_profiling_run_notifications(profiling_run: ProfilingRun, result_list_ct
             "table_ct": profiling_run.table_ct,
             "column_ct": profiling_run.column_ct,
         },
-        "issue_count": len(issues),
-        "new_issue_count": sum(1 for _, is_new in issues if is_new),
+        "issue_count": sum(c.total for c in counts.values()),
         "hygiene_issues_summary": hygiene_issues_summary,
         **dict(get_current_session().execute(labels_query).one()),
     }

testgen/ui/views/profiling_runs.py

@@ -16,6 +16,7 @@
 from testgen.common.models.project import Project
 from testgen.common.models.scheduler import RUN_PROFILE_JOB_KEY
 from testgen.common.models.table_group import TableGroup, TableGroupMinimal
+from testgen.common.notifications.profiling_run import send_profiling_run_notifications
 from testgen.ui.components import widgets as testgen
 from testgen.ui.components.widgets import testgen_component
 from testgen.ui.navigation.menu import MenuItem
@@ -169,6 +170,7 @@ def on_cancel_run(profiling_run: dict) -> None:
     process_status, process_message = process_service.kill_profile_run(to_int(profiling_run["process_id"]))
     if process_status:
         ProfilingRun.cancel_run(profiling_run["id"])
+        send_profiling_run_notifications(ProfilingRun.get(profiling_run["id"]))
 
     fm.reset_post_updates(str_message=f":{'green' if process_status else 'red'}[{process_message}]", as_toast=True)
 
@@ -218,6 +220,7 @@ def on_delete_confirmed(*_args) -> None:
                         process_status, _ = process_service.kill_profile_run(to_int(profiling_run.process_id))
                         if process_status:
                             ProfilingRun.cancel_run(profiling_run.id)
+                            send_profiling_run_notifications(ProfilingRun.get(profiling_run.id))
                 ProfilingRun.cascade_delete(profiling_run_ids)
             st.rerun()
         except Exception:

tests/unit/test_score_drop_notifications.py

@@ -48,12 +48,6 @@ def send_mock():
         yield mock
 
 
-@pytest.fixture
-def db_session_mock():
-    with patch("testgen.common.notifications.score_drop.get_current_session") as mock:
-        yield mock
-
-
 @pytest.fixture
 def select_mock():
     with patch("testgen.common.notifications.score_drop.select") as mock:
@@ -127,7 +121,7 @@ def test_send_score_drop_notifications_no_match(
     ]
     for ns in ns_select_result:
         ns.score_definition_id = "sd-x"
-    db_session_mock().scalars.return_value = ns_select_result
+    db_session_mock.execute().fetchall.return_value = ns_select_result
 
     send_score_drop_notifications(data)
 
@@ -157,7 +151,7 @@ def test_send_score_drop_notifications(
         (score_definition, "score", total_prev, total_fresh),
         (score_definition, "cde_score", cde_prev, cde_fresh)
     ]
-    db_session_mock().execute().fetchall.return_value = [(ns, "Test Project") for ns in ns_select_result]
+    db_session_mock.execute().fetchall.return_value = [(ns, "Test Project") for ns in ns_select_result]
 
     send_score_drop_notifications(data)