tyler.durden
/
opensupports
mirror of https://github.com/opensupports/opensupports.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix ruby tests (#1188) 

* Fix ruby tests

* Add pageSize default value
This commit is contained in:
LautaroCesso 2022-04-25 12:38:44 -03:00 committed by GitHub
parent 861f7dc254
commit 0f6c64674e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/controllers/staff/get-new-tickets.php
View File

@ -40,7 +40,7 @@ class GetNewTicketsStaffController extends Controller {
'error' => ERRORS::INVALID_PAGE
],
'pageSize' => [
'validation' => DataValidator::intVal()->between(5, 50),
'validation' => DataValidator::oneOf(DataValidator::intVal()->between(5, 50),DataValidator::nullType()),
'error' => ERRORS::PAGESIZE_ERROR
]
]
@ -49,7 +49,7 @@ class GetNewTicketsStaffController extends Controller {
public function handler() {
$page = Controller::request('page');
$departmentId = Controller::request('departmentId');
$pageSize = Controller::request('pageSize');
$pageSize = Controller::request('pageSize') ? Controller::request('pageSize') : 10;
if (Ticket::isTableEmpty()) {
Response::respondSuccess([

4
server/controllers/staff/get-tickets.php
View File

@ -40,7 +40,7 @@ class GetTicketStaffController extends Controller {
'error' => ERRORS::INVALID_PAGE
],
'pageSize' => [
'validation' => DataValidator::intVal()->between(5, 50),
'validation' => DataValidator::oneOf(DataValidator::intVal()->between(5, 50),DataValidator::nullType()),
'error' => ERRORS::PAGESIZE_ERROR
]
]
@ -52,7 +52,7 @@ class GetTicketStaffController extends Controller {
$closed = Controller::request('closed');
$page = Controller::request('page');
$departmentId = Controller::request('departmentId');
$pageSize = Controller::request('pageSize');
$pageSize = Controller::request('pageSize') ? Controller::request('pageSize') : 10;
$offset = ($page-1)*$pageSize;
$condition = 'TRUE';

2
server/controllers/system/csv-import.php
View File

@ -1,4 +1,6 @@
<?php
use Respect\Validation\Validator as DataValidator;
DataValidator::with('CustomValidations', true);
/**
* @api {post} /system/csv-import CSV import

7
server/controllers/ticket/search.php
View File

@ -100,7 +100,7 @@ class SearchController extends Controller {
'error' => ERRORS::INVALID_ORDER_BY
],
'pageSize' => [
'validation' => DataValidator::intVal()->between(5, 50),
'validation' => DataValidator::oneOf(DataValidator::intVal()->between(5, 50),DataValidator::nullType()),
'error' => ERRORS::PAGESIZE_ERROR
]
]
@ -129,7 +129,7 @@ class SearchController extends Controller {
'page' => Controller::request('page'),
'allowedDepartments' => $allowedDepartmentsId,
'staffId' => Controller::getLoggedUser()->id,
'pageSize' => Controller::request('pageSize')
'pageSize' => Controller::request('pageSize') ? Controller::request('pageSize') : 10
];
$query = $this->getSQLQuery($inputs);
$queryWithOrder = $this->getSQLQueryWithOrder($inputs, $query);
@ -159,13 +159,12 @@ class SearchController extends Controller {
}
public function getSQLQueryWithOrder($inputs, $query) {
$pageSize = $inputs['pageSize'];
$order = "";
$query = "SELECT ticket.id " . $query;
$this->setQueryOrder($inputs, $order);
$inputs['page'] ? $page = $inputs['page'] : $page = 1 ;
$query .= $order . ' LIMIT ' . $pageSize . ' OFFSET ' . ($page-1)*10;
$query .= $order . ' LIMIT ' . $inputs['pageSize'] . ' OFFSET ' . ($page-1)*10;
return $query;
}

10
server/controllers/user/get-supervised-tickets.php
View File

@ -19,7 +19,8 @@ use Respect\Validation\Validator as DataValidator;
*
* @apiUse NO_PERMISSION
* @apiUse INVALID_SUPERVISED_USERS
*
* @apiUse PAGESIZE_ERROR
* @apiSuccess {Object} data Information about a tickets and quantity of pages.
* @apiSuccess {[Ticket](#api-Data_Structures-ObjectTicket)[]} data.tickets Array of tickets assigned to the staff of the current page.
* @apiSuccess {Number} data.page Number of current page.
@ -42,6 +43,10 @@ class GetSupervisedTicketController extends Controller {
'page' => [
'validation' => DataValidator::oneOf(DataValidator::numeric()->positive(),DataValidator::nullType()),
'error' => ERRORS::INVALID_PAGE
],
'pageSize' => [
'validation' => DataValidator::oneOf(DataValidator::intVal()->between(5, 50),DataValidator::nullType()),
'error' => ERRORS::PAGESIZE_ERROR
]
]
];
@ -55,6 +60,7 @@ class GetSupervisedTicketController extends Controller {
if(Controller::isStaffLogged()) throw new RequestException(ERRORS::NO_PERMISSION);
$this->page = Controller::request('page') ? Controller::request('page') : 1;
$this->pageSize = Controller::request('pageSize') ? Controller::request('pageSize') : 10;
$this->showOwnTickets = (bool)Controller::request('showOwnTickets');
$this->supervisedUserList = Controller::request('supervisedUsers')? json_decode(Controller::request('supervisedUsers')) : [];
$this->authors = $this->createAuthorsArray();
@ -72,6 +78,8 @@ class GetSupervisedTicketController extends Controller {
return $this->page*1;
case 'supervisor':
return 1;
case 'pageSize':
return $this->pageSize;
}
return null;

2
tests/system/csv-import.rb
View File

@ -9,9 +9,11 @@ describe'system/csv-import' do
file.puts('prueba2@hotmail.com,contrasena2,max')
file.puts('prueba3@hotmail.com,contrasena3,maxi')
file.close
result= request('/system/csv-import', {
csrf_userid: $csrf_userid,
csrf_token: $csrf_token,
password: $staff[:password],
file: File.open( "../server/files/test.csv")
})