rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-01-17 06:52:27 +01:00
Code Issues Releases Activity

optimise machine availabilities query

Browse Source
This commit is contained in:
Peng DU 2016-06-21 19:07:47 +02:00
parent d65ecf437b
commit e82372fb7b
2 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/controllers/api/availabilities_controller.rb
View File

@ -49,9 +49,10 @@ class API::AvailabilitiesController < API::ApiController
else
@user = current_user
end
current_user_role = current_user.is_admin? ? 'admin' : 'user'
@machine = Machine.find(params[:machine_id])
@slots = []
@reservations = Reservation.where('reservable_type = ? and reservable_id = ?', @machine.class.to_s, @machine.id).joins(:slots).where('slots.start_at > ?', Time.now)
@reservations = Reservation.where('reservable_type = ? and reservable_id = ?', @machine.class.to_s, @machine.id).includes(:slots, :user).references(:slots, :user).where('slots.start_at > ?', Time.now)
if @user.is_admin?
@availabilities = @machine.availabilities.where("end_at > ? AND available_type = 'machines'", Time.now)
else
@ -62,8 +63,8 @@ class API::AvailabilitiesController < API::ApiController
@availabilities.each do |a|
((a.end_at - a.start_at)/SLOT_DURATION.minutes).to_i.times do |i|
if (a.start_at + (i * SLOT_DURATION).minutes) > Time.now
slot = Slot.new(start_at: a.start_at + (i*SLOT_DURATION).minutes, end_at: a.start_at + (i*SLOT_DURATION).minutes + SLOT_DURATION.minutes, availability_id: a.id, machine: @machine, title: '')
slot = verify_machine_is_reserved(slot, @reservations)
slot = Slot.new(start_at: a.start_at + (i*SLOT_DURATION).minutes, end_at: a.start_at + (i*SLOT_DURATION).minutes + SLOT_DURATION.minutes, availability_id: a.id, availability: a, machine: @machine, title: '')
slot = verify_machine_is_reserved(slot, @reservations, current_user, current_user_role)
@slots << slot
end
end
@ -115,15 +116,14 @@ class API::AvailabilitiesController < API::ApiController
is_reserved
end
def verify_machine_is_reserved(slot, reservations)
user = current_user
def verify_machine_is_reserved(slot, reservations, user, user_role)
reservations.each do |r|
r.slots.each do |s|
if s.start_at == slot.start_at and s.canceled_at == nil
slot.id = s.id
slot.is_reserved = true
slot.title = t('availabilities.not_available')
slot.can_modify = true if user.is_admin?
slot.can_modify = true if user_role === 'admin'
slot.reservation = r
end
if s.start_at == slot.start_at and r.user == user and s.canceled_at == nil

10
app/views/api/machines/show.json.jbuilder
View File

@ -11,16 +11,6 @@ json.current_user_training_reservation do
json.partial! 'api/reservations/reservation', reservation: current_user.training_reservation_by_machine(@machine)
end if current_user and !current_user.is_training_machine?(@machine) and current_user.training_reservation_by_machine(@machine)
json.amount_by_group Group.all do |g|
json.id g.id
json.name g.name
json.not_subscribe_amount @machine.not_subscribe_price(g.id).amount/100.0
json.amount_by_plan @machine.prices_by_group(g.id) do |price|
json.plan_id price.plan_id
json.amount price.amount/100.0
end
end
json.machine_projects @machine.projects.published.last(10) do |p|
json.id p.id
json.name p.name