diff --git a/hrqb/tasks/employee_salary_history.py b/hrqb/tasks/employee_salary_history.py index 23b4013..58a9152 100644 --- a/hrqb/tasks/employee_salary_history.py +++ b/hrqb/tasks/employee_salary_history.py @@ -82,8 +82,6 @@ def get_dataframe(self) -> pd.DataFrame: row.mit_id, row.position_id, str(row.appointment_begin_date), - str(row.hr_personnel_action), - str(row.hr_action_reason), str(row.start_date), ] ), diff --git a/hrqb/tasks/sql/employee_salary_history.sql b/hrqb/tasks/sql/employee_salary_history.sql index 45e12eb..044f0ad 100644 --- a/hrqb/tasks/sql/employee_salary_history.sql +++ b/hrqb/tasks/sql/employee_salary_history.sql @@ -11,6 +11,7 @@ CHANGELOG - 2024-07-24 Added appointment begin/end date to help match appointments - 2024-09-18 Omit any HR_PERSONNEL_ACTION_TYPE rows where type is "Salary Supplement" - 2025-02-05 Remove 2019-01-01 date cutoff entirely + - 2025-09-04 Omit any HR_ACTION_REASON rows where reason is "Lump Sum" */ select distinct @@ -47,4 +48,5 @@ left join HR_PERSONNEL_ACTION_TYPE at on at.HR_PERSONNEL_ACTION_TYPE_KEY = a.HR_ left join HR_JOB j on j.HR_JOB_KEY = a.HR_JOB_KEY left join HR_POSITION p on p.HR_POSITION_KEY = a.HR_POSITION_KEY where at.HR_PERSONNEL_ACTION not in ('Salary Supplement') +and at.HR_ACTION_REASON not in ('Lump Sum') order by a.MIT_ID, a.APPT_TX_BEGIN_DATE, a.APPT_TX_END_DATE diff --git a/tests/tasks/test_employee_salary_history.py b/tests/tasks/test_employee_salary_history.py index 1441247..f4d5946 100644 --- a/tests/tasks/test_employee_salary_history.py +++ b/tests/tasks/test_employee_salary_history.py @@ -58,8 +58,6 @@ def test_task_transform_employee_salary_history_key_expected_from_input_data( emp_salary_row["MIT ID"], qb_emp_appt_row["Position ID"], qb_emp_appt_row["Begin Date"], - emp_salary_row["Related Salary Change Type"], - emp_salary_row["Salary Change Reason"], emp_salary_row["Start Date"], ] )