Skip to content

Commit fb5366d

Browse files
author
Alexey Chernykh
committed
исправление замечаний review
1 parent 7598ae9 commit fb5366d

File tree

1 file changed

+14
-9
lines changed

1 file changed

+14
-9
lines changed

company_add_tasks.py

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,12 @@ def output_departments_name_by_total_taxes(departments_salary, department_taxes)
109109
tax_burden = departments_salary.get(department) * department_taxes.get(department)
110110
departments_total_taxes[department] = tax_burden
111111

112-
sorted_departments_total_taxes = dict(sorted(departments_total_taxes.items(), key=lambda item: item[1],
113-
reverse=True))
114-
departments_names_by_total_taxes = [department_name for department_name in sorted_departments_total_taxes]
112+
departments_names_by_total_taxes = list(sorted(
113+
departments_total_taxes,
114+
key=departments_total_taxes.get,
115+
reverse=True,
116+
))
117+
115118
for department_name in departments_names_by_total_taxes:
116119
print(department_name)
117120

@@ -124,7 +127,7 @@ def output_employers_over_option_tax(departments, option_sum_of_tax):
124127
employer_year_tax = employer['salary_rub'] * 12 * tax_of_departments[department["title"]]
125128
if employer_year_tax > option_sum_of_tax:
126129
print(f'За {employer["first_name"]} {employer["last_name"]} компания платит больше '
127-
f'{option_sum_of_tax//1000} тысяч налогов в год')
130+
f'{option_sum_of_tax // 1000} тысяч налогов в год')
128131

129132

130133
# task 18. Вывести имя и фамилию сотрудника, за которого компания платит меньше всего налогов.
@@ -135,14 +138,16 @@ def get_employer_with_max_tax(departments):
135138
for employer in department['employers']:
136139
employers_taxes = {}
137140
employer_year_tax = employer['salary_rub'] * 12 * tax_of_departments[department["title"]]
138-
employers_taxes["first_name"] = employer["first_name"]
139-
employers_taxes["last_name"] = employer["last_name"]
140-
employers_taxes["year_tax"] = employer_year_tax
141+
employers_taxes = {
142+
"first_name": employer["first_name"],
143+
"last_name": employer["last_name"],
144+
"year_tax": employer_year_tax,
145+
}
141146
employers_taxes_list.append(employers_taxes)
142147

143-
sorted_list_of_employers_tax = sorted(employers_taxes_list, key=lambda x: x["year_tax"], reverse=True)
148+
employer_with_max_tax = max(employers_taxes_list, key=lambda x: x["year_tax"])
144149

145-
return sorted_list_of_employers_tax[0]["first_name"], sorted_list_of_employers_tax[0]["last_name"]
150+
return employer_with_max_tax.get("first_name"), employer_with_max_tax.get("last_name")
146151

147152

148153
if __name__ == "__main__":

0 commit comments

Comments
 (0)