diff --git a/departmentHighestSalary.py b/departmentHighestSalary.py new file mode 100644 index 0000000..964b9f3 --- /dev/null +++ b/departmentHighestSalary.py @@ -0,0 +1,14 @@ +import pandas as pd + +def department_highest_salary(employee: pd.DataFrame, department: pd.DataFrame) -> pd.DataFrame: + + merge_df = pd.merge(employee, department, left_on = 'departmentId', right_on = 'id', how = 'left') + merge_df = merge_df.rename(columns = { + 'id_x' : 'Employee_id', + 'name_x': 'Employee', + 'name_y': 'Department', + 'salary': 'Salary' + })[['Department', 'Employee', 'Salary']] + + result = merge_df[merge_df['Salary'] == merge_df.groupby('Department')['Salary'].transform(max)] + return result \ No newline at end of file diff --git a/rankScores.py b/rankScores.py new file mode 100644 index 0000000..9ba1106 --- /dev/null +++ b/rankScores.py @@ -0,0 +1,7 @@ +import pandas as pd + +def order_scores(scores: pd.DataFrame) -> pd.DataFrame: + scores['score_rank'] = scores['score'].rank(method='dense', ascending=False) + scores.sort_values(by = 'score_rank', inplace = True) + scores.rename(columns = {'score_rank' : 'rank'}, inplace = True) + return scores[['score', 'rank']] \ No newline at end of file