diff --git a/RestControllers/CallsController.php b/RestControllers/CallsController.php index f1daec7..5ec0764 100644 --- a/RestControllers/CallsController.php +++ b/RestControllers/CallsController.php @@ -211,7 +211,7 @@ class CallsController { "userID" => $member->get_userID(), "call_id" => $member->get_call_id(), "user_call_id" => $member->get_user_call_id(), - "accepted" => self::USER_RESPONSE_TO_CALL[$member->get_accepted()] + "status" => self::USER_RESPONSE_TO_CALL[$member->get_status()] ); } } \ No newline at end of file diff --git a/classes/components/CallsComponent.php b/classes/components/CallsComponent.php index 3f998ee..084ac8f 100644 --- a/classes/components/CallsComponent.php +++ b/classes/components/CallsComponent.php @@ -134,7 +134,7 @@ class CallsComponents { //Get the ID of a call the user has not responded yet $entries = db()->select( self::CALLS_MEMBERS_TABLE, - "WHERE user_id = ? AND user_accepted = ?", + "WHERE user_id = ? AND status = ?", array($userID, CallMemberInformation::USER_UNKNOWN), array("call_id") ); @@ -181,7 +181,7 @@ class CallsComponents { $member->set_call_id($info->get_id()); $member->set_userID($memberID); $member->set_user_call_id(random_str(190)); - $member->set_accepted(CallMemberInformation::USER_UNKNOWN); + $member->set_status(CallMemberInformation::USER_UNKNOWN); //Try to add the member to the list if(!$this->addMember($member)) @@ -235,7 +235,7 @@ class CallsComponents { return db()->count( self::CALLS_MEMBERS_TABLE, - "WHERE user_id = ? AND user_accepted = ?", + "WHERE user_id = ? AND status = ?", array($userID, CallMemberInformation::USER_UNKNOWN) ); @@ -293,7 +293,7 @@ class CallsComponents { self::CALLS_MEMBERS_TABLE, "call_id = ? AND user_id = ?", array( - "user_accepted" => $status + "status" => $status ), array( $callID, @@ -343,7 +343,7 @@ class CallsComponents { $member->set_call_id($entry["call_id"]); $member->set_userID($entry["user_id"]); $member->set_user_call_id($entry["user_call_id"]); - $member->set_accepted($entry["user_accepted"]); + $member->set_status($entry["status"]); return $member; } @@ -358,7 +358,7 @@ class CallsComponents { $data["call_id"] = $member->get_call_id(); $data["user_id"] = $member->get_userID(); $data["user_call_id"] = $member->get_user_call_id(); - $data["user_accepted"] = $member->get_accepted(); + $data["status"] = $member->get_status(); return $data; } } diff --git a/classes/models/CallMemberInformation.php b/classes/models/CallMemberInformation.php index ba0c235..032ce8d 100644 --- a/classes/models/CallMemberInformation.php +++ b/classes/models/CallMemberInformation.php @@ -53,16 +53,16 @@ class CallMemberInformation extends BaseUniqueObjectFromUser { //User response to call - public function set_accepted(int $accepted){ - $this->accepted = $accepted; + public function set_status(int $status){ + $this->status = $status; } - public function has_accepted() : bool { - return $this->accepted > -1; + public function has_status() : bool { + return $this->status > -1; } - public function get_accepted() : int { - return $this->accepted; + public function get_status() : int { + return $this->status; } } \ No newline at end of file diff --git a/db_struct.sql b/db_struct.sql index d262b4e..09846f3 100644 --- a/db_struct.sql +++ b/db_struct.sql @@ -118,7 +118,7 @@ CREATE TABLE `comunic_calls_members` ( `call_id` INT NOT NULL, `user_id` INT NULL, `user_call_id` VARCHAR(200) NULL, - `user_accepted` TINYINT DEFAULT NULL, + `status` TINYINT DEFAULT NULL, PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1;