From bd8144f7cb0d3fe983bba060277d531986d8c677 Mon Sep 17 00:00:00 2001
From: Alex Tselegidis <alextselegidis@gmail.com>
Date: Sat, 6 Nov 2021 15:34:35 +0100
Subject: [PATCH] Make sure the attach method works with API properties

---
 application/models/Appointments_model.php     | 6 +++---
 application/models/Services_model.php         | 2 +-
 application/models/Unavailabilities_model.php | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/application/models/Appointments_model.php b/application/models/Appointments_model.php
index a64743e0..2086795f 100644
--- a/application/models/Appointments_model.php
+++ b/application/models/Appointments_model.php
@@ -491,7 +491,7 @@ class Appointments_model extends EA_Model {
                     $appointment['service'] = $this
                         ->db
                         ->get_where('services', [
-                            'id' => $appointment['id_services']
+                            'id' => $appointment['id_services'] ?? $appointment['serviceId'] ?? NULL
                         ])
                         ->row_array();
                     break;
@@ -500,7 +500,7 @@ class Appointments_model extends EA_Model {
                     $appointment['provider'] = $this
                         ->db
                         ->get_where('users', [
-                            'id' => $appointment['id_users_provider']
+                            'id' => $appointment['id_users_provider'] ?? $appointment['providerId'] ?? NULL
                         ])
                         ->row_array();
                     break;
@@ -509,7 +509,7 @@ class Appointments_model extends EA_Model {
                     $appointment['customer'] = $this
                         ->db
                         ->get_where('users', [
-                            'id' => $appointment['id_users_customer']
+                            'id' => $appointment['id_users_customer'] ?? $appointment['customerId'] ?? NULL
                         ])
                         ->row_array();
                     break;
diff --git a/application/models/Services_model.php b/application/models/Services_model.php
index a83a2a43..63888186 100644
--- a/application/models/Services_model.php
+++ b/application/models/Services_model.php
@@ -382,7 +382,7 @@ class Services_model extends EA_Model {
                     $service['service_category'] = $this
                         ->db
                         ->get_where('service_categories', [
-                            'id' => $service['id_service_categories']
+                            'id' => $service['id_service_categories'] ?? $service['categoryId'] ?? NULL
                         ])
                         ->row_array();
                     break;
diff --git a/application/models/Unavailabilities_model.php b/application/models/Unavailabilities_model.php
index d827d059..1e684e53 100644
--- a/application/models/Unavailabilities_model.php
+++ b/application/models/Unavailabilities_model.php
@@ -348,7 +348,7 @@ class Unavailabilities_model extends EA_Model {
                     $unavailability['provider'] = $this
                         ->db
                         ->get_where('users', [
-                            'id' => $unavailability['id_users_provider']
+                            'id' => $unavailability['id_users_provider'] ?? $unavailability['providerId'] ?? NULL
                         ])
                         ->row_array();
                     break;