Skip to content

Commit e12094b

Browse files
committed
Refactor the employee_master_data a bit
Using more rails syntax/symbol notation, which allows better handling/modification of the query.
1 parent 2f47712 commit e12094b

File tree

1 file changed

+12
-9
lines changed

1 file changed

+12
-9
lines changed

app/controllers/employee_master_data_controller.rb

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48,16 +48,19 @@ def show
4848
private
4949

5050
def list_entries
51-
list_entries_includes(
52-
Employee.select('employees.*, ' \
53-
'em.percent AS current_percent_value, ' \
54-
'departments.name, ' \
55-
'CONCAT(employees.lastname, \' \', employees.firstname) AS fullname, ' \
56-
'member_coaches.firstname AS member_coach')
51+
query =
52+
Employee
53+
.left_joins(:department, :member_coach)
5754
.employed_ones(Period.current_day)
58-
.joins('LEFT JOIN departments ON departments.id = employees.department_id')
59-
.joins('LEFT JOIN employees member_coaches ON member_coaches.id = employees.member_coach_id')
60-
).list
55+
.select(
56+
employees: ['*'],
57+
departments: [:name],
58+
em: ['percent AS current_percent_value']
59+
)
60+
.select("CONCAT(employees.lastname, ' ', employees.firstname) AS fullname")
61+
.select("CONCAT(member_coaches_employees.lastname, ' ', member_coaches_employees.firstname) AS member_coach")
62+
63+
list_entries_includes(query).list
6164
end
6265

6366
def list_entries_includes(list)

0 commit comments

Comments
 (0)