mirror of
https://github.com/nerzhul/ocsms.git
synced 2025-06-07 07:56:23 +00:00
Add a new call to get the current message count for a user
This commit is contained in:
parent
55ca445ff7
commit
78eae0600c
@ -36,6 +36,7 @@ $application->registerRoutes($this, array('routes' => array(
|
|||||||
// API v2
|
// API v2
|
||||||
array('name' => 'api#get_all_stored_phone_numbers', 'url' => '/api/v2/phones/list', 'verb' => 'GET'), // Android APIv2
|
array('name' => 'api#get_all_stored_phone_numbers', 'url' => '/api/v2/phones/list', 'verb' => 'GET'), // Android APIv2
|
||||||
array('name' => 'api#fetch_messages', 'url' => '/api/v2/messages/{start}/{limit}', 'verb' => 'GET'), // Android APIv2
|
array('name' => 'api#fetch_messages', 'url' => '/api/v2/messages/{start}/{limit}', 'verb' => 'GET'), // Android APIv2
|
||||||
|
array('name' => 'api#fetch_messages_count', 'url' => '/api/v2/messages/count', 'verb' => 'GET'), // Android APIv2
|
||||||
array('name' => 'api#fetch_messages_for_number', 'url' => '/api/v2/messages/{phonenumber}/{start}/{limit}', 'verb' => 'GET'), // Android APIv2
|
array('name' => 'api#fetch_messages_for_number', 'url' => '/api/v2/messages/{phonenumber}/{start}/{limit}', 'verb' => 'GET'), // Android APIv2
|
||||||
array('name' => 'api#fetch_messages_to_send', 'url' => '/api/v2/messages/sendqueue', 'verb' => 'GET'), // Android APIv2
|
array('name' => 'api#fetch_messages_to_send', 'url' => '/api/v2/messages/sendqueue', 'verb' => 'GET'), // Android APIv2
|
||||||
|
|
||||||
|
@ -165,6 +165,18 @@ class ApiController extends Controller {
|
|||||||
return new JSONResponse(array("phoneList" => $phoneList));
|
return new JSONResponse(array("phoneList" => $phoneList));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @NoAdminRequired
|
||||||
|
* @NoCSRFRequired
|
||||||
|
*
|
||||||
|
* APIv2
|
||||||
|
* @param $start
|
||||||
|
* @param $limit
|
||||||
|
* @return JSONResponse
|
||||||
|
*/
|
||||||
|
public function fetchMessagesCount() {
|
||||||
|
return new JSONResponse(array("count" => $this->smsMapper->getMessageCount($this->userId)));
|
||||||
|
}
|
||||||
/**
|
/**
|
||||||
* @NoAdminRequired
|
* @NoAdminRequired
|
||||||
* @NoCSRFRequired
|
* @NoCSRFRequired
|
||||||
@ -184,8 +196,7 @@ class ApiController extends Controller {
|
|||||||
return new JSONResponse(array("msg" => "Too many messages requested"), 413);
|
return new JSONResponse(array("msg" => "Too many messages requested"), 413);
|
||||||
}
|
}
|
||||||
|
|
||||||
$messages = $this->smsMapper->getMessages($this->userId, $start, $limit);
|
return new JSONResponse(array("messages" => $this->smsMapper->getMessages($this->userId, $start, $limit)));
|
||||||
return new JSONResponse(array("messages" => $messages));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -134,6 +134,17 @@ class SmsMapper extends Mapper {
|
|||||||
return $messageList;
|
return $messageList;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function getMessageCount ($userId) {
|
||||||
|
$query = \OCP\DB::prepare('SELECT count(*) AS count FROM ' .
|
||||||
|
'*PREFIX*ocsms_smsdatas WHERE user_id = ?');
|
||||||
|
$result = $query->execute(array($userId));
|
||||||
|
if ($row = $result->fetchRow()) {
|
||||||
|
return $row["count"];
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
public function getMessages ($userId, $start, $limit) {
|
public function getMessages ($userId, $start, $limit) {
|
||||||
$messageList = array();
|
$messageList = array();
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user