maket/MaketRandevu
1
1
Fork 0
Code Issues 15 Pull requests Projects Releases 4 Packages Wiki Activity

The availability generation algorithm needs performance improvements when many appointments are stored in the system (#1171).

Browse source
This commit is contained in:
alextselegidis 2021-11-17 18:10:06 +01:00
parent f7b2e60f95
commit af42c7c532
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
application/libraries/Availability.php
View file

@ -54,14 +54,16 @@ class Availability {
*/ */
public function get_available_hours(string $date, array $service, array $provider, int $exclude_appointment_id = NULL): array public function get_available_hours(string $date, array $service, array $provider, int $exclude_appointment_id = NULL): array
{ {
$available_periods = $this->get_available_periods($date, $provider, $exclude_appointment_id);
$available_hours = $this->generate_available_hours($date, $service, $available_periods);
if ($service['attendants_number'] > 1) if ($service['attendants_number'] > 1)
{ {
$available_hours = $this->consider_multiple_attendants($date, $service, $provider, $exclude_appointment_id); $available_hours = $this->consider_multiple_attendants($date, $service, $provider, $exclude_appointment_id);
} }
else
{
$available_periods = $this->get_available_periods($date, $provider, $exclude_appointment_id);
$available_hours = $this->generate_available_hours($date, $service, $available_periods);
}
return $this->consider_book_advance_timeout($date, $available_hours, $provider); return $this->consider_book_advance_timeout($date, $available_hours, $provider);
} }
@ -89,9 +91,12 @@ class Availability {
// Get the provider's working plan exceptions. // Get the provider's working plan exceptions.
$working_plan_exceptions = json_decode($provider['settings']['working_plan_exceptions'], TRUE); $working_plan_exceptions = json_decode($provider['settings']['working_plan_exceptions'], TRUE);
$where = [ $escaped_provider_id = $this->CI->db->escape($provider['id']);
'id_users_provider' => $provider['id'],
]; $escaped_date = $this->CI->db->escape($date);
$where = 'id_users_provider = ' . $escaped_provider_id
. ' AND DATE(start_datetime) <= ' . $escaped_date . ' AND DATE(end_datetime) >= ' . $escaped_date;
// Sometimes it might be necessary to exclude an appointment from the calculation (e.g. when editing an // Sometimes it might be necessary to exclude an appointment from the calculation (e.g. when editing an
// existing appointment). // existing appointment).