From 27d2a6c5b25387d2b5808589319642052eda37ac Mon Sep 17 00:00:00 2001 From: osaajani Date: Thu, 14 Nov 2019 21:44:31 +0100 Subject: [PATCH] Update all controllers get_model --- controllers/internals/Command.php | 2 +- controllers/internals/Contact.php | 4 +-- controllers/internals/Event.php | 2 +- controllers/internals/Group.php | 2 +- controllers/internals/Phone.php | 4 +-- controllers/internals/Received.php | 2 +- controllers/internals/Scheduled.php | 2 +- controllers/internals/Sended.php | 2 +- controllers/internals/Setting.php | 2 +- controllers/internals/SmsStop.php | 2 +- controllers/internals/StandardController.php | 26 -------------------- models/Received.php | 24 +++++++++++++++++- models/Sended.php | 24 +++++++++++++++++- models/StandardModel.php | 11 +++++++++ 14 files changed, 69 insertions(+), 40 deletions(-) diff --git a/controllers/internals/Command.php b/controllers/internals/Command.php index 8eda5f5..4cc00ab 100755 --- a/controllers/internals/Command.php +++ b/controllers/internals/Command.php @@ -13,7 +13,7 @@ namespace controllers\internals; class Command extends StandardController { - protected $model = false; + protected $model = null; /** * Get the model for the Controller diff --git a/controllers/internals/Contact.php b/controllers/internals/Contact.php index 19b76ff..ac68876 100755 --- a/controllers/internals/Contact.php +++ b/controllers/internals/Contact.php @@ -13,7 +13,7 @@ namespace controllers\internals; class Contact extends StandardController { - protected $model = false; + protected $model = null; /** * Get the model for the Controller @@ -31,7 +31,7 @@ namespace controllers\internals; * @param string $number : Contact number * @return array */ - public function get_by_number_and_user(int $id_user, string $number,) + public function get_by_number_and_user(int $id_user, string $number) { return $this->get_model()->get_by_number_and_user($id_user, $number); } diff --git a/controllers/internals/Event.php b/controllers/internals/Event.php index 3be8cf3..e868811 100755 --- a/controllers/internals/Event.php +++ b/controllers/internals/Event.php @@ -13,7 +13,7 @@ namespace controllers\internals; class Event extends StandardController { - protected $model = false; + protected $model = null; /** * Get the model for the Controller diff --git a/controllers/internals/Group.php b/controllers/internals/Group.php index c05b9c3..f528384 100755 --- a/controllers/internals/Group.php +++ b/controllers/internals/Group.php @@ -16,7 +16,7 @@ namespace controllers\internals; */ class Group extends StandardController { - protected $model = false; + protected $model = null; /** * Get the model for the Controller diff --git a/controllers/internals/Phone.php b/controllers/internals/Phone.php index a9fb301..e371c70 100755 --- a/controllers/internals/Phone.php +++ b/controllers/internals/Phone.php @@ -13,7 +13,7 @@ namespace controllers\internals; class Phone extends StandardController { - protected $model = false; + protected $model = null; /** * Get the model for the Controller @@ -31,7 +31,7 @@ namespace controllers\internals; * @param string $number : Phone number * @return array */ - public function get_by_number_and_user(int $id_user, string $number,) + public function get_by_number_and_user(int $id_user, string $number) { return $this->model_phone->get_by_number_and_user($id_user, $number); } diff --git a/controllers/internals/Received.php b/controllers/internals/Received.php index 9e922b7..ffa3231 100755 --- a/controllers/internals/Received.php +++ b/controllers/internals/Received.php @@ -13,7 +13,7 @@ namespace controllers\internals; class Received extends StandardController { - protected $model = false; + protected $model = null; /** * Get the model for the Controller diff --git a/controllers/internals/Scheduled.php b/controllers/internals/Scheduled.php index 378a647..eb891d2 100755 --- a/controllers/internals/Scheduled.php +++ b/controllers/internals/Scheduled.php @@ -13,7 +13,7 @@ namespace controllers\internals; class Scheduled extends StandardController { - protected $model = false; + protected $model = null; /** * Get the model for the Controller diff --git a/controllers/internals/Sended.php b/controllers/internals/Sended.php index bed2dc8..ae5cb98 100755 --- a/controllers/internals/Sended.php +++ b/controllers/internals/Sended.php @@ -13,7 +13,7 @@ namespace controllers\internals; class Sended extends StandardController { - protected $model = false; + protected $model = null; /** * Get the model for the Controller diff --git a/controllers/internals/Setting.php b/controllers/internals/Setting.php index 034cce7..81d6075 100755 --- a/controllers/internals/Setting.php +++ b/controllers/internals/Setting.php @@ -13,7 +13,7 @@ namespace controllers\internals; class Setting extends StandardController { - protected $model = false; + protected $model = null; /** * Get the model for the Controller diff --git a/controllers/internals/SmsStop.php b/controllers/internals/SmsStop.php index 0b24243..9b80402 100755 --- a/controllers/internals/SmsStop.php +++ b/controllers/internals/SmsStop.php @@ -13,7 +13,7 @@ namespace controllers\internals; class SmsStop extends StandardController { - protected $model = false; + protected $model = null; /** * Get the model for the Controller diff --git a/controllers/internals/StandardController.php b/controllers/internals/StandardController.php index 118bcc2..81a44a2 100755 --- a/controllers/internals/StandardController.php +++ b/controllers/internals/StandardController.php @@ -25,20 +25,6 @@ namespace controllers\internals; abstract protected function get_model () : \descartes\Model; - /** - * Create a new entry - * @return mixed bool|int : False if cannot create entry, id of the new entry else - */ - abstract public function create(); - - - /** - * Update a entry - * @return mixed bool|int : False if cannot update entry, number of modified rows else - */ - abstract public function update_for_user(); - - /** * Return a entry by his id * @param int $id : Entry id @@ -75,18 +61,6 @@ namespace controllers\internals; } - /** - * Insert a entry - * @param - * @param array $entry : Entry to insert - * @return mixed bool|int : false on error, new entry id else - */ - public function create ($entry) - { - $result = $this->get_model()->insert($entry); - } - - /** * Delete a entry by his id for a user * @param int $id_user : User id diff --git a/models/Received.php b/models/Received.php index efca903..f13dfe3 100755 --- a/models/Received.php +++ b/models/Received.php @@ -30,6 +30,29 @@ namespace models; * @return array */ public function get_for_user(int $id_user, int $id) + { + $query = ' + SELECT * FROM `' . $this->get_table_name() . '` + WHERE destination IN (SELECT number FROM phone WHERE id_user = :id_user) + AND id = :id + '; + + $params = [ + 'id_user' => $id_user, + 'id' => $id, + ]; + + $receiveds = $this->_run_query($query, $params); + return $receiveds[0] ?? []; + } + + + /** + * Return all entries for a user + * @param int $id_user : user id + * @return array + */ + public function gets_for_user(int $id_user) { $query = ' SELECT * FROM `' . $this->get_table_name() . '` @@ -41,7 +64,6 @@ namespace models; ]; $receiveds = $this->_run_query($query, $params); - return $receiveds[0] ?? []; } diff --git a/models/Sended.php b/models/Sended.php index cd4a7b7..0b44708 100755 --- a/models/Sended.php +++ b/models/Sended.php @@ -30,6 +30,29 @@ namespace models; * @return array */ public function get_for_user(int $id_user, int $id) + { + $query = ' + SELECT * FROM `' . $this->get_table_name() . '` + WHERE origin IN (SELECT number FROM phone WHERE id_user = :id_user) + AND id = :id + '; + + $params = [ + 'id' => $id, + 'id_user' => $id_user, + ]; + + $receiveds = $this->_run_query($query, $params); + return $receiveds[0] ?? []; + } + + + /** + * Return all entries for a user + * @param int $id_user : user id + * @return array + */ + public function gets_for_user(int $id_user) { $query = ' SELECT * FROM `' . $this->get_table_name() . '` @@ -41,7 +64,6 @@ namespace models; ]; $receiveds = $this->_run_query($query, $params); - return $receiveds[0] ?? []; } diff --git a/models/StandardModel.php b/models/StandardModel.php index 7980da3..77a3286 100755 --- a/models/StandardModel.php +++ b/models/StandardModel.php @@ -45,6 +45,17 @@ namespace models; { return $this->_select_one($this->get_table_name(), ['id' => $id]); } + + + /** + * Return all entries for a user + * @param int $id_user : user id + * @return array + */ + public function gets_for_user(int $id_user) + { + return $this->_select($this->get_table_name(), ['id_user' => $id_user]); + } /**