mirrors/easyappointments
1
0
Fork 1
mirror of https://github.com/alextselegidis/easyappointments.git synced 2024-11-29 11:23:10 +03:00
Code Issues Projects Releases Packages Wiki Activity

Various minor fixes in the appointment and provider models

Browse source
This commit is contained in:
Alex Tselegidis 2024-04-26 16:23:45 +02:00
parent 6304391fd9
commit eb19482c1f
2 changed files with 21 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
application/models/Appointments_model.php
View file

@ -75,7 +75,7 @@ class Appointments_model extends EA_Model
* *
* @throws InvalidArgumentException * @throws InvalidArgumentException
*/ */
public function validate(array $appointment) public function validate(array $appointment): void
{ {
// If an appointment ID is provided then check whether the record really exists in the database. // If an appointment ID is provided then check whether the record really exists in the database.
if (!empty($appointment['id'])) { if (!empty($appointment['id'])) {
@ -323,7 +323,7 @@ class Appointments_model extends EA_Model
* *
* @param int $provider_id Matching provider ID. * @param int $provider_id Matching provider ID.
*/ */
public function clear_google_sync_ids(int $provider_id) public function clear_google_sync_ids(int $provider_id): void
{ {
$this->db->update('appointments', ['id_google_calendar' => null], ['id_users_provider' => $provider_id]); $this->db->update('appointments', ['id_google_calendar' => null], ['id_users_provider' => $provider_id]);
} }
@ -482,7 +482,7 @@ class Appointments_model extends EA_Model
* *
* @throws InvalidArgumentException * @throws InvalidArgumentException
*/ */
public function load(array &$appointment, array $resources) public function load(array &$appointment, array $resources): void
{ {
if (empty($appointment) || empty($resources)) { if (empty($appointment) || empty($resources)) {
return; return;
@ -527,7 +527,7 @@ class Appointments_model extends EA_Model
* *
* @param array $appointment Appointment data. * @param array $appointment Appointment data.
*/ */
public function api_encode(array &$appointment) public function api_encode(array &$appointment): void
{ {
$encoded_resource = [ $encoded_resource = [
'id' => array_key_exists('id', $appointment) ? (int) $appointment['id'] : null, 'id' => array_key_exists('id', $appointment) ? (int) $appointment['id'] : null,
@ -543,7 +543,7 @@ class Appointments_model extends EA_Model
'providerId' => $appointment['id_users_provider'] !== null ? (int) $appointment['id_users_provider'] : null, 'providerId' => $appointment['id_users_provider'] !== null ? (int) $appointment['id_users_provider'] : null,
'serviceId' => $appointment['id_services'] !== null ? (int) $appointment['id_services'] : null, 'serviceId' => $appointment['id_services'] !== null ? (int) $appointment['id_services'] : null,
'googleCalendarId' => 'googleCalendarId' =>
$appointment['id_google_calendar'] !== null ? (int) $appointment['id_google_calendar'] : null, $appointment['id_google_calendar'] !== null ? $appointment['id_google_calendar'] : null,
]; ];
$appointment = $encoded_resource; $appointment = $encoded_resource;
@ -555,7 +555,7 @@ class Appointments_model extends EA_Model
* @param array $appointment API resource. * @param array $appointment API resource.
* @param array|null $base Base appointment data to be overwritten with the provided values (useful for updates). * @param array|null $base Base appointment data to be overwritten with the provided values (useful for updates).
*/ */
public function api_decode(array &$appointment, array $base = null) public function api_decode(array &$appointment, array $base = null): void
{ {
$decoded_request = $base ?: []; $decoded_request = $base ?: [];

28
application/models/Providers_model.php
View file

@ -78,7 +78,7 @@ class Providers_model extends EA_Model
* *
* @throws InvalidArgumentException * @throws InvalidArgumentException
*/ */
public function validate(array $provider) public function validate(array $provider): void
{ {
// If a provider ID is provided then check whether the record really exists in the database. // If a provider ID is provided then check whether the record really exists in the database.
if (!empty($provider['id'])) { if (!empty($provider['id'])) {
@ -303,7 +303,7 @@ class Providers_model extends EA_Model
* *
* @throws InvalidArgumentException * @throws InvalidArgumentException
*/ */
protected function save_settings(int $provider_id, array $settings) protected function save_settings(int $provider_id, array $settings): void
{ {
if (empty($settings)) { if (empty($settings)) {
throw new InvalidArgumentException('The settings argument cannot be empty.'); throw new InvalidArgumentException('The settings argument cannot be empty.');
@ -341,7 +341,7 @@ class Providers_model extends EA_Model
* @param string $name Setting name. * @param string $name Setting name.
* @param mixed|null $value Setting value. * @param mixed|null $value Setting value.
*/ */
public function set_setting(int $provider_id, string $name, mixed $value = null) public function set_setting(int $provider_id, string $name, mixed $value = null): void
{ {
if (!$this->db->update('user_settings', [$name => $value], ['id_users' => $provider_id])) { if (!$this->db->update('user_settings', [$name => $value], ['id_users' => $provider_id])) {
throw new RuntimeException('Could not set the new provider setting value: ' . $name); throw new RuntimeException('Could not set the new provider setting value: ' . $name);
@ -397,7 +397,7 @@ class Providers_model extends EA_Model
* @param int $provider_id Provider ID. * @param int $provider_id Provider ID.
* @param array $service_ids Service IDs. * @param array $service_ids Service IDs.
*/ */
protected function save_service_ids(int $provider_id, array $service_ids) protected function save_service_ids(int $provider_id, array $service_ids): void
{ {
// Re-insert the provider-service connections. // Re-insert the provider-service connections.
$this->db->delete('services_providers', ['id_users' => $provider_id]); $this->db->delete('services_providers', ['id_users' => $provider_id]);
@ -489,13 +489,15 @@ class Providers_model extends EA_Model
* *
* @param int $provider_id Provider ID. * @param int $provider_id Provider ID.
* @param string $date Working plan exception date (in YYYY-MM-DD format). * @param string $date Working plan exception date (in YYYY-MM-DD format).
* @param array $working_plan_exception Associative array with the working plan exception data. * @param array|null $working_plan_exception Associative array with the working plan exception data.
* *
* @throws InvalidArgumentException
* @throws Exception * @throws Exception
*/ */
public function save_working_plan_exception(int $provider_id, string $date, array $working_plan_exception = null) public function save_working_plan_exception(
{ int $provider_id,
string $date,
array $working_plan_exception = null,
): void {
// Validate the working plan exception data. // Validate the working plan exception data.
$start = date('H:i', strtotime($working_plan_exception['start'])); $start = date('H:i', strtotime($working_plan_exception['start']));
@ -577,7 +579,7 @@ class Providers_model extends EA_Model
* *
* @throws Exception If $provider_id argument is invalid. * @throws Exception If $provider_id argument is invalid.
*/ */
public function delete_working_plan_exception(int $provider_id, string $date) public function delete_working_plan_exception(int $provider_id, string $date): void
{ {
$provider = $this->find($provider_id); $provider = $this->find($provider_id);
@ -591,7 +593,7 @@ class Providers_model extends EA_Model
$provider['settings']['working_plan_exceptions'] = empty($working_plan_exceptions) $provider['settings']['working_plan_exceptions'] = empty($working_plan_exceptions)
? '{}' ? '{}'
: $working_plan_exceptions; : json_encode($working_plan_exceptions);
$this->update($provider); $this->update($provider);
} }
@ -722,7 +724,7 @@ class Providers_model extends EA_Model
* *
* @throws InvalidArgumentException * @throws InvalidArgumentException
*/ */
public function load(array &$provider, array $resources) public function load(array &$provider, array $resources): void
{ {
if (empty($provider) || empty($resources)) { if (empty($provider) || empty($resources)) {
return; return;
@ -749,7 +751,7 @@ class Providers_model extends EA_Model
* *
* @param array $provider Provider data. * @param array $provider Provider data.
*/ */
public function api_encode(array &$provider) public function api_encode(array &$provider): void
{ {
$encoded_resource = [ $encoded_resource = [
'id' => array_key_exists('id', $provider) ? (int) $provider['id'] : null, 'id' => array_key_exists('id', $provider) ? (int) $provider['id'] : null,
@ -808,7 +810,7 @@ class Providers_model extends EA_Model
* @param array $provider API resource. * @param array $provider API resource.
* @param array|null $base Base provider data to be overwritten with the provided values (useful for updates). * @param array|null $base Base provider data to be overwritten with the provided values (useful for updates).
*/ */
public function api_decode(array &$provider, array $base = null) public function api_decode(array &$provider, array $base = null): void
{ {
$decoded_resource = $base ?: []; $decoded_resource = $base ?: [];